Merge branch 'preview' of github.com:makeplane/plane into fix/external-api-context

* Fix position bug in the UploadImagesPlugin widget decoration and adjust transaction to correctly insert image node and set meta data for image removal.

* Update CSS styles in editor.css to remove margin top and bottom on images and img placeholders and adjust the margin on the table in the editor container.

* Better typescript support for images extension.

Update the `Command` extension in `slash-commands.tsx` to include a `SlashCommandOptions` type for better TS support and allow spaces in the suggestion options and modify the `image` suggestion's search terms to include "img" in addition to "photo", "picture", and "media".

.github/workflows/build-test-pull-request.yml

@@ -1,6 +1,6 @@
 name: Build Pull Request Contents
 
-on:
+on: 
   pull_request:
     types: ["opened", "synchronize"]
 
@@ -14,15 +14,13 @@ jobs:
     steps:
       - name: Checkout Repository to Actions
         uses: actions/checkout@v3.3.0
-        with:
-          token: ${{ secrets.ACCESS_TOKEN }}
 
       - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
           node-version: 18.x
-          cache: "yarn"
-
+          cache: 'yarn'
+      
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v38
@@ -46,3 +44,5 @@ jobs:
         run: |
           yarn 
           yarn build --filter=space
+
+

.github/workflows/create-sync-pr.yml

@@ -3,7 +3,7 @@ name: Create Sync Action
 on:
   pull_request:
     branches:
-      - develop # Change this to preview
+      - preview 
     types:
       - closed
 env: 
@@ -33,23 +33,14 @@ jobs:
           sudo apt update
           sudo apt install gh -y
 
-      - name: Create Pull Request
+      - name: Push Changes to Target Repo
         env:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
           TARGET_REPO="${{ secrets.SYNC_TARGET_REPO_NAME }}"
           TARGET_BRANCH="${{ secrets.SYNC_TARGET_BRANCH_NAME }}"
-          TARGET_BASE_BRANCH="${{ secrets.SYNC_TARGET_BASE_BRANCH_NAME }}"
           SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
 
           git checkout $SOURCE_BRANCH
           git remote add target-origin "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH
-
-          PR_TITLE=${{secrets.SYNC_PR_TITLE}}
-
-          gh pr create \
-            --base $TARGET_BASE_BRANCH \
-            --head $TARGET_BRANCH \
-            --title "$PR_TITLE" \
-            --repo $TARGET_REPO
+          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH

.gitignore

@@ -80,3 +80,6 @@ tmp/
 ## packages
 dist
 .temp/
+
+# logs
+combined.log

apiserver/.env.example

@@ -39,6 +39,9 @@ OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
 GPT_ENGINE="gpt-3.5-turbo" # deprecated
 
+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+
 # Settings related to Docker
 DOCKERIZED=1 # deprecated
 

apiserver/Procfile

@@ -1,3 +1,3 @@
 web: gunicorn -w 4 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:$PORT --max-requests 10000 --max-requests-jitter 1000 --access-logfile -
-worker: celery -A plane worker -l info
+worker: celery -A plane worker -l info -Q internal_tasks,external_tasks
 beat: celery -A plane beat -l INFO

apiserver/plane/api/serializers/base.py

@@ -97,7 +97,7 @@ class BaseSerializer(serializers.ModelSerializer):
                             exp_serializer = expansion[expand](
                                 getattr(instance, expand)
                             )
-                        response[expand] = exp_serializer.data
+                            response[expand] = exp_serializer.data
                     else:
                         # You might need to handle this case differently
                         response[expand] = getattr(instance, f"{expand}_id", None)

apiserver/plane/api/serializers/issue.py

@@ -96,7 +96,7 @@ class IssueSerializer(BaseSerializer):
         if (
             data.get("state")
             and not State.objects.filter(
-                project_id=self.context.get("project_id"), pk=data.get("state").id
+                project_id=self.context.get("project_id"), pk=data.get("state")
             ).exists()
         ):
             raise serializers.ValidationError(
@@ -107,7 +107,7 @@ class IssueSerializer(BaseSerializer):
         if (
             data.get("parent")
             and not Issue.objects.filter(
-                workspace_id=self.context.get("workspace_id"), pk=data.get("parent").id
+                workspace_id=self.context.get("workspace_id"), pk=data.get("parent")
             ).exists()
         ):
             raise serializers.ValidationError(

apiserver/plane/api/serializers/module.py

@@ -65,18 +65,18 @@ class ModuleSerializer(BaseSerializer):
     def create(self, validated_data):
         members = validated_data.pop("members", None)
 
-        project_id = self.context["project_id"]
-        workspace_id = self.context["workspace_id"]
+        project = self.context["project"]
+
+        module = Module.objects.create(**validated_data, project=project)
 
-        module = Module.objects.create(**validated_data, project_id=project_id)
         if members is not None:
             ModuleMember.objects.bulk_create(
                 [
                     ModuleMember(
                         module=module,
-                        member_id=str(member),
-                        project_id=project_id,
-                        workspace_id=workspace_id,
+                        member=member,
+                        project=project,
+                        workspace=project.workspace,
                         created_by=module.created_by,
                         updated_by=module.updated_by,
                     )
@@ -97,7 +97,7 @@ class ModuleSerializer(BaseSerializer):
                 [
                     ModuleMember(
                         module=instance,
-                        member_id=str(member),
+                        member=member,
                         project=instance.project,
                         workspace=instance.project.workspace,
                         created_by=instance.created_by,

apiserver/plane/api/views/cycle.py

@@ -281,20 +281,22 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
         )
         cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
 
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "cycle.activity.deleted",
+                'requested_data': json.dumps({
                     "cycle_id": str(pk),
                     "cycle_name": str(cycle.name),
                     "issues": [str(issue_id) for issue_id in cycle_issues],
-                }
-            ),
-            actor_id=str(request.user.id),
-            issue_id=None,
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+                }),
+                'actor_id': str(request.user.id),
+                'issue_id': None,
+                'project_id': str(project_id),
+                'current_instance': None,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
         # Delete the cycle
         cycle.delete()
@@ -454,21 +456,21 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
         # Capture Issue Activity
-        issue_activity.delay(
-            type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": str(issues)}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "cycle.activity.created",
+                'requested_data': json.dumps({"cycles_list": str(issues)}),
+                'actor_id': str(self.request.user.id),
+                'issue_id': None,
+                'project_id': str(self.kwargs.get("project_id", None)),
+                'current_instance': json.dumps({
                     "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": serializers.serialize(
-                        "json", record_to_create
-                    ),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
+                    "created_cycle_issues": serializers.serialize("json", record_to_create),
+                }),
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
 
         # Return all Cycle Issues
@@ -483,19 +485,21 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
         )
         issue_id = cycle_issue.issue_id
         cycle_issue.delete()
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "cycle.activity.deleted",
+                'requested_data': json.dumps({
                     "cycle_id": str(self.kwargs.get("cycle_id")),
                     "issues": [str(issue_id)],
-                }
-            ),
-            actor_id=str(self.request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+                }),
+                'actor_id': str(self.request.user.id),
+                'issue_id': str(issue_id),
+                'project_id': str(self.kwargs.get("project_id", None)),
+                'current_instance': None,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 

apiserver/plane/api/views/inbox.py

@@ -142,14 +142,18 @@ class InboxIssueAPIEndpoint(BaseAPIView):
         )
 
         # Create an Issue Activity
-        issue_activity.delay(
-            type="issue.activity.created",
-            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-            actor_id=str(request.user.id),
-            issue_id=str(issue.id),
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+        issue_activity.apply_async(
+            args=[],  # If no positional arguments are required
+            kwargs={
+                "type": "issue.activity.created",
+                "requested_data": json.dumps(request.data, cls=DjangoJSONEncoder),
+                "actor_id": str(request.user.id),
+                "issue_id": str(issue.id),
+                "project_id": str(project_id),
+                "current_instance": None,
+                "epoch": int(timezone.now().timestamp()),
+            },
+            routing_key="external",
         )
 
         # create an inbox issue
@@ -232,17 +236,21 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                 # Log all the updates
                 requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
                 if issue is not None:
-                    issue_activity.delay(
-                        type="issue.activity.updated",
-                        requested_data=requested_data,
-                        actor_id=str(request.user.id),
-                        issue_id=str(issue_id),
-                        project_id=str(project_id),
-                        current_instance=json.dumps(
-                            IssueSerializer(current_instance).data,
-                            cls=DjangoJSONEncoder,
-                        ),
-                        epoch=int(timezone.now().timestamp()),
+                    issue_activity.apply_async(
+                        args=[],
+                        kwargs={
+                            "type": "issue.activity.updated",
+                            "requested_data": requested_data,
+                            "actor_id": str(request.user.id),
+                            "issue_id": str(issue_id),
+                            "project_id": str(project_id),
+                            "current_instance": json.dumps(
+                                IssueSerializer(current_instance).data,
+                                cls=DjangoJSONEncoder,
+                            ),
+                            "epoch": int(timezone.now().timestamp()),
+                        },
+                        routing_key="external",
                     )
                 issue_serializer.save()
             else:

apiserver/plane/api/views/issue.py

@@ -207,44 +207,43 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
             serializer.save()
 
             # Track the issue
-            issue_activity.delay(
-                type="issue.activity.created",
-                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(serializer.data.get("id", None)),
-                project_id=str(project_id),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],  # If no positional arguments are required
+                kwargs={
+                    'type': "issue.activity.created",
+                    'requested_data': json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                    'actor_id': str(request.user.id),
+                    'issue_id': str(serializer.data.get("id", None)),
+                    'project_id': str(project_id),
+                    'current_instance': None,
+                    'epoch': int(timezone.now().timestamp()),
+                },
+                routing_key='external',
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def patch(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
-        project = Project.objects.get(pk=project_id)
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueSerializer(
-            issue,
-            data=request.data,
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-            },
-            partial=True,
-        )
+        serializer = IssueSerializer(issue, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
-            issue_activity.delay(
-                type="issue.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(request.user.id),
-                issue_id=str(pk),
-                project_id=str(project_id),
-                current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],
+                kwargs={
+                    'type': "issue.activity.updated",
+                    'requested_data': requested_data,
+                    'actor_id': str(request.user.id),
+                    'issue_id': str(pk),
+                    'project_id': str(project_id),
+                    'current_instance': current_instance,
+                    'epoch': int(timezone.now().timestamp()),
+                },
+                routing_key='external',
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -255,14 +254,19 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
         issue.delete()
-        issue_activity.delay(
-            type="issue.activity.deleted",
-            requested_data=json.dumps({"issue_id": str(pk)}),
-            actor_id=str(request.user.id),
-            issue_id=str(pk),
-            project_id=str(project_id),
-            current_instance=current_instance,
-            epoch=int(timezone.now().timestamp()),
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "issue.activity.deleted",
+                'requested_data': json.dumps({"issue_id": str(pk)}),
+                'actor_id': str(request.user.id),
+                'issue_id': str(pk),
+                'project_id': str(project_id),
+                'current_instance': current_instance,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='your_routing_key',
+            queue='your_queue_name'
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -318,7 +322,11 @@ class LabelAPIEndpoint(BaseAPIView):
                 ).data,
             )
         label = self.get_queryset().get(pk=pk)
-        serializer = LabelSerializer(label, fields=self.fields, expand=self.expand,)
+        serializer = LabelSerializer(
+            label,
+            fields=self.fields,
+            expand=self.expand,
+        )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def patch(self, request, slug, project_id, pk=None):
@@ -328,7 +336,6 @@ class LabelAPIEndpoint(BaseAPIView):
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-    
 
     def delete(self, request, slug, project_id, pk=None):
         label = self.get_queryset().get(pk=pk)
@@ -393,14 +400,18 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                 project_id=project_id,
                 issue_id=issue_id,
             )
-            issue_activity.delay(
-                type="link.activity.created",
-                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id")),
-                project_id=str(self.kwargs.get("project_id")),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],  # If no positional arguments are required
+                kwargs={
+                    'type': "link.activity.created",
+                    'requested_data': json.dumps(serializer.data, cls=DjangoJSONEncoder),
+                    'actor_id': str(self.request.user.id),
+                    'issue_id': str(self.kwargs.get("issue_id")),
+                    'project_id': str(self.kwargs.get("project_id")),
+                    'current_instance': None,
+                    'epoch': int(timezone.now().timestamp()),
+                },
+                routing_key='external',
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -417,14 +428,18 @@ class IssueLinkAPIEndpoint(BaseAPIView):
         serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
-            issue_activity.delay(
-                type="link.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],  # If no positional arguments are required
+                kwargs={
+                    'type': "link.activity.updated",
+                    'requested_data': requested_data,
+                    'actor_id': str(request.user.id),
+                    'issue_id': str(issue_id),
+                    'project_id': str(project_id),
+                    'current_instance': current_instance,
+                    'epoch': int(timezone.now().timestamp()),
+                },
+                routing_key='external',
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -437,14 +452,18 @@ class IssueLinkAPIEndpoint(BaseAPIView):
             IssueLinkSerializer(issue_link).data,
             cls=DjangoJSONEncoder,
         )
-        issue_activity.delay(
-            type="link.activity.deleted",
-            requested_data=json.dumps({"link_id": str(pk)}),
-            actor_id=str(request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(project_id),
-            current_instance=current_instance,
-            epoch=int(timezone.now().timestamp()),
+        issue_activity.apply_async(
+            args=[],  # If no positional arguments are required
+            kwargs={
+                'type': "link.activity.deleted",
+                'requested_data': json.dumps({"link_id": str(pk)}),
+                'actor_id': str(request.user.id),
+                'issue_id': str(issue_id),
+                'project_id': str(project_id),
+                'current_instance': current_instance,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
         issue_link.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -516,14 +535,20 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
                 issue_id=issue_id,
                 actor=request.user,
             )
-            issue_activity.delay(
-                type="comment.activity.created",
-                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id")),
-                project_id=str(self.kwargs.get("project_id")),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],
+                kwargs={
+                    "type": "comment.activity.created",
+                    "requested_data": json.dumps(
+                        serializer.data, cls=DjangoJSONEncoder
+                    ),
+                    "actor_id": str(self.request.user.id),
+                    "issue_id": str(self.kwargs.get("issue_id")),
+                    "project_id": str(self.kwargs.get("project_id")),
+                    "current_instance": None,
+                    "epoch": int(timezone.now().timestamp()),
+                },
+                routing_key="external",
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -542,14 +567,18 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
         )
         if serializer.is_valid():
             serializer.save()
-            issue_activity.delay(
-                type="comment.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
+            issue_activity.apply_async(
+                args=[],
+                kwargs={
+                    "type": "comment.activity.updated",
+                    "requested_data": requested_data,
+                    "actor_id": str(request.user.id),
+                    "issue_id": str(issue_id),
+                    "project_id": str(project_id),
+                    "current_instance": current_instance,
+                    "epoch": int(timezone.now().timestamp()),
+                },
+                routing_key="external",
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -563,14 +592,18 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
             cls=DjangoJSONEncoder,
         )
         issue_comment.delete()
-        issue_activity.delay(
-            type="comment.activity.deleted",
-            requested_data=json.dumps({"comment_id": str(pk)}),
-            actor_id=str(request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(project_id),
-            current_instance=current_instance,
-            epoch=int(timezone.now().timestamp()),
+        issue_activity.apply_async(
+            args=[],  # If no positional arguments are required
+            kwargs={
+                "type": "comment.activity.deleted",
+                "requested_data": json.dumps({"comment_id": str(pk)}),
+                "actor_id": str(request.user.id),
+                "issue_id": str(issue_id),
+                "project_id": str(project_id),
+                "current_instance": current_instance,
+                "epoch": int(timezone.now().timestamp()),
+            },
+            routing_key="external",
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -591,7 +624,7 @@ class IssueActivityAPIEndpoint(BaseAPIView):
             )
             .select_related("actor", "workspace", "issue", "project")
         ).order_by(request.GET.get("order_by", "created_at"))
- 
+
         if pk:
             issue_activities = issue_activities.get(pk=pk)
             serializer = IssueActivitySerializer(issue_activities)

apiserver/plane/api/views/module.py

@@ -121,8 +121,8 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
     def post(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        serializer = ModuleSerializer(data=request.data, context={"project_id": project_id, "workspace_id": project.workspace_id})
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
+        serializer = ModuleSerializer(data=request.data, context={"project": project})
         if serializer.is_valid():
             serializer.save()
             module = Module.objects.get(pk=serializer.data["id"])
@@ -132,7 +132,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
     
     def patch(self, request, slug, project_id, pk):
         module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
-        serializer = ModuleSerializer(module, data=request.data, context={"project_id": project_id}, partial=True)
+        serializer = ModuleSerializer(module, data=request.data)
         if serializer.is_valid():
             serializer.save()
             return Response(serializer.data, status=status.HTTP_201_CREATED)
@@ -166,20 +166,22 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
         module_issues = list(
             ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
         )
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "module.activity.deleted",
+                'requested_data': json.dumps({
                     "module_id": str(pk),
                     "module_name": str(module.name),
                     "issues": [str(issue_id) for issue_id in module_issues],
-                }
-            ),
-            actor_id=str(request.user.id),
-            issue_id=None,
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+                }),
+                'actor_id': str(request.user.id),
+                'issue_id': None,
+                'project_id': str(project_id),
+                'current_instance': None,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
         module.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -330,21 +332,21 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
         # Capture Issue Activity
-        issue_activity.delay(
-            type="module.activity.created",
-            requested_data=json.dumps({"modules_list": str(issues)}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],
+            kwargs={
+                'type': "module.activity.created",
+                'requested_data': json.dumps({"modules_list": str(issues)}),
+                'actor_id': str(self.request.user.id),
+                'issue_id': None,
+                'project_id': str(self.kwargs.get("project_id", None)),
+                'current_instance': json.dumps({
                     "updated_module_issues": update_module_issue_activity,
-                    "created_module_issues": serializers.serialize(
-                        "json", record_to_create
-                    ),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
+                    "created_module_issues": serializers.serialize("json", record_to_create),
+                }),
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
 
         return Response(
@@ -357,18 +359,20 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
             workspace__slug=slug, project_id=project_id, module_id=module_id, issue_id=issue_id
         )
         module_issue.delete()
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
+        issue_activity.apply_async(
+            args=[],  # If no positional arguments are required
+            kwargs={
+                'type': "module.activity.deleted",
+                'requested_data': json.dumps({
                     "module_id": str(module_id),
                     "issues": [str(module_issue.issue_id)],
-                }
-            ),
-            actor_id=str(request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+                }),
+                'actor_id': str(request.user.id),
+                'issue_id': str(issue_id),
+                'project_id': str(project_id),
+                'current_instance': None,
+                'epoch': int(timezone.now().timestamp()),
+            },
+            routing_key='external',
         )
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/serializers/__init__.py

@@ -17,7 +17,6 @@ from .workspace import (
     WorkspaceThemeSerializer,
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
-    WorkspaceUserPropertiesSerializer,
 )
 from .project import (
     ProjectSerializer,
@@ -32,7 +31,6 @@ from .project import (
     ProjectDeployBoardSerializer,
     ProjectMemberAdminSerializer,
     ProjectPublicMemberSerializer,
-    ProjectMemberRoleSerializer,
 )
 from .state import StateSerializer, StateLiteSerializer
 from .view import GlobalViewSerializer, IssueViewSerializer, IssueViewFavoriteSerializer
@@ -41,7 +39,6 @@ from .cycle import (
     CycleIssueSerializer,
     CycleFavoriteSerializer,
     CycleWriteSerializer,
-    CycleUserPropertiesSerializer,
 )
 from .asset import FileAssetSerializer
 from .issue import (
@@ -64,8 +61,6 @@ from .issue import (
     IssueRelationSerializer,
     RelatedIssueSerializer,
     IssuePublicSerializer,
-    IssueRelationLiteSerializer,
-
 )
 
 from .module import (
@@ -74,7 +69,6 @@ from .module import (
     ModuleIssueSerializer,
     ModuleLinkSerializer,
     ModuleFavoriteSerializer,
-    ModuleUserPropertiesSerializer,
 )
 
 from .api import APITokenSerializer, APITokenReadSerializer

apiserver/plane/app/serializers/base.py

@@ -9,12 +9,11 @@ class DynamicBaseSerializer(BaseSerializer):
     def __init__(self, *args, **kwargs):
         # If 'fields' is provided in the arguments, remove it and store it separately.
         # This is done so as not to pass this custom argument up to the superclass.
-        fields = kwargs.pop("fields", [])
-        self.expand = kwargs.pop("expand", []) or []
-        fields = self.expand
+        fields = kwargs.pop("fields", None)
 
         # Call the initialization of the superclass.
         super().__init__(*args, **kwargs)
+
         # If 'fields' was provided, filter the fields of the serializer accordingly.
         if fields is not None:
             self.fields = self._filter_fields(fields)
@@ -48,91 +47,12 @@ class DynamicBaseSerializer(BaseSerializer):
             elif isinstance(item, dict):
                 allowed.append(list(item.keys())[0])
 
-        for field in allowed:
-            if field not in self.fields:
-                from . import (
-                    WorkspaceLiteSerializer,
-                    ProjectLiteSerializer,
-                    UserLiteSerializer,
-                    StateLiteSerializer,
-                    IssueSerializer,
-                    LabelSerializer,
-                    CycleIssueSerializer,
-                    IssueFlatSerializer,
-                )
+        # Convert the current serializer's fields and the allowed fields to sets.
+        existing = set(self.fields)
+        allowed = set(allowed)
 
-                # Expansion mapper
-                expansion = {
-                    "user": UserLiteSerializer,
-                    "workspace": WorkspaceLiteSerializer,
-                    "project": ProjectLiteSerializer,
-                    "default_assignee": UserLiteSerializer,
-                    "project_lead": UserLiteSerializer,
-                    "state": StateLiteSerializer,
-                    "created_by": UserLiteSerializer,
-                    "issue": IssueSerializer,
-                    "actor": UserLiteSerializer,
-                    "owned_by": UserLiteSerializer,
-                    "members": UserLiteSerializer,
-                    "assignees": UserLiteSerializer,
-                    "labels": LabelSerializer,
-                    "issue_cycle": CycleIssueSerializer,
-                    "parent": IssueFlatSerializer,
-                }
-                
-                self.fields[field] = expansion[field](many=True if field in ["members", "assignees", "labels", "issue_cycle"] else False)            
+        # Remove fields from the serializer that aren't in the 'allowed' list.
+        for field_name in (existing - allowed):
+            self.fields.pop(field_name)
 
         return self.fields
-
-
-    def to_representation(self, instance):
-        response = super().to_representation(instance)
-
-        # Ensure 'expand' is iterable before processing
-        if self.expand:
-            for expand in self.expand:
-                if expand in self.fields:
-                    # Import all the expandable serializers
-                    from . import (
-                        WorkspaceLiteSerializer,
-                        ProjectLiteSerializer,
-                        UserLiteSerializer,
-                        StateLiteSerializer,
-                        IssueSerializer,
-                        LabelSerializer,
-                        CycleIssueSerializer,
-                    )
-
-                    # Expansion mapper
-                    expansion = {
-                        "user": UserLiteSerializer,
-                        "workspace": WorkspaceLiteSerializer,
-                        "project": ProjectLiteSerializer,
-                        "default_assignee": UserLiteSerializer,
-                        "project_lead": UserLiteSerializer,
-                        "state": StateLiteSerializer,
-                        "created_by": UserLiteSerializer,
-                        "issue": IssueSerializer,
-                        "actor": UserLiteSerializer,
-                        "owned_by": UserLiteSerializer,
-                        "members": UserLiteSerializer,
-                        "assignees": UserLiteSerializer,
-                        "labels": LabelSerializer,
-                        "issue_cycle": CycleIssueSerializer,
-                    }
-                    # Check if field in expansion then expand the field
-                    if expand in expansion:
-                        if isinstance(response.get(expand), list):
-                            exp_serializer = expansion[expand](
-                                getattr(instance, expand), many=True
-                            )
-                        else:
-                            exp_serializer = expansion[expand](
-                                getattr(instance, expand)
-                            )
-                        response[expand] = exp_serializer.data
-                    else:
-                        # You might need to handle this case differently
-                        response[expand] = getattr(instance, f"{expand}_id", None)
-
-        return response

apiserver/plane/app/serializers/cycle.py

@@ -7,7 +7,7 @@ from .user import UserLiteSerializer
 from .issue import IssueStateSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import Cycle, CycleIssue, CycleFavorite, CycleUserProperties
+from plane.db.models import Cycle, CycleIssue, CycleFavorite
 
 
 class CycleWriteSerializer(BaseSerializer):
@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
     started_estimates = serializers.IntegerField(read_only=True)
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    status = serializers.CharField(read_only=True)
 
     def validate(self, data):
         if (
@@ -106,15 +105,3 @@ class CycleFavoriteSerializer(BaseSerializer):
             "project",
             "user",
         ]
-
-
-class CycleUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = CycleUserProperties
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "cycle"
-            "user",
-        ]

apiserver/plane/app/serializers/estimate.py

@@ -4,7 +4,6 @@ from .base import BaseSerializer
 from plane.db.models import Estimate, EstimatePoint
 from plane.app.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
 
-from rest_framework import serializers
 
 class EstimateSerializer(BaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
@@ -20,15 +19,6 @@ class EstimateSerializer(BaseSerializer):
 
 
 class EstimatePointSerializer(BaseSerializer):
-
-    def validate(self, data):
-        if not data:
-            raise serializers.ValidationError("Estimate points are required")
-        value = data.get("value")
-        if value and len(value) > 20:
-            raise serializers.ValidationError("Value can't be more than 20 characters")
-        return data
-
     class Meta:
         model = EstimatePoint
         fields = "__all__"

apiserver/plane/app/serializers/inbox.py

@@ -49,6 +49,7 @@ class IssueStateInboxSerializer(BaseSerializer):
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
     assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
+    bridge_id = serializers.UUIDField(read_only=True)
     issue_inbox = InboxIssueLiteSerializer(read_only=True, many=True)
 
     class Meta:

apiserver/plane/app/serializers/issue.py

@@ -278,28 +278,17 @@ class IssueLabelSerializer(BaseSerializer):
         ]
 
 
-class IssueRelationLiteSerializer(DynamicBaseSerializer):
-    project_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "project_id",
-            "sequence_id",
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
-        ]
-
-
 class IssueRelationSerializer(BaseSerializer):
-    issue_detail = IssueRelationLiteSerializer(read_only=True, source="related_issue")
+    issue_detail = IssueProjectLiteSerializer(read_only=True, source="related_issue")
 
     class Meta:
         model = IssueRelation
         fields = [
             "issue_detail",
+            "relation_type",
+            "related_issue",
+            "issue",
+            "id"
         ]
         read_only_fields = [
             "workspace",
@@ -307,12 +296,16 @@ class IssueRelationSerializer(BaseSerializer):
         ]
 
 class RelatedIssueSerializer(BaseSerializer):
-    issue_detail = IssueRelationLiteSerializer(read_only=True, source="issue")
+    issue_detail = IssueProjectLiteSerializer(read_only=True, source="issue")
 
     class Meta:
         model = IssueRelation
         fields = [
             "issue_detail",
+            "relation_type",
+            "related_issue",
+            "issue",
+            "id"
         ]
         read_only_fields = [
             "workspace",
@@ -519,6 +512,7 @@ class IssueStateSerializer(DynamicBaseSerializer):
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
+    bridge_id = serializers.UUIDField(read_only=True)
     attachment_count = serializers.IntegerField(read_only=True)
     link_count = serializers.IntegerField(read_only=True)
 
@@ -527,58 +521,32 @@ class IssueStateSerializer(DynamicBaseSerializer):
         fields = "__all__"
 
 
-class IssueSerializer(DynamicBaseSerializer):
-    # ids
-    project_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    state_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    parent_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    module_id = serializers.PrimaryKeyRelatedField(read_only=True)
-
-    # Many to many
-    label_ids = serializers.PrimaryKeyRelatedField(read_only=True, many=True, source="labels")
-    assignee_ids = serializers.PrimaryKeyRelatedField(read_only=True, many=True, source="assignees")
-
-    # Count items
+class IssueSerializer(BaseSerializer):
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    state_detail = StateSerializer(read_only=True, source="state")
+    parent_detail = IssueStateFlatSerializer(read_only=True, source="parent")
+    label_details = LabelSerializer(read_only=True, source="labels", many=True)
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    related_issues = IssueRelationSerializer(read_only=True, source="issue_relation", many=True)
+    issue_relations = RelatedIssueSerializer(read_only=True, source="issue_related", many=True)
+    issue_cycle = IssueCycleDetailSerializer(read_only=True)
+    issue_module = IssueModuleDetailSerializer(read_only=True)
+    issue_link = IssueLinkSerializer(read_only=True, many=True)
+    issue_attachment = IssueAttachmentSerializer(read_only=True, many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
-    attachment_count = serializers.IntegerField(read_only=True)
-    link_count = serializers.IntegerField(read_only=True)
-
-    # is
-    is_subscribed = serializers.BooleanField(read_only=True)
+    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
 
     class Meta:
         model = Issue
-        fields = [
-            "id",
-            "name",
-            "state_id",
-            "description_html",
-            "sort_order",
-            "completed_at",
-            "estimate_point",
-            "priority",
-            "start_date",
-            "target_date",
-            "sequence_id",
-            "project_id",
-            "parent_id",
-            "cycle_id",
-            "module_id",
-            "label_ids",
-            "assignee_ids",
-            "sub_issues_count",
-            "created_at",
-            "updated_at",
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
             "created_by",
             "updated_by",
-            "attachment_count",
-            "link_count",
-            "is_subscribed",
-            "is_draft",
-            "archived_at",
+            "created_at",
+            "updated_at",
         ]
-        read_only_fields = fields
 
 
 class IssueLiteSerializer(DynamicBaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -2,7 +2,7 @@
 from rest_framework import serializers
 
 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .user import UserLiteSerializer
 from .project import ProjectLiteSerializer
 from .workspace import WorkspaceLiteSerializer
@@ -14,7 +14,6 @@ from plane.db.models import (
     ModuleIssue,
     ModuleLink,
     ModuleFavorite,
-    ModuleUserProperties,
 )
 
 
@@ -160,7 +159,7 @@ class ModuleLinkSerializer(BaseSerializer):
         return ModuleLink.objects.create(**validated_data)
 
 
-class ModuleSerializer(DynamicBaseSerializer):
+class ModuleSerializer(BaseSerializer):
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     lead_detail = UserLiteSerializer(read_only=True, source="lead")
     members_detail = UserLiteSerializer(read_only=True, many=True, source="members")
@@ -197,14 +196,3 @@ class ModuleFavoriteSerializer(BaseSerializer):
             "project",
             "user",
         ]
-
-class ModuleUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = ModuleUserProperties
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "module",
-            "user"
-        ]

apiserver/plane/app/serializers/project.py

@@ -159,11 +159,6 @@ class ProjectMemberAdminSerializer(BaseSerializer):
         model = ProjectMember
         fields = "__all__"
 
-class ProjectMemberRoleSerializer(DynamicBaseSerializer):
-
-    class Meta:
-        model = ProjectMember
-        fields = ("id", "role", "member", "project")
 
 class ProjectMemberInviteSerializer(BaseSerializer):
     project = ProjectLiteSerializer(read_only=True)

apiserver/plane/app/serializers/view.py

@@ -2,7 +2,7 @@
 from rest_framework import serializers
 
 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
 from plane.db.models import GlobalView, IssueView, IssueViewFavorite
@@ -38,7 +38,7 @@ class GlobalViewSerializer(BaseSerializer):
         return super().update(instance, validated_data)
 
 
-class IssueViewSerializer(DynamicBaseSerializer):
+class IssueViewSerializer(BaseSerializer):
     is_favorite = serializers.BooleanField(read_only=True)
     project_detail = ProjectLiteSerializer(source="project", read_only=True)
     workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
@@ -80,4 +80,4 @@ class IssueViewFavoriteSerializer(BaseSerializer):
             "workspace",
             "project",
             "user",
-        ]
+        ]

apiserver/plane/app/serializers/workspace.py

@@ -2,7 +2,7 @@
 from rest_framework import serializers
 
 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .user import UserLiteSerializer, UserAdminLiteSerializer
 
 from plane.db.models import (
@@ -13,11 +13,10 @@ from plane.db.models import (
     TeamMember,
     WorkspaceMemberInvite,
     WorkspaceTheme,
-    WorkspaceUserProperties,
 )
 
 
-class WorkSpaceSerializer(DynamicBaseSerializer):
+class WorkSpaceSerializer(BaseSerializer):
     owner = UserLiteSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
@@ -63,7 +62,7 @@ class WorkspaceLiteSerializer(BaseSerializer):
 
 
 
-class WorkSpaceMemberSerializer(DynamicBaseSerializer):
+class WorkSpaceMemberSerializer(BaseSerializer):
     member = UserLiteSerializer(read_only=True)
     workspace = WorkspaceLiteSerializer(read_only=True)
 
@@ -79,7 +78,7 @@ class WorkspaceMemberMeSerializer(BaseSerializer):
         fields = "__all__"
 
 
-class WorkspaceMemberAdminSerializer(DynamicBaseSerializer):
+class WorkspaceMemberAdminSerializer(BaseSerializer):
     member = UserAdminLiteSerializer(read_only=True)
     workspace = WorkspaceLiteSerializer(read_only=True)
 
@@ -162,13 +161,3 @@ class WorkspaceThemeSerializer(BaseSerializer):
             "workspace",
             "actor",
         ]
-
-
-class WorkspaceUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserProperties
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "user",
-        ]

apiserver/plane/app/urls/cycle.py

@@ -7,7 +7,6 @@ from plane.app.views import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleUserPropertiesEndpoint,
 )
 
 
@@ -45,7 +44,7 @@ urlpatterns = [
         name="project-issue-cycle",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:pk>/",
         CycleIssueViewSet.as_view(
             {
                 "get": "retrieve",
@@ -85,9 +84,4 @@ urlpatterns = [
         TransferCycleIssueEndpoint.as_view(),
         name="transfer-issues",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/user-properties/",
-        CycleUserPropertiesEndpoint.as_view(),
-        name="cycle-user-filters",
-    )
 ]

apiserver/plane/app/urls/inbox.py

@@ -40,7 +40,7 @@ urlpatterns = [
         name="inbox-issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
         InboxIssueViewSet.as_view(
             {
                 "get": "retrieve",

apiserver/plane/app/urls/issue.py

@@ -235,7 +235,7 @@ urlpatterns = [
     ## End Comment Reactions
     ## IssueProperty
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-display-properties/",
         IssueUserDisplayPropertyEndpoint.as_view(),
         name="project-issue-display-properties",
     ),
@@ -275,17 +275,16 @@ urlpatterns = [
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/",
         IssueRelationViewSet.as_view(
             {
-                "get": "list",
                 "post": "create",
             }
         ),
         name="issue-relation",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/remove-relation/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/<uuid:pk>/",
         IssueRelationViewSet.as_view(
             {
-                "post": "remove_relation",
+                "delete": "destroy",
             }
         ),
         name="issue-relation",

apiserver/plane/app/urls/module.py

@@ -7,7 +7,6 @@ from plane.app.views import (
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
     BulkImportModulesEndpoint,
-    ModuleUserPropertiesEndpoint
 )
 
 
@@ -45,7 +44,7 @@ urlpatterns = [
         name="project-module-issues",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:pk>/",
         ModuleIssueViewSet.as_view(
             {
                 "get": "retrieve",
@@ -102,9 +101,4 @@ urlpatterns = [
         BulkImportModulesEndpoint.as_view(),
         name="bulk-modules-create",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/user-properties/",
-        ModuleUserPropertiesEndpoint.as_view(),
-        name="cycle-user-filters",
-    )
 ]

apiserver/plane/app/urls/views.py

@@ -5,7 +5,7 @@ from plane.app.views import (
     IssueViewViewSet,
     GlobalViewViewSet,
     GlobalViewIssuesViewSet,
-    IssueViewFavoriteViewSet, 
+    IssueViewFavoriteViewSet,   
 )
 
 

apiserver/plane/app/urls/workspace.py

@@ -18,8 +18,6 @@ from plane.app.views import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
-    WorkspaceProjectMemberEndpoint,
-    WorkspaceUserPropertiesEndpoint,
 )
 
 
@@ -94,11 +92,6 @@ urlpatterns = [
         WorkSpaceMemberViewSet.as_view({"get": "list"}),
         name="workspace-member",
     ),
-    path(
-        "workspaces/<str:slug>/project-members/",
-        WorkspaceProjectMemberEndpoint.as_view(),
-        name="workspace-member-roles",
-    ),
     path(
         "workspaces/<str:slug>/members/<uuid:pk>/",
         WorkSpaceMemberViewSet.as_view(
@@ -202,9 +195,4 @@ urlpatterns = [
         WorkspaceLabelsEndpoint.as_view(),
         name="workspace-labels",
     ),
-    path(
-        "workspaces/<str:slug>/user-properties/",
-        WorkspaceUserPropertiesEndpoint.as_view(),
-        name="workspace-user-filters",
-    )
 ]

apiserver/plane/app/views/__init__.py

@@ -45,8 +45,6 @@ from .workspace import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
-    WorkspaceProjectMemberEndpoint,
-    WorkspaceUserPropertiesEndpoint,
 )
 from .state import StateViewSet
 from .view import (
@@ -61,7 +59,6 @@ from .cycle import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleUserPropertiesEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue import (
@@ -106,7 +103,6 @@ from .module import (
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
-    ModuleUserPropertiesEndpoint,
 )
 
 from .api import ApiTokenEndpoint

apiserver/plane/app/views/base.py

@@ -159,21 +159,6 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
         if resolve(self.request.path_info).url_name == "project":
             return self.kwargs.get("pk", None)
 
-    @property
-    def fields(self):
-        fields = [
-            field for field in self.request.GET.get("fields", "").split(",") if field
-        ]
-        return fields if fields else None
-
-    @property
-    def expand(self):
-        expand = [
-            expand for expand in self.request.GET.get("expand", "").split(",") if expand
-        ]
-        return expand if expand else None
-
-
 
 class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
     permission_classes = [
@@ -254,17 +239,3 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
     @property
     def project_id(self):
         return self.kwargs.get("project_id", None)
-
-    @property
-    def fields(self):
-        fields = [
-            field for field in self.request.GET.get("fields", "").split(",") if field
-        ]
-        return fields if fields else None
-
-    @property
-    def expand(self):
-        expand = [
-            expand for expand in self.request.GET.get("expand", "").split(",") if expand
-        ]
-        return expand if expand else None

apiserver/plane/app/views/config.py

@@ -20,6 +20,7 @@ class ConfigurationEndpoint(BaseAPIView):
     ]
 
     def get(self, request):
+
         # Get all the configuration
         (
             GOOGLE_CLIENT_ID,
@@ -89,12 +90,8 @@ class ConfigurationEndpoint(BaseAPIView):
 
         data = {}
         # Authentication
-        data["google_client_id"] = (
-            GOOGLE_CLIENT_ID if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != '""' else None
-        )
-        data["github_client_id"] = (
-            GITHUB_CLIENT_ID if GITHUB_CLIENT_ID and GITHUB_CLIENT_ID != '""' else None
-        )
+        data["google_client_id"] = GOOGLE_CLIENT_ID if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != "\"\"" else None
+        data["github_client_id"] = GITHUB_CLIENT_ID if GITHUB_CLIENT_ID and GITHUB_CLIENT_ID != "\"\"" else None
         data["github_app_name"] = GITHUB_APP_NAME
         data["magic_login"] = (
             bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
@@ -117,9 +114,7 @@ class ConfigurationEndpoint(BaseAPIView):
         # File size settings
         data["file_size_limit"] = float(os.environ.get("FILE_SIZE_LIMIT", 5242880))
 
-        # is smtp configured
-        data["is_smtp_configured"] = not (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
-        )
+        # is self managed
+        data["is_self_managed"] = bool(int(os.environ.get("IS_SELF_MANAGED", "1")))
 
         return Response(data, status=status.HTTP_200_OK)

apiserver/plane/app/views/cycle.py

@@ -11,10 +11,6 @@ from django.db.models import (
     Count,
     Prefetch,
     Sum,
-    Case,
-    When,
-    Value,
-    CharField,
 )
 from django.core import serializers
 from django.utils import timezone
@@ -33,9 +29,8 @@ from plane.app.serializers import (
     CycleFavoriteSerializer,
     IssueStateSerializer,
     CycleWriteSerializer,
-    CycleUserPropertiesSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission, ProjectLitePermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
     User,
     Cycle,
@@ -45,7 +40,6 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     Label,
-    CycleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -163,23 +157,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                     ),
                 )
             )
-            .annotate(
-                status=Case(
-                    When(
-                        Q(start_date__lte=timezone.now())
-                        & Q(end_date__gte=timezone.now()),
-                        then=Value("CURRENT"),
-                    ),
-                    When(start_date__gt=timezone.now(), then=Value("UPCOMING")),
-                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
-                    When(
-                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
-                        then=Value("DRAFT"),
-                    ),
-                    default=Value("DRAFT"),
-                    output_field=CharField(),
-                )
-            )
             .prefetch_related(
                 Prefetch(
                     "issue_cycle__issue__assignees",
@@ -199,9 +176,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
         cycle_view = request.GET.get("cycle_view", "all")
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
 
-        queryset = queryset.order_by("-is_favorite", "-created_at")
+        queryset = queryset.order_by("-is_favorite","-created_at")
 
         # Current Cycle
         if cycle_view == "current":
@@ -305,8 +281,44 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
 
             return Response(data, status=status.HTTP_200_OK)
 
-        cycles = CycleSerializer(queryset, many=True).data
-        return Response(cycles, status=status.HTTP_200_OK)
+        # Upcoming Cycles
+        if cycle_view == "upcoming":
+            queryset = queryset.filter(start_date__gt=timezone.now())
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Completed Cycles
+        if cycle_view == "completed":
+            queryset = queryset.filter(end_date__lt=timezone.now())
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Draft Cycles
+        if cycle_view == "draft":
+            queryset = queryset.filter(
+                end_date=None,
+                start_date=None,
+            )
+
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Incomplete Cycles
+        if cycle_view == "incomplete":
+            queryset = queryset.filter(
+                Q(end_date__gte=timezone.now().date()) | Q(end_date__isnull=True),
+            )
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # If no matching view is found return all cycles
+        return Response(
+            CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+        )
 
     def create(self, request, slug, project_id):
         if (
@@ -538,6 +550,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(bridge_id=F("issue_cycle__id"))
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
             .select_related("project")
@@ -561,10 +574,10 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 .values("count")
             )
         )
-        serializer = IssueStateSerializer(
-            issues, many=True, fields=fields if fields else None
-        )
-        return Response(serializer.data, status=status.HTTP_200_OK)
+
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id, cycle_id):
         issues = request.data.get("issues", [])
@@ -657,13 +670,11 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    def destroy(self, request, slug, project_id, cycle_id, issue_id):
+    def destroy(self, request, slug, project_id, cycle_id, pk):
         cycle_issue = CycleIssue.objects.get(
-            issue_id=issue_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            cycle_id=cycle_id,
+            pk=pk, workspace__slug=slug, project_id=project_id, cycle_id=cycle_id
         )
+        issue_id = cycle_issue.issue_id
         issue_activity.delay(
             type="cycle.activity.deleted",
             requested_data=json.dumps(
@@ -673,7 +684,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 }
             ),
             actor_id=str(self.request.user.id),
-            issue_id=str(issue_id),
+            issue_id=str(cycle_issue.issue_id),
             project_id=str(self.kwargs.get("project_id", None)),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
@@ -794,40 +805,4 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             updated_cycles, ["cycle_id"], batch_size=100
         )
 
-        return Response({"message": "Success"}, status=status.HTTP_200_OK)
-
-
-class CycleUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def patch(self, request, slug, project_id, cycle_id):
-        cycle_properties = CycleUserProperties.objects.get(
-            user=request.user,
-            cycle_id=cycle_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-
-        cycle_properties.filters = request.data.get("filters", cycle_properties.filters)
-        cycle_properties.display_filters = request.data.get(
-            "display_filters", cycle_properties.display_filters
-        )
-        cycle_properties.display_properties = request.data.get(
-            "display_properties", cycle_properties.display_properties
-        )
-        cycle_properties.save()
-
-        serializer = CycleUserPropertiesSerializer(cycle_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug, project_id, cycle_id):
-        cycle_properties, _ = CycleUserProperties.objects.get_or_create(
-            user=request.user,
-            project_id=project_id,
-            cycle_id=cycle_id,
-            workspace__slug=slug,
-        )
-        serializer = CycleUserPropertiesSerializer(cycle_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response({"message": "Success"}, status=status.HTTP_200_OK)

apiserver/plane/app/views/estimate.py

@@ -53,11 +53,11 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             )
 
         estimate_points = request.data.get("estimate_points", [])
-        
-        serializer = EstimatePointSerializer(data=request.data.get("estimate_points"), many=True)
-        if not serializer.is_valid():
+
+        if not len(estimate_points) or len(estimate_points) > 8:
             return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
+                {"error": "Estimate points are required"},
+                status=status.HTTP_400_BAD_REQUEST,
             )
 
         estimate_serializer = EstimateSerializer(data=request.data.get("estimate"))

apiserver/plane/app/views/importer.py

@@ -1,5 +1,7 @@
 # Python imports
 import uuid
+import json
+import requests
 
 # Third party imports
 from rest_framework import status
@@ -7,7 +9,7 @@ from rest_framework.response import Response
 
 # Django imports
 from django.db.models import Max, Q
-
+from django.conf import settings
 # Module imports
 from plane.app.views import BaseAPIView
 from plane.db.models import (
@@ -34,20 +36,15 @@ from plane.app.serializers import (
     IssueFlatSerializer,
     ModuleSerializer,
 )
-from plane.utils.integrations.github import get_github_repo_details
-from plane.utils.importers.jira import jira_project_issue_summary
-from plane.bgtasks.importer_task import service_importer
 from plane.utils.html_processor import strip_tags
 from plane.app.permissions import WorkSpaceAdminPermission
-
+from plane.bgtasks.importer_task import service_importer
 
 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
-
     def get(self, request, slug, service):
         if service == "github":
             owner = request.GET.get("owner", False)
             repo = request.GET.get("repo", False)
-
             if not owner or not repo:
                 return Response(
                     {"error": "Owner and repo are required"},
@@ -58,11 +55,10 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                 integration__provider="github", workspace__slug=slug
             )
 
-            access_tokens_url = workspace_integration.metadata.get(
-                "access_tokens_url", False
-            )
+            installtion_id = workspace_integration.config.get("installation_id", False)
 
-            if not access_tokens_url:
+            # Check for the installation id
+            if not installtion_id:
                 return Response(
                     {
                         "error": "There was an error during the installation of the GitHub app. To resolve this issue, we recommend reinstalling the GitHub app."
@@ -70,18 +66,33 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            issue_count, labels, collaborators = get_github_repo_details(
-                access_tokens_url, owner, repo
-            )
+            # Request segway for the required information
+            if settings.SEGWAY_BASE_URL:
+                headers = {
+                    "Content-Type": "application/json",
+                    "x-api-key": settings.SEGWAY_KEY,
+                }
+                data = {
+                    "owner": owner,
+                    "repo": repo,
+                    "installationId": installtion_id,
+                }
+                res = requests.post(
+                    f"{settings.SEGWAY_BASE_URL}/api/github",
+                    data=json.dumps(data),
+                    headers=headers,
+                )
+                if "error" in res.json():
+                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
+                else:
+                    return Response(
+                        res.json(),
+                        status=status.HTTP_200_OK,
+                    )
             return Response(
-                {
-                    "issue_count": issue_count,
-                    "labels": labels,
-                    "collaborators": collaborators,
-                },
-                status=status.HTTP_200_OK,
+                {"error": "Inetgration service is not available please try later"},
+                status=status.HTTP_400_BAD_REQUEST,
             )
-
         if service == "jira":
             # Check for all the keys
             params = {
@@ -102,16 +113,35 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
             email = request.GET.get("email", "")
             cloud_hostname = request.GET.get("cloud_hostname", "")
 
-            response = jira_project_issue_summary(
-                email, api_token, project_key, cloud_hostname
-            )
-            if "error" in response:
-                return Response(response, status=status.HTTP_400_BAD_REQUEST)
-            else:
-                return Response(
-                    response,
-                    status=status.HTTP_200_OK,
+            if settings.SEGWAY_BASE_URL:
+                headers = {
+                    "Content-Type": "application/json",
+                    "x-api-key": settings.SEGWAY_KEY,
+                }
+                data = {
+                    "project_key": project_key,
+                    "api_token": api_token,
+                    "email": email,
+                    "cloud_hostname": cloud_hostname,
+                }
+                res = requests.post(
+                    f"{settings.SEGWAY_BASE_URL}/api/jira",
+                    data=json.dumps(data),
+                    headers=headers,
                 )
+
+                if "error" in res.json():
+                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
+                else:
+                    return Response(
+                        res.json(),
+                        status=status.HTTP_200_OK,
+                    )
+
+            return Response(
+                {"error": "Inetgration service is not available please try later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         return Response(
             {"error": "Service not supported yet"},
             status=status.HTTP_400_BAD_REQUEST,
@@ -122,7 +152,21 @@ class ImportServiceEndpoint(BaseAPIView):
     permission_classes = [
         WorkSpaceAdminPermission,
     ]
+
     def post(self, request, slug, service):
+        if service not in ["github", "jira"]:
+            return Response(
+                {"error": "Servivce not supported yet"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        if service == "github":
+            workspace_integration = WorkspaceIntegration.objects.get(
+                integration__provider="github", workspace__slug=slug
+            )
+
+            installation_id = workspace_integration.config.get("installation_id", False)
+
         project_id = request.data.get("project_id", False)
 
         if not project_id:
@@ -130,87 +174,84 @@ class ImportServiceEndpoint(BaseAPIView):
                 {"error": "Project ID is required"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
         workspace = Workspace.objects.get(slug=slug)
 
-        if service == "github":
-            data = request.data.get("data", False)
-            metadata = request.data.get("metadata", False)
-            config = request.data.get("config", False)
-            if not data or not metadata or not config:
-                return Response(
-                    {"error": "Data, config and metadata are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            api_token = APIToken.objects.filter(
-                user=request.user, workspace=workspace
-            ).first()
-            if api_token is None:
-                api_token = APIToken.objects.create(
-                    user=request.user,
-                    label="Importer",
-                    workspace=workspace,
-                )
-
-            importer = Importer.objects.create(
-                service=service,
-                project_id=project_id,
-                status="queued",
-                initiated_by=request.user,
-                data=data,
-                metadata=metadata,
-                token=api_token,
-                config=config,
-                created_by=request.user,
-                updated_by=request.user,
+        # Validate the data
+        data = request.data.get("data", False)
+        metadata = request.data.get("metadata", False)
+        config = request.data.get("config", False)
+        if not data or not metadata or not config:
+            return Response(
+                {"error": "Data, config and metadata are required"},
+                status=status.HTTP_400_BAD_REQUEST,
             )
 
-            service_importer.delay(service, importer.id)
-            serializer = ImporterSerializer(importer)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        # Update config
+        if config and service == "github":
+            config.update({"installation_id": installation_id})
 
-        if service == "jira":
-            data = request.data.get("data", False)
-            metadata = request.data.get("metadata", False)
-            config = request.data.get("config", False)
-            if not data or not metadata:
-                return Response(
-                    {"error": "Data, config and metadata are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            api_token = APIToken.objects.filter(
-                user=request.user, workspace=workspace
-            ).first()
-            if api_token is None:
-                api_token = APIToken.objects.create(
-                    user=request.user,
-                    label="Importer",
-                    workspace=workspace,
-                )
-
-            importer = Importer.objects.create(
-                service=service,
-                project_id=project_id,
-                status="queued",
-                initiated_by=request.user,
-                data=data,
-                metadata=metadata,
-                token=api_token,
-                config=config,
-                created_by=request.user,
-                updated_by=request.user,
+        # Get the api token -- # derecated
+        api_token = APIToken.objects.filter(
+            user=request.user, workspace=workspace
+        ).first()
+        if api_token is None:
+            api_token = APIToken.objects.create(
+                user=request.user,
+                label="Importer",
+                workspace=workspace,
             )
 
-            service_importer.delay(service, importer.id)
-            serializer = ImporterSerializer(importer)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-        return Response(
-            {"error": "Servivce not supported yet"},
-            status=status.HTTP_400_BAD_REQUEST,
+        # Create an import
+        importer = Importer.objects.create(
+            service=service,
+            project_id=project_id,
+            status="queued",
+            initiated_by=request.user,
+            data=data,
+            metadata=metadata,
+            token=api_token,
+            config=config,
+            created_by=request.user,
+            updated_by=request.user,
         )
 
+        # Push it to segway
+        if settings.SEGWAY_BASE_URL:
+            headers = {
+                "Content-Type": "application/json",
+                "x-api-key": settings.SEGWAY_KEY,
+            }
+            data = {
+                "metadata": metadata,
+                "data": data,
+                "config": config,
+                "workspace_id": str(workspace.id),
+                "project_id": str(project_id),
+                "created_by": str(request.user.id),
+                "importer_id": str(importer.id),
+            }
+            res = requests.post(
+                f"{settings.SEGWAY_BASE_URL}/api/github/import",
+                data=json.dumps(data),
+                headers=headers,
+            )
+
+            if "error" in res.json():
+                importer.status = "failed"
+                importer.reason = str(res.json())
+                importer.save()
+            else:
+                importer.status = "processing"
+                importer.save(update_fields=["status"])
+        else:
+            importer.status = "failed"
+            importer.reason = "Segway base url is not present"
+            importer.save(update_fields=["status", "reason"])
+
+        # return the response
+        serializer = ImporterSerializer(importer)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
     def get(self, request, slug):
         imports = (
             Importer.objects.filter(workspace__slug=slug)
@@ -221,9 +262,7 @@ class ImportServiceEndpoint(BaseAPIView):
         return Response(serializer.data)
 
     def delete(self, request, slug, service, pk):
-        importer = Importer.objects.get(
-            pk=pk, service=service, workspace__slug=slug
-        )
+        importer = Importer.objects.get(pk=pk, service=service, workspace__slug=slug)
 
         if importer.imported_data is not None:
             # Delete all imported Issues
@@ -241,9 +280,7 @@ class ImportServiceEndpoint(BaseAPIView):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def patch(self, request, slug, service, pk):
-        importer = Importer.objects.get(
-            pk=pk, service=service, workspace__slug=slug
-        )
+        importer = Importer.objects.get(pk=pk, service=service, workspace__slug=slug)
         serializer = ImporterSerializer(importer, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
@@ -479,9 +516,7 @@ class BulkImportModulesEndpoint(BaseAPIView):
                 [
                     ModuleLink(
                         module=module,
-                        url=module_data.get("link", {}).get(
-                            "url", "https://plane.so"
-                        ),
+                        url=module_data.get("link", {}).get("url", "https://plane.so"),
                         title=module_data.get("link", {}).get(
                             "title", "Original Issue"
                         ),

apiserver/plane/app/views/inbox.py

@@ -107,6 +107,7 @@ class InboxIssueViewSet(BaseViewSet):
                 project_id=project_id,
             )
             .filter(**filters)
+            .annotate(bridge_id=F("issue_inbox__id"))
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels")
             .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
@@ -203,9 +204,9 @@ class InboxIssueViewSet(BaseViewSet):
         serializer = IssueStateInboxSerializer(issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def partial_update(self, request, slug, project_id, inbox_id, issue_id):
+    def partial_update(self, request, slug, project_id, inbox_id, pk):
         inbox_issue = InboxIssue.objects.get(
-            issue_id=issue_id, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
         )
         # Get the project member
         project_member = ProjectMember.objects.get(
@@ -315,16 +316,19 @@ class InboxIssueViewSet(BaseViewSet):
                 InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
             )
 
-    def retrieve(self, request, slug, project_id, inbox_id, issue_id):
+    def retrieve(self, request, slug, project_id, inbox_id, pk):
+        inbox_issue = InboxIssue.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+        )
         issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
+            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
         )
         serializer = IssueStateInboxSerializer(issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def destroy(self, request, slug, project_id, inbox_id, issue_id):
+    def destroy(self, request, slug, project_id, inbox_id, pk):
         inbox_issue = InboxIssue.objects.get(
-            issue_id=issue_id, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
         )
         # Get the project member
         project_member = ProjectMember.objects.get(
@@ -346,7 +350,7 @@ class InboxIssueViewSet(BaseViewSet):
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
             Issue.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=issue_id
+                workspace__slug=slug, project_id=project_id, pk=inbox_issue.issue_id
             ).delete()
 
         inbox_issue.delete()

apiserver/plane/app/views/integration/base.py

@@ -1,8 +1,11 @@
 # Python improts
 import uuid
 import requests
+import json
+
 # Django imports
 from django.contrib.auth.hashers import make_password
+from django.conf import settings
 
 # Third party imports
 from rest_framework.response import Response
@@ -27,6 +30,7 @@ from plane.utils.integrations.github import (
 from plane.app.permissions import WorkSpaceAdminPermission
 from plane.utils.integrations.slack import slack_oauth
 
+
 class IntegrationViewSet(BaseViewSet):
     serializer_class = IntegrationSerializer
     model = Integration
@@ -46,9 +50,7 @@ class IntegrationViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        serializer = IntegrationSerializer(
-            integration, data=request.data, partial=True
-        )
+        serializer = IntegrationSerializer(integration, data=request.data, partial=True)
 
         if serializer.is_valid():
             serializer.save()
@@ -94,14 +96,30 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
                     {"error": "Installation ID is required"},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
-            metadata = get_github_metadata(installation_id)
+            # Push it to segway
+            if settings.SEGWAY_BASE_URL:
+                headers = {
+                    "Content-Type": "application/json",
+                    "x-api-key": settings.SEGWAY_KEY,
+                }
+                data = {"installationId": installation_id}
+                res = requests.post(
+                    f"{settings.SEGWAY_BASE_URL}/api/github/metadata",
+                    data=json.dumps(data),
+                    headers=headers,
+                )
+                if "error" in res.json():
+                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
+                metadata = res.json()
             config = {"installation_id": installation_id}
 
         if provider == "slack":
             code = request.data.get("code", False)
 
             if not code:
-                return Response({"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST
+                )
 
             slack_response = slack_oauth(code=code)
 
@@ -123,9 +141,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
             is_password_autoset=True,
             is_bot=True,
             first_name=integration.title,
-            avatar=integration.avatar_url
-            if integration.avatar_url is not None
-            else "",
+            avatar=integration.avatar_url if integration.avatar_url is not None else "",
         )
 
         # Create an API Token for the bot user
@@ -161,9 +177,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
         )
 
         if workspace_integration.integration.provider == "github":
-            installation_id = workspace_integration.config.get(
-                "installation_id", False
-            )
+            installation_id = workspace_integration.config.get("installation_id", False)
             if installation_id:
                 delete_github_installation(installation_id=installation_id)
 

apiserver/plane/app/views/integration/github.py

@@ -1,8 +1,15 @@
+# Python imports
+import json
+import requests
+
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
+# Django imports
+from django.conf import settings
+
 # Module imports
 from plane.app.views import BaseViewSet, BaseAPIView
 from plane.db.models import (
@@ -35,19 +42,32 @@ class GithubRepositoriesEndpoint(BaseAPIView):
             workspace__slug=slug, pk=workspace_integration_id
         )
 
-        if workspace_integration.integration.provider != "github":
+        installation_id = workspace_integration.config.get("installation_id")
+
+        if not installation_id:
             return Response(
                 {"error": "Not a github integration"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
-        access_tokens_url = workspace_integration.metadata["access_tokens_url"]
-        repositories_url = (
-            workspace_integration.metadata["repositories_url"]
-            + f"?per_page=100&page={page}"
-        )
-        repositories = get_github_repos(access_tokens_url, repositories_url)
-        return Response(repositories, status=status.HTTP_200_OK)
+        # Push it to segway
+        if settings.SEGWAY_BASE_URL:
+            headers = {
+                "Content-Type": "application/json",
+                "x-api-key": settings.SEGWAY_KEY,
+            }
+            data = {
+                "installationId": installation_id,
+                "page": page,
+            }
+            res = requests.post(
+                f"{settings.SEGWAY_BASE_URL}/api/github/repos",
+                data=json.dumps(data),
+                headers=headers,
+            )
+            if "error" in res.json():
+                return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
+            else:
+                return Response(res.json(), status=status.HTTP_200_OK)
 
 
 class GithubRepositorySyncViewSet(BaseViewSet):

apiserver/plane/app/views/issue.py

@@ -52,7 +52,6 @@ from plane.app.serializers import (
     IssueRelationSerializer,
     RelatedIssueSerializer,
     IssuePublicSerializer,
-    IssueRelationLiteSerializer,
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
@@ -130,6 +129,22 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                     queryset=IssueReaction.objects.select_related("actor"),
                 )
             )
+        ).distinct()
+
+    @method_decorator(gzip_page)
+    def list(self, request, slug, project_id):
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
+        filters = issue_filters(request.query_params, "GET")
+
+        # Custom ordering for priority and state
+        priority_order = ["urgent", "high", "medium", "low", "none"]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+
+        order_by_param = request.GET.get("order_by", "-created_at")
+
+        issue_queryset = (
+            self.get_queryset()
+            .filter(**filters)
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
             .annotate(module_id=F("issue_module__module_id"))
             .annotate(
@@ -144,26 +159,7 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
-        ).distinct()
-
-    @method_decorator(gzip_page)
-    def list(self, request, slug, project_id):
-        filters = issue_filters(request.query_params, "GET")
-
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-
-        order_by_param = request.GET.get("order_by", "-created_at")
-
-        issue_queryset = self.get_queryset().filter(**filters)
+        )
 
         # Priority Ordering
         if order_by_param == "priority" or order_by_param == "-priority":
@@ -221,10 +217,9 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        issues = IssueSerializer(
-            issue_queryset, many=True, fields=self.fields, expand=self.expand
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
@@ -261,10 +256,7 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
             .annotate(count=Func(F("id"), function="Count"))
             .values("count")
         ).get(workspace__slug=slug, project_id=project_id, pk=pk)
-        return Response(
-            IssueSerializer(issue, fields=self.fields, expand=self.expand).data,
-            status=status.HTTP_200_OK,
-        )
+        return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
@@ -598,19 +590,16 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
         ProjectLitePermission,
     ]
 
-    def patch(self, request, slug, project_id):
-        issue_property = IssueProperty.objects.get(
+    def post(self, request, slug, project_id):
+        issue_property, created = IssueProperty.objects.get_or_create(
             user=request.user,
             project_id=project_id,
         )
 
-        issue_property.filters = request.data.get("filters", issue_property.filters)
-        issue_property.display_filters = request.data.get(
-            "display_filters", issue_property.display_filters
-        )
-        issue_property.display_properties = request.data.get(
-            "display_properties", issue_property.display_properties
-        )
+        if not created:
+            issue_property.properties = request.data.get("properties", {})
+            issue_property.save()
+        issue_property.properties = request.data.get("properties", {})
         issue_property.save()
         serializer = IssuePropertySerializer(issue_property)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
@@ -719,13 +708,6 @@ class SubIssuesEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
             .prefetch_related(
                 Prefetch(
                     "issue_reactions",
@@ -746,7 +728,7 @@ class SubIssuesEndpoint(BaseAPIView):
             item["state_group"]: item["state_count"] for item in state_distribution
         }
 
-        serializer = IssueSerializer(
+        serializer = IssueLiteSerializer(
             sub_issues,
             many=True,
         )
@@ -793,7 +775,7 @@ class SubIssuesEndpoint(BaseAPIView):
         ]
 
         return Response(
-            IssueSerializer(updated_sub_issues, many=True).data,
+            IssueFlatSerializer(updated_sub_issues, many=True).data,
             status=status.HTTP_200_OK,
         )
 
@@ -1080,10 +1062,9 @@ class IssueArchiveViewSet(BaseViewSet):
             else issue_queryset.filter(parent__isnull=True)
         )
 
-        issues = IssueLiteSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(
@@ -1384,62 +1365,23 @@ class IssueRelationViewSet(BaseViewSet):
             .distinct()
         )
 
-    def list(self, request, slug, project_id, issue_id):
-        issue_relations = (
-            IssueRelation.objects.filter(Q(issue_id=issue_id) | Q(related_issue=issue_id))
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("issue")
-            .order_by("-created_at")
-            .distinct()
-        )
-
-        blocking_issues = issue_relations.filter(relation_type="blocked_by", related_issue_id=issue_id)
-        blocked_by_issues = issue_relations.filter(relation_type="blocked_by", issue_id=issue_id)
-        duplicate_issues = issue_relations.filter(issue_id=issue_id, relation_type="duplicate")
-        duplicate_issues_related = issue_relations.filter(related_issue_id=issue_id, relation_type="duplicate")
-        relates_to_issues = issue_relations.filter(issue_id=issue_id, relation_type="relates_to")
-        relates_to_issues_related = issue_relations.filter(related_issue_id=issue_id, relation_type="relates_to")
-
-        blocked_by_issues_serialized = IssueRelationSerializer(blocked_by_issues, many=True).data
-        duplicate_issues_serialized = IssueRelationSerializer(duplicate_issues, many=True).data
-        relates_to_issues_serialized = IssueRelationSerializer(relates_to_issues, many=True).data
-
-        # revere relation for blocked by issues
-        blocking_issues_serialized = RelatedIssueSerializer(blocking_issues, many=True).data
-        # reverse relation for duplicate issues
-        duplicate_issues_related_serialized = RelatedIssueSerializer(duplicate_issues_related, many=True).data
-        # reverse relation for related issues
-        relates_to_issues_related_serialized = RelatedIssueSerializer(relates_to_issues_related, many=True).data
-
-        response_data = {
-            'blocking': blocking_issues_serialized,
-            'blocked_by': blocked_by_issues_serialized,
-            'duplicate': duplicate_issues_serialized + duplicate_issues_related_serialized,
-            'relates_to': relates_to_issues_serialized + relates_to_issues_related_serialized,
-        }
-
-        return Response(response_data, status=status.HTTP_200_OK)
-
-
     def create(self, request, slug, project_id, issue_id):
-        relation_type = request.data.get("relation_type", None)
-        issues = request.data.get("issues", [])
+        related_list = request.data.get("related_list", [])
+        relation = request.data.get("relation", None)
         project = Project.objects.get(pk=project_id)
 
         issue_relation = IssueRelation.objects.bulk_create(
             [
                 IssueRelation(
-                    issue_id=issue if relation_type == "blocking" else issue_id,
-                    related_issue_id=issue_id if relation_type == "blocking" else issue,
-                    relation_type="blocked_by" if relation_type == "blocking" else relation_type,
+                    issue_id=related_issue["issue"],
+                    related_issue_id=related_issue["related_issue"],
+                    relation_type=related_issue["relation_type"],
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     created_by=request.user,
                     updated_by=request.user,
                 )
-                for issue in issues
+                for related_issue in related_list
             ],
             batch_size=10,
             ignore_conflicts=True,
@@ -1455,7 +1397,7 @@ class IssueRelationViewSet(BaseViewSet):
             epoch=int(timezone.now().timestamp()),
         )
 
-        if relation_type == "blocking":
+        if relation == "blocking":
             return Response(
                 RelatedIssueSerializer(issue_relation, many=True).data,
                 status=status.HTTP_201_CREATED,
@@ -1466,18 +1408,10 @@ class IssueRelationViewSet(BaseViewSet):
                 status=status.HTTP_201_CREATED,
             )
 
-    def remove_relation(self, request, slug, project_id, issue_id):
-        relation_type = request.data.get("relation_type", None)
-        related_issue = request.data.get("related_issue", None)
-
-        if relation_type == "blocking":
-            issue_relation = IssueRelation.objects.get(
-                workspace__slug=slug, project_id=project_id, issue_id=related_issue, related_issue_id=issue_id
-            )
-        else:
-            issue_relation = IssueRelation.objects.get(
-                workspace__slug=slug, project_id=project_id, issue_id=issue_id, related_issue_id=related_issue
-            )
+    def destroy(self, request, slug, project_id, issue_id, pk):
+        issue_relation = IssueRelation.objects.get(
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
+        )
         current_instance = json.dumps(
             IssueRelationSerializer(issue_relation).data,
             cls=DjangoJSONEncoder,
@@ -1485,7 +1419,7 @@ class IssueRelationViewSet(BaseViewSet):
         issue_relation.delete()
         issue_activity.delay(
             type="issue_relation.activity.deleted",
-            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+            requested_data=json.dumps({"related_list": None}),
             actor_id=str(request.user.id),
             issue_id=str(issue_id),
             project_id=str(project_id),
@@ -1613,10 +1547,9 @@ class IssueDraftViewSet(BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        issues = IssueLiteSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
@@ -1693,4 +1626,4 @@ class IssueDraftViewSet(BaseViewSet):
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
         )
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/module.py

@@ -21,9 +21,8 @@ from plane.app.serializers import (
     ModuleLinkSerializer,
     ModuleFavoriteSerializer,
     IssueStateSerializer,
-    ModuleUserPropertiesSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission, ProjectLitePermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
     Module,
     ModuleIssue,
@@ -33,7 +32,6 @@ from plane.db.models import (
     ModuleFavorite,
     IssueLink,
     IssueAttachment,
-    ModuleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -56,6 +54,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def get_queryset(self):
+
         subquery = ModuleFavorite.objects.filter(
             user=self.request.user,
             module_id=OuterRef("pk"),
@@ -137,7 +136,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                     ),
                 )
             )
-            .order_by("-is_favorite", "-created_at")
+            .order_by("-is_favorite","-created_at")
         )
 
     def create(self, request, slug, project_id):
@@ -154,14 +153,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def list(self, request, slug, project_id):
-        queryset = self.get_queryset()
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-        modules = ModuleSerializer(
-            queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(modules, status=status.HTTP_200_OK)
-
     def retrieve(self, request, slug, project_id, pk):
         queryset = self.get_queryset().get(pk=pk)
 
@@ -298,6 +289,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
     webhook_event = "module_issue"
     bulk = True
 
+
     filterset_fields = [
         "issue__labels__id",
         "issue__assignees__id",
@@ -343,6 +335,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(bridge_id=F("issue_module__id"))
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
             .select_related("project")
@@ -366,10 +359,9 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                 .values("count")
             )
         )
-        serializer = IssueStateSerializer(
-            issues, many=True, fields=fields if fields else None
-        )
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id, module_id):
         issues = request.data.get("issues", [])
@@ -452,23 +444,20 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    def destroy(self, request, slug, project_id, module_id, issue_id):
+    def destroy(self, request, slug, project_id, module_id, pk):
         module_issue = ModuleIssue.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            module_id=module_id,
-            issue_id=issue_id,
+            workspace__slug=slug, project_id=project_id, module_id=module_id, pk=pk
         )
         issue_activity.delay(
             type="module.activity.deleted",
             requested_data=json.dumps(
                 {
                     "module_id": str(module_id),
-                    "issues": [str(issue_id)],
+                    "issues": [str(module_issue.issue_id)],
                 }
             ),
             actor_id=str(request.user.id),
-            issue_id=str(issue_id),
+            issue_id=str(module_issue.issue_id),
             project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
@@ -532,42 +521,4 @@ class ModuleFavoriteViewSet(BaseViewSet):
             module_id=module_id,
         )
         module_favorite.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class ModuleUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def patch(self, request, slug, project_id, module_id):
-        module_properties = ModuleUserProperties.objects.get(
-            user=request.user,
-            module_id=module_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-
-        module_properties.filters = request.data.get(
-            "filters", module_properties.filters
-        )
-        module_properties.display_filters = request.data.get(
-            "display_filters", module_properties.display_filters
-        )
-        module_properties.display_properties = request.data.get(
-            "display_properties", module_properties.display_properties
-        )
-        module_properties.save()
-
-        serializer = ModuleUserPropertiesSerializer(module_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug, project_id, module_id):
-        module_properties, _ = ModuleUserProperties.objects.get_or_create(
-            user=request.user,
-            project_id=project_id,
-            module_id=module_id,
-            workspace__slug=slug,
-        )
-        serializer = ModuleUserPropertiesSerializer(module_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/page.py

@@ -157,8 +157,9 @@ class PageViewSet(BaseViewSet):
 
     def list(self, request, slug, project_id):
         queryset = self.get_queryset().filter(archived_at__isnull=True)
-        pages = PageSerializer(queryset, many=True).data
-        return Response(pages, status=status.HTTP_200_OK)
+        return Response(
+            PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+        )
 
     def archive(self, request, slug, project_id, page_id):
         page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
@@ -209,9 +210,9 @@ class PageViewSet(BaseViewSet):
             workspace__slug=slug,
         ).filter(archived_at__isnull=False)
 
-        pages = PageSerializer(pages, many=True).data
-        return Response(pages, status=status.HTTP_200_OK)
-
+        return Response(
+            PageSerializer(pages, many=True).data, status=status.HTTP_200_OK
+        )
 
     def destroy(self, request, slug, project_id, pk):
         page = Page.objects.get(pk=pk, workspace__slug=slug, project_id=project_id)

apiserver/plane/app/views/project.py

@@ -36,7 +36,6 @@ from plane.app.serializers import (
     ProjectFavoriteSerializer,
     ProjectDeployBoardSerializer,
     ProjectMemberAdminSerializer,
-    ProjectMemberRoleSerializer,
 )
 
 from plane.app.permissions import (
@@ -181,9 +180,12 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                     projects, many=True
                 ).data,
             )
-        projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).data
-        return Response(projects, status=status.HTTP_200_OK)
 
+        return Response(
+            ProjectListSerializer(
+                projects, many=True, fields=fields if fields else None
+            ).data
+        )
 
     def create(self, request, slug):
         try:
@@ -711,7 +713,13 @@ class ProjectMemberViewSet(BaseViewSet):
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def list(self, request, slug, project_id):
-        # Get the list of project members for the project
+        project_member = ProjectMember.objects.get(
+            member=request.user,
+            workspace__slug=slug,
+            project_id=project_id,
+            is_active=True,
+        )
+
         project_members = ProjectMember.objects.filter(
             project_id=project_id,
             workspace__slug=slug,
@@ -719,7 +727,10 @@ class ProjectMemberViewSet(BaseViewSet):
             is_active=True,
         ).select_related("project", "member", "workspace")
 
-        serializer = ProjectMemberRoleSerializer(project_members, fields=("id", "member", "role"), many=True)
+        if project_member.role > 10:
+            serializer = ProjectMemberAdminSerializer(project_members, many=True)
+        else:
+            serializer = ProjectMemberSerializer(project_members, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, project_id, pk):
@@ -999,11 +1010,18 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):
 
     def get(self, request):
         files = []
-        s3 = boto3.client(
-            "s3",
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        )
+        s3_client_params = {
+            "service_name": "s3",
+            "aws_access_key_id": settings.AWS_ACCESS_KEY_ID,
+            "aws_secret_access_key": settings.AWS_SECRET_ACCESS_KEY,
+        }
+
+        # Use AWS_S3_ENDPOINT_URL if it is present in the settings
+        if hasattr(settings, "AWS_S3_ENDPOINT_URL") and settings.AWS_S3_ENDPOINT_URL:
+            s3_client_params["endpoint_url"] = settings.AWS_S3_ENDPOINT_URL
+
+        s3 = boto3.client(**s3_client_params)
+
         params = {
             "Bucket": settings.AWS_STORAGE_BUCKET_NAME,
             "Prefix": "static/project-cover/",
@@ -1016,9 +1034,19 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):
                 if not content["Key"].endswith(
                     "/"
                 ):  # This line ensures we're only getting files, not "sub-folders"
-                    files.append(
-                        f"https://{settings.AWS_STORAGE_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
-                    )
+                    if (
+                        hasattr(settings, "AWS_S3_CUSTOM_DOMAIN")
+                        and settings.AWS_S3_CUSTOM_DOMAIN
+                        and hasattr(settings, "AWS_S3_URL_PROTOCOL")
+                        and settings.AWS_S3_URL_PROTOCOL
+                    ):
+                        files.append(
+                            f"{settings.AWS_S3_URL_PROTOCOL}//{settings.AWS_S3_CUSTOM_DOMAIN}/{content['Key']}"
+                        )
+                    else:
+                        files.append(
+                            f"https://{settings.AWS_STORAGE_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
+                        )
 
         return Response(files, status=status.HTTP_200_OK)
 

apiserver/plane/app/views/search.py

@@ -50,8 +50,7 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             if field == "sequence_id":
-                # Match whole integers only (exclude decimal numbers)
-                sequences = re.findall(r"\b\d+\b", query)
+                sequences = re.findall(r"\d+\.\d+|\d+", query)
                 for sequence_id in sequences:
                     q |= Q(**{"sequence_id": sequence_id})
             else:

apiserver/plane/app/views/view.py

@@ -27,12 +27,7 @@ from plane.app.serializers import (
     IssueLiteSerializer,
     IssueViewFavoriteSerializer,
 )
-from plane.app.permissions import (
-    WorkspaceEntityPermission,
-    ProjectEntityPermission,
-    WorkspaceViewerPermission,
-    ProjectLitePermission,
-)
+from plane.app.permissions import WorkspaceEntityPermission, ProjectEntityPermission
 from plane.db.models import (
     Workspace,
     GlobalView,
@@ -48,8 +43,8 @@ from plane.utils.grouper import group_results
 
 
 class GlobalViewViewSet(BaseViewSet):
-    serializer_class = IssueViewSerializer
-    model = IssueView
+    serializer_class = GlobalViewSerializer
+    model = GlobalView
     permission_classes = [
         WorkspaceEntityPermission,
     ]
@@ -63,7 +58,6 @@ class GlobalViewViewSet(BaseViewSet):
             super()
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project__isnull=True)
             .select_related("workspace")
             .order_by(self.request.GET.get("order_by", "-created_at"))
             .distinct()
@@ -185,10 +179,12 @@ class GlobalViewIssuesViewSet(BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        serializer = IssueLiteSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(
+            issue_dict,
+            status=status.HTTP_200_OK,
         )
-        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 class IssueViewViewSet(BaseViewSet):
@@ -221,14 +217,6 @@ class IssueViewViewSet(BaseViewSet):
             .distinct()
         )
 
-    def list(self, request, slug, project_id):
-        queryset = self.get_queryset()
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-        views = IssueViewSerializer(
-            queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(views, status=status.HTTP_200_OK)
-
 
 class IssueViewFavoriteViewSet(BaseViewSet):
     serializer_class = IssueViewFavoriteSerializer
@@ -258,4 +246,4 @@ class IssueViewFavoriteViewSet(BaseViewSet):
             view_id=view_id,
         )
         view_favourite.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/workspace.py

@@ -44,8 +44,6 @@ from plane.app.serializers import (
     IssueLiteSerializer,
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
-    ProjectMemberRoleSerializer,
-    WorkspaceUserPropertiesSerializer,
 )
 from plane.app.views.base import BaseAPIView
 from . import BaseViewSet
@@ -66,7 +64,6 @@ from plane.db.models import (
     WorkspaceMember,
     CycleIssue,
     IssueReaction,
-    WorkspaceUserProperties
 )
 from plane.app.permissions import (
     WorkSpaceBasePermission,
@@ -74,13 +71,11 @@ from plane.app.permissions import (
     WorkspaceEntityPermission,
     WorkspaceViewerPermission,
     WorkspaceUserPermission,
-    ProjectLitePermission,
 )
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.event_tracking_task import workspace_invite_event
 
-
 class WorkSpaceViewSet(BaseViewSet):
     model = Workspace
     serializer_class = WorkSpaceSerializer
@@ -178,7 +173,6 @@ class UserWorkSpacesEndpoint(BaseAPIView):
     ]
 
     def get(self, request):
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
         member_count = (
             WorkspaceMember.objects.filter(
                 workspace=OuterRef("id"),
@@ -214,12 +208,9 @@ class UserWorkSpacesEndpoint(BaseAPIView):
             )
             .distinct()
         )
-        workspaces = WorkSpaceSerializer(
-            self.filter_queryset(workspace),
-            fields=fields if fields else None,
-            many=True,
-        ).data
-        return Response(workspaces, status=status.HTTP_200_OK)
+
+        serializer = WorkSpaceSerializer(self.filter_queryset(workspace), many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 class WorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
@@ -416,7 +407,7 @@ class WorkspaceJoinEndpoint(BaseAPIView):
 
                     # Delete the invitation
                     workspace_invite.delete()
-
+                
                 # Send event
                 workspace_invite_event.delay(
                     user=user.id if user is not None else None,
@@ -546,15 +537,10 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         workspace_members = self.get_queryset()
 
         if workspace_member.role > 10:
-            serializer = WorkspaceMemberAdminSerializer(
-                workspace_members,
-                fields=("id", "member", "role"),
-                many=True,
-            )
+            serializer = WorkspaceMemberAdminSerializer(workspace_members, many=True)
         else:
             serializer = WorkSpaceMemberSerializer(
                 workspace_members,
-                fields=("id", "member", "role"),
                 many=True,
             )
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -719,43 +705,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class WorkspaceProjectMemberEndpoint(BaseAPIView):
-    serializer_class = ProjectMemberRoleSerializer
-    model = ProjectMember
-
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug):
-        # Fetch all project IDs where the user is involved
-        project_ids = ProjectMember.objects.filter(
-            member=request.user,
-            member__is_bot=False,
-            is_active=True,
-        ).values_list('project_id', flat=True).distinct()
-
-        # Get all the project members in which the user is involved
-        project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member__is_bot=False,
-            project_id__in=project_ids,
-            is_active=True,
-        ).select_related("project", "member", "workspace")
-        project_members = ProjectMemberRoleSerializer(project_members, many=True).data
-
-        project_members_dict = dict()
-
-        # Construct a dictionary with project_id as key and project_members as value
-        for project_member in project_members:
-            project_id = project_member.pop("project")
-            if str(project_id) not in project_members_dict:
-                project_members_dict[str(project_id)] = []
-            project_members_dict[str(project_id)].append(project_member)
-
-        return Response(project_members_dict, status=status.HTTP_200_OK)
-
-
 class TeamMemberViewSet(BaseViewSet):
     serializer_class = TeamSerializer
     model = Team
@@ -1385,7 +1334,8 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
         issues = IssueLiteSerializer(
             issue_queryset, many=True, fields=fields if fields else None
         ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
 
 class WorkspaceLabelsEndpoint(BaseAPIView):
@@ -1399,30 +1349,3 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
             project__project_projectmember__member=request.user,
         ).values("parent", "name", "color", "id", "project_id", "workspace__slug")
         return Response(labels, status=status.HTTP_200_OK)
-
-
-class WorkspaceUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceViewerPermission,
-    ]
-
-    def patch(self, request, slug):
-        workspace_properties = WorkspaceUserProperties.objects.get(
-            user=request.user,
-            workspace__slug=slug,
-        )
-        
-        workspace_properties.filters = request.data.get("filters", workspace_properties.filters)
-        workspace_properties.display_filters = request.data.get("display_filters", workspace_properties.display_filters)
-        workspace_properties.display_properties = request.data.get("display_properties", workspace_properties.display_properties)
-        workspace_properties.save()
-
-        serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug):
-        workspace_properties, _ = WorkspaceUserProperties.objects.get_or_create(
-            user=request.user, workspace__slug=slug
-        )
-        serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/bgtasks/__init__.py

@@ -0,0 +1 @@
+from .issue_sync_task import issue_sync

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -373,7 +373,7 @@ def generate_non_segmented_rows(
     return [tuple(row_zero)] + rows
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def analytic_export_task(email, data, slug):
     try:
         filters = issue_filters(data, "POST")

apiserver/plane/bgtasks/event_tracking_task.py

@@ -29,7 +29,7 @@ def posthogConfiguration():
         return None, None
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def auth_events(user, email, user_agent, ip, event_name, medium, first_time):
     try:
         POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()
@@ -54,7 +54,7 @@ def auth_events(user, email, user_agent, ip, event_name, medium, first_time):
         capture_exception(e)
  
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def workspace_invite_event(user, email, user_agent, ip, event_name, accepted_from):
     try:
         POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()

apiserver/plane/bgtasks/export_task.py

@@ -259,7 +259,7 @@ def generate_xlsx(header, project_id, issues, files):
     files.append((f"{project_id}.xlsx", xlsx_file))
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, slug):
     try:
         exporter_instance = ExporterHistory.objects.get(token=token_id)

apiserver/plane/bgtasks/exporter_expired_task.py

@@ -15,7 +15,7 @@ from botocore.client import Config
 from plane.db.models import ExporterHistory
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def delete_old_s3_link():
     # Get a list of keys and IDs to process
     expired_exporter_history = ExporterHistory.objects.filter(

apiserver/plane/bgtasks/file_asset_task.py

@@ -12,7 +12,7 @@ from celery import shared_task
 from plane.db.models import FileAsset
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def delete_file_asset():
 
     # file assets to delete

apiserver/plane/bgtasks/forgot_password_task.py

@@ -17,7 +17,7 @@ from sentry_sdk import capture_exception
 from plane.license.utils.instance_value import get_email_configuration
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def forgot_password(first_name, email, uidb64, token, current_site):
     try:
         relative_link = (

apiserver/plane/bgtasks/importer_task.py

@@ -1,200 +1,467 @@
 # Python imports
-import json
-import requests
 import uuid
 
 # Django imports
-from django.conf import settings
-from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import Q, Max
 from django.contrib.auth.hashers import make_password
 
 # Third Party imports
 from celery import shared_task
-from sentry_sdk import capture_exception
+from celery.exceptions import MaxRetriesExceededError
 
 # Module imports
-from plane.app.serializers import ImporterSerializer
 from plane.db.models import (
     Importer,
     WorkspaceMember,
-    GithubRepositorySync,
-    GithubRepository,
     ProjectMember,
-    WorkspaceIntegration,
     Label,
     User,
     IssueProperty,
+    IssueAssignee,
+    IssueLabel,
+    IssueSequence,
+    IssueActivity,
+    IssueComment,
+    IssueLink,
+    ModuleIssue,
+    State,
+    Module,
+    Issue,
+    Cycle,
 )
 from plane.bgtasks.user_welcome_task import send_welcome_slack
 
 
-@shared_task
+@shared_task(queue="internal_tasks")
 def service_importer(service, importer_id):
+    pass
+
+
+## Utility functions
+def get_label_id(name, data):
     try:
-        importer = Importer.objects.get(pk=importer_id)
-        importer.status = "processing"
-        importer.save()
+        existing_label = (
+            Label.objects.filter(
+                project_id=data.get("project_id"),
+                workspace_id=data.get("workspace_id"),
+                name__iexact=name,
+            )
+            .values("id")
+            .first()
+        )
+        return existing_label
+    except Label.DoesNotExist:
+        return None
 
-        users = importer.data.get("users", [])
 
-        # Check if we need to import users as well
-        if len(users):
-            # For all invited users create the users
-            new_users = User.objects.bulk_create(
-                [
-                    User(
-                        email=user.get("email").strip().lower(),
-                        username=uuid.uuid4().hex,
-                        password=make_password(uuid.uuid4().hex),
-                        is_password_autoset=True,
-                    )
-                    for user in users
-                    if user.get("import", False) == "invite"
-                ],
-                batch_size=10,
-                ignore_conflicts=True,
+def get_state_id(name, data):
+    try:
+        existing_state = (
+            State.objects.filter(
+                name__iexact=name,
+                project_id=data.get("project_id"),
+                workspace_id=data.get("workspace_id"),
+            )
+            .values("id")
+            .first()
+        )
+        return existing_state
+    except State.DoesNotExist:
+        return None
+
+
+def get_user_id(name):
+    try:
+        existing_user = User.objects.filter(email=name).values("id").first()
+        return existing_user
+    except User.DoesNotExist:
+        return None
+
+
+def update_imported_items(importer_id, entity, entity_id):
+    importer = Importer.objects.get(pk=importer_id)
+    if importer.imported_data:
+        importer.imported_data.setdefault(str(entity), []).append(str(entity_id))
+    else:
+        importer.imported_data = {
+            str(entity): [str(entity_id)]
+        }
+    importer.save()
+
+
+## Sync functions
+def members_sync(data):
+    try:
+        user = User.objects.get(email=data.get("email"))
+        _ = WorkspaceMember.objects.get_or_create(
+            member_id=user.id, workspace_id=data.get("workspace_id")
+        )
+        _ = ProjectMember.objects.get_or_create(
+            member_id=user.id,
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+        _ = IssueProperty.objects.get_or_create(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            user_id=user.id,
+            created_by_id=data.get("created_by"),
+        )
+
+    except User.DoesNotExist:
+        # For all invited users create the users
+        new_user = User.objects.create(
+            email=data.get("email").strip().lower(),
+            username=uuid.uuid4().hex,
+            password=make_password(uuid.uuid4().hex),
+            is_password_autoset=True,
+        )
+
+        service = data.get("external_source")
+
+        WorkspaceMember.objects.create(
+            member_id=new_user.id,
+            workspace_id=data.get("workspace_id"),
+            created_by_id=data.get("created_by"),
+        )
+
+        ProjectMember.objects.create(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            member_id=new_user.id,
+            created_by_id=data.get("created_by"),
+        )
+
+        IssueProperty.objects.create(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            user_id=new_user.id,
+            created_by_id=data.get("created_by"),
+        )
+        if data.get("source", False) == "slack":
+            send_welcome_slack.delay(
+                str(new_user.id),
+                True,
+                f"{new_user.email} was imported to Plane from {service}",
             )
 
-            _ = [
-                send_welcome_slack.delay(
-                    str(user.id),
-                    True,
-                    f"{user.email} was imported to Plane from {service}",
-                )
-                for user in new_users
-            ]
 
-            workspace_users = User.objects.filter(
-                email__in=[
-                    user.get("email").strip().lower()
-                    for user in users
-                    if user.get("import", False) == "invite"
-                    or user.get("import", False) == "map"
-                ]
+def label_sync(data):
+    existing_label = Label.objects.filter(
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+        name__iexact=data.get("name"),
+        external_id=data.get("external_id", None),
+        external_source=data.get("external_source"),
+    )
+
+    if not existing_label.exists() and data.get("name"):
+        label = Label.objects.create(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            name=data.get("name"),
+            color=data.get("color"),
+            created_by_id=data.get("created_by"),
+            external_id=data.get("external_id", None),
+            external_source=data.get("external_source"),
+        )
+        update_imported_items(data.get("importer_id"), "labels", label.id)
+
+
+def state_sync(data):
+    try:
+        state = State.objects.get(
+            external_id=data.get("external_id"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+
+    except State.DoesNotExist:
+        existing_states = State.objects.filter(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            group=data.get("state_group"),
+            name__iexact=data.get("state_name"),
+        )
+
+        if existing_states.exists():
+            existing_state = existing_states.first()
+            existing_state.external_id = data.get("external_id")
+            existing_state.external_source = data.get("external_source")
+            existing_state.save()
+        else:
+            state = State.objects.create(
+                project_id=data.get("project_id"),
+                workspace_id=data.get("workspace_id"),
+                name=data.get("state_name"),
+                group=data.get("state_group"),
+                created_by_id=data.get("created_by"),
+                external_id=data.get("external_id"),
+                external_source=data.get("external_source"),
             )
+            update_imported_items(data.get("importer_id"), "states", state.id)
 
-            # Check if any of the users are already member of workspace
-            _ = WorkspaceMember.objects.filter(
-                member__in=[user for user in workspace_users],
-                workspace_id=importer.workspace_id,
-            ).update(is_active=True)
 
-            # Add new users to Workspace and project automatically
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        member=user,
-                        workspace_id=importer.workspace_id,
-                        created_by=importer.created_by,
-                    )
-                    for user in workspace_users
-                ],
-                batch_size=100,
-                ignore_conflicts=True,
-            )
+def issue_sync(data):
+    try:
+        issue = Issue.objects.get(
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+    except Issue.DoesNotExist:
+        # Get the default state
+        default_state = State.objects.filter(
+            ~Q(name="Triage"), project_id=data.get("project_id"), default=True
+        ).first()
 
-            ProjectMember.objects.bulk_create(
-                [
-                    ProjectMember(
-                        project_id=importer.project_id,
-                        workspace_id=importer.workspace_id,
-                        member=user,
-                        created_by=importer.created_by,
-                    )
-                    for user in workspace_users
-                ],
-                batch_size=100,
-                ignore_conflicts=True,
-            )
-
-            IssueProperty.objects.bulk_create(
-                [
-                    IssueProperty(
-                        project_id=importer.project_id,
-                        workspace_id=importer.workspace_id,
-                        user=user,
-                        created_by=importer.created_by,
-                    )
-                    for user in workspace_users
-                ],
-                batch_size=100,
-                ignore_conflicts=True,
-            )
-
-        # Check if sync config is on for github importers
-        if service == "github" and importer.config.get("sync", False):
-            name = importer.metadata.get("name", False)
-            url = importer.metadata.get("url", False)
-            config = importer.metadata.get("config", {})
-            owner = importer.metadata.get("owner", False)
-            repository_id = importer.metadata.get("repository_id", False)
-
-            workspace_integration = WorkspaceIntegration.objects.get(
-                workspace_id=importer.workspace_id, integration__provider="github"
-            )
-
-            # Delete the old repository object
-            GithubRepositorySync.objects.filter(project_id=importer.project_id).delete()
-            GithubRepository.objects.filter(project_id=importer.project_id).delete()
-
-            # Create a Label for github
-            label = Label.objects.filter(
-                name="GitHub", project_id=importer.project_id
+        # if there is no default state assign any random state
+        if default_state is None:
+            default_state = State.objects.filter(
+                ~Q(name="Triage"), project_id=data.get("project_id")
             ).first()
 
-            if label is None:
-                label = Label.objects.create(
-                    name="GitHub",
-                    project_id=importer.project_id,
-                    description="Label to sync Plane issues with GitHub issues",
-                    color="#003773",
-                )
-            # Create repository
-            repo = GithubRepository.objects.create(
-                name=name,
-                url=url,
-                config=config,
-                repository_id=repository_id,
-                owner=owner,
-                project_id=importer.project_id,
-            )
+        # Get the maximum sequence_id
+        last_id = IssueSequence.objects.filter(
+            project_id=data.get("project_id")
+        ).aggregate(largest=Max("sequence"))["largest"]
 
-            # Create repo sync
-            _ = GithubRepositorySync.objects.create(
-                repository=repo,
-                workspace_integration=workspace_integration,
-                actor=workspace_integration.actor,
-                credentials=importer.data.get("credentials", {}),
-                project_id=importer.project_id,
-                label=label,
-            )
+        last_id = 1 if last_id is None else last_id + 1
 
-            # Add bot as a member in the project
-            _ = ProjectMember.objects.get_or_create(
-                member=workspace_integration.actor,
-                role=20,
-                project_id=importer.project_id,
-            )
+        # Get the maximum sort order
+        largest_sort_order = Issue.objects.filter(
+            project_id=data.get("project_id"), state=default_state
+        ).aggregate(largest=Max("sort_order"))["largest"]
 
-        if settings.PROXY_BASE_URL:
-            headers = {"Content-Type": "application/json"}
-            import_data_json = json.dumps(
-                ImporterSerializer(importer).data,
-                cls=DjangoJSONEncoder,
-            )
-            _ = requests.post(
-                f"{settings.PROXY_BASE_URL}/hooks/workspaces/{str(importer.workspace_id)}/projects/{str(importer.project_id)}/importers/{str(service)}/",
-                json=import_data_json,
-                headers=headers,
-            )
+        largest_sort_order = (
+            65535 if largest_sort_order is None else largest_sort_order + 10000
+        )
+        parent_id = None
+        if data.get("parent_id", False):
+            parent_id = Issue.objects.filter(
+                external_id=data.get("parent_id"),
+                external_source=data.get("external_source"),
+                project_id=data.get("project_id"),
+                workspace_id=data.get("workspace_id"),
+            ).values("id")
 
+        # Issues
+        issue = Issue.objects.create(
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            state_id=get_state_id(data.get("state"), data).get("id")
+            if get_state_id(data.get("state"), data)
+            else default_state.id,
+            name=data.get("name", "Issue Created through Importer")[:255],
+            description_html=data.get("description_html", "<p></p>"),
+            sequence_id=last_id,
+            sort_order=largest_sort_order,
+            start_date=data.get("start_date", None),
+            target_date=data.get("target_date", None),
+            priority=data.get("priority", "none"),
+            created_by_id=data.get("created_by_id"),
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+            parent_id=parent_id,
+        )
+
+        # Sequences
+        _ = IssueSequence.objects.create(
+            issue=issue,
+            sequence=issue.sequence_id,
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+
+        # Attach Links
+        _ = IssueLink.objects.create(
+            issue=issue,
+            url=data.get("link", {}).get("url", "https://github.com"),
+            title=data.get("link", {}).get("title", "Original Issue"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            created_by_id=data.get("created_by_id"),
+        )
+
+        # Track the issue activities
+        _ = IssueActivity.objects.create(
+            issue=issue,
+            actor_id=data.get("created_by_id"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            comment=f"imported the issue from {data.get('external_source')}",
+            verb="created",
+            created_by_id=data.get("created_by_id"),
+        )
+
+        update_imported_items(data.get("importer_id"), "issues", issue.id)
+
+
+def issue_label_sync(data):
+    issue = Issue.objects.get(
+        external_source=data.get("external_issue_source"),
+        external_id=data.get("external_issue_id"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+    )
+    if get_label_id(data.get("name"), data):
+        IssueLabel.objects.create(
+            issue=issue,
+            label_id=get_label_id(data.get("name"), data).get("id"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            created_by_id=data.get("created_by_id"),
+        )
+
+
+def issue_assignee_sync(data):
+    issue = Issue.objects.get(
+        external_source=data.get("external_issue_source"),
+        external_id=data.get("external_issue_id"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+    )
+    user = User.objects.filter(email=data.get("email")).values("id")
+
+    IssueAssignee.objects.create(
+        issue=issue,
+        assignee_id=user,
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+        created_by_id=data.get("created_by_id"),
+    )
+
+
+def issue_comment_sync(data):
+    # Create Comments
+    issue = Issue.objects.get(
+        external_source=data.get("external_issue_source"),
+        external_id=data.get("external_issue_id"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+    )
+    IssueComment.objects.create(
+        issue=issue,
+        comment_html=data.get("comment_html", "<p></p>"),
+        actor_id=data.get("created_by_id"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+        created_by_id=get_user_id(data.get("created_by_id")).get("id")
+        if get_user_id(data.get("created_by_id"))
+        else data.get("created_by_id"),
+        external_id=data.get("external_id"),
+        external_source=data.get("external_source"),
+    )
+
+
+def cycles_sync(data):
+    try:
+        _ = Cycle.objects.get(
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+    except Cycle.DoesNotExist:
+        cycle = Cycle.objects.create(
+            name=data.get("name"),
+            description_html=data.get("description_html", "<p></p>"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            created_by_id=data.get("created_by"),
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+        )
+        update_imported_items(data.get("importer_id"), "cycles", cycle.id)
+
+
+def module_sync(data):
+    try:
+        _ = Module.objects.get(
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+        )
+    except Module.DoesNotExist:
+        module = Module.objects.create(
+            name=data.get("name"),
+            description_html=data.get("description_html", "<p></p>"),
+            project_id=data.get("project_id"),
+            workspace_id=data.get("workspace_id"),
+            created_by_id=data.get("created_by"),
+            external_id=data.get("external_id"),
+            external_source=data.get("external_source"),
+        )
+        update_imported_items(data.get("importer_id"), "modules", module.id)
+
+
+def modules_issue_sync(data):
+    module = Module.objects.get(
+        external_id=data.get("module_id"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+        external_source=data.get("external_source"),
+    )
+    issue = Issue.objects.get(
+        external_id=data.get("issue_id"),
+        external_source=data.get("external_source"),
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+    )
+
+    _ = ModuleIssue.objects.create(
+        module=module,
+        issue=issue,
+        project_id=data.get("project_id"),
+        workspace_id=data.get("workspace_id"),
+        created_by_id=data.get("created_by"),
+    )
+
+
+def import_sync(data):
+    importer = Importer.objects.get(pk=data.get("importer_id"))
+    importer.status = data.get("status")
+    importer.save(update_fields=["status"])
+
+
+@shared_task(bind=True, queue="segway_task", max_retries=5)
+def import_task(self, data):
+    type = data.get("type")
+
+    if type is None:
+        return
+
+    TYPE_MAPPER = {
+        "member.sync": members_sync,
+        "label.sync": label_sync,
+        "state.sync": state_sync,
+        "issue.sync": issue_sync,
+        "issue.label.sync": issue_label_sync,
+        "issue.assignee.sync": issue_assignee_sync,
+        "issue.comment.sync": issue_comment_sync,
+        "cycle.sync": cycles_sync,
+        "module.sync": module_sync,
+        "module.issue.sync": modules_issue_sync,
+        "import.sync": import_sync,
+    }
+    try:
+        func = TYPE_MAPPER.get(type)
+        if func is None:
+            return
+        # Call the function
+        func(data)
         return
     except Exception as e:
-        importer = Importer.objects.get(pk=importer_id)
-        importer.status = "failed"
-        importer.save()
-        # Print logs if in DEBUG mode
-        if settings.DEBUG:
-            print(e)
-        capture_exception(e)
+        try:
+            # Retry with exponential backoff
+            self.retry(exc=e, countdown=50, backoff=2)
+        except MaxRetriesExceededError:
+            # For max retries reached items fail the import
+            importer = Importer.objects.get(pk=data.get("importer_id"))
+            importer.status = "failed"
+            importer.reason = e
+            importer.save()
+
         return

apiserver/plane/bgtasks/issue_activites_task.py

@@ -112,16 +112,8 @@ def track_parent(
     epoch,
 ):
     if current_instance.get("parent") != requested_data.get("parent"):
-        old_parent = (
-            Issue.objects.filter(pk=current_instance.get("parent")).first()
-            if current_instance.get("parent") is not None
-            else None
-        )
-        new_parent = (
-            Issue.objects.filter(pk=requested_data.get("parent")).first()
-            if requested_data.get("parent") is not None
-            else None
-        )
+        old_parent = Issue.objects.filter(pk=current_instance.get("parent")).first()
+        new_parent = Issue.objects.filter(pk=requested_data.get("parent")).first()
 
         issue_activities.append(
             IssueActivity(
@@ -722,9 +714,7 @@ def create_cycle_issue_activity(
         cycle = Cycle.objects.filter(
             pk=created_record.get("fields").get("cycle")
         ).first()
-        issue = Issue.objects.filter(
-            pk=created_record.get("fields").get("issue")
-        ).first()
+        issue = Issue.objects.filter(pk=created_record.get("fields").get("issue")).first()
         if issue:
             issue.updated_at = timezone.now()
             issue.save(update_fields=["updated_at"])
@@ -840,9 +830,7 @@ def create_module_issue_activity(
         module = Module.objects.filter(
             pk=created_record.get("fields").get("module")
         ).first()
-        issue = Issue.objects.filter(
-            pk=created_record.get("fields").get("issue")
-        ).first()
+        issue = Issue.objects.filter(pk=created_record.get("fields").get("issue")).first()
         if issue:
             issue.updated_at = timezone.now()
             issue.save(update_fields=["updated_at"])
@@ -1288,42 +1276,40 @@ def create_issue_relation_activity(
     current_instance = (
         json.loads(current_instance) if current_instance is not None else None
     )
-    if current_instance is None and requested_data.get("issues") is not None:
-        for related_issue in requested_data.get("issues"): 
-            issue = Issue.objects.get(pk=related_issue)
+    if current_instance is None and requested_data.get("related_list") is not None:
+        for issue_relation in requested_data.get("related_list"):
+            if issue_relation.get("relation_type") == "blocked_by":
+                relation_type = "blocking"
+            else:
+                relation_type = issue_relation.get("relation_type")
+            issue = Issue.objects.get(pk=issue_relation.get("issue"))
             issue_activities.append(
                 IssueActivity(
-                    issue_id=issue_id,
+                    issue_id=issue_relation.get("related_issue"),
                     actor_id=actor_id,
                     verb="created",
                     old_value="",
                     new_value=f"{issue.project.identifier}-{issue.sequence_id}",
-                    field=requested_data.get("relation_type"),
+                    field=relation_type,
                     project_id=project_id,
                     workspace_id=workspace_id,
-                    comment=f"added {requested_data.get('relation_type')} relation",
-                    old_identifier=related_issue,
+                    comment=f"added {relation_type} relation",
+                    old_identifier=issue_relation.get("issue"),
                 )
             )
-            issue = Issue.objects.get(pk=issue_id)
+            issue = Issue.objects.get(pk=issue_relation.get("related_issue"))
             issue_activities.append(
                 IssueActivity(
-                    issue_id=related_issue,
+                    issue_id=issue_relation.get("issue"),
                     actor_id=actor_id,
                     verb="created",
                     old_value="",
                     new_value=f"{issue.project.identifier}-{issue.sequence_id}",
-                    field="blocking"
-                    if requested_data.get("relation_type") == "blocked_by"
-                    else (
-                        "blocked_by"
-                        if requested_data.get("relation_type") == "blocking"
-                        else requested_data.get("relation_type")
-                    ),
+                    field=f'{issue_relation.get("relation_type")}',
                     project_id=project_id,
                     workspace_id=workspace_id,
-                    comment=f'added {"blocking" if requested_data.get("relation_type") == "blocked_by" else ("blocked_by" if requested_data.get("relation_type") == "blocking" else requested_data.get("relation_type")),} relation',
-                    old_identifier=issue_id,
+                    comment=f'added {issue_relation.get("relation_type")} relation',
+                    old_identifier=issue_relation.get("related_issue"),
                     epoch=epoch,
                 )
             )
@@ -1343,44 +1329,44 @@ def delete_issue_relation_activity(
     current_instance = (
         json.loads(current_instance) if current_instance is not None else None
     )
-    issue = Issue.objects.get(pk=requested_data.get("related_issue"))
-    issue_activities.append(
-        IssueActivity(
-            issue_id=issue_id,
-            actor_id=actor_id,
-            verb="deleted",
-            old_value=f"{issue.project.identifier}-{issue.sequence_id}",
-            new_value="",
-            field=requested_data.get("relation_type"),
-            project_id=project_id,
-            workspace_id=workspace_id,
-            comment=f"deleted {requested_data.get('relation_type')} relation",
-            old_identifier=requested_data.get("related_issue"),
-            epoch=epoch,
+    if current_instance is not None and requested_data.get("related_list") is None:
+        if current_instance.get("relation_type") == "blocked_by":
+            relation_type = "blocking"
+        else:
+            relation_type = current_instance.get("relation_type")
+        issue = Issue.objects.get(pk=current_instance.get("issue"))
+        issue_activities.append(
+            IssueActivity(
+                issue_id=current_instance.get("related_issue"),
+                actor_id=actor_id,
+                verb="deleted",
+                old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                new_value="",
+                field=relation_type,
+                project_id=project_id,
+                workspace_id=workspace_id,
+                comment=f"deleted {relation_type} relation",
+                old_identifier=current_instance.get("issue"),
+                epoch=epoch,
+            )
         )
-    )
-    issue = Issue.objects.get(pk=issue_id)
-    issue_activities.append(
-        IssueActivity(
-            issue_id=requested_data.get("related_issue"),
-            actor_id=actor_id,
-            verb="deleted",
-            old_value=f"{issue.project.identifier}-{issue.sequence_id}",
-            new_value="",
-            field="blocking"
-            if requested_data.get("relation_type") == "blocked_by"
-            else (
-                "blocked_by"
-                if requested_data.get("relation_type") == "blocking"
-                else requested_data.get("relation_type")
-            ),
-            project_id=project_id,
-            workspace_id=workspace_id,
-            comment=f'deleted {requested_data.get("relation_type")} relation',
-            old_identifier=requested_data.get("related_issue"),
-            epoch=epoch,
+        issue = Issue.objects.get(pk=current_instance.get("related_issue"))
+        issue_activities.append(
+            IssueActivity(
+                issue_id=current_instance.get("issue"),
+                actor_id=actor_id,
+                verb="deleted",
+                old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                new_value="",
+                field=f'{current_instance.get("relation_type")}',
+                project_id=project_id,
+                workspace_id=workspace_id,
+                comment=f'deleted {current_instance.get("relation_type")} relation',
+                old_identifier=current_instance.get("related_issue"),
+                epoch=epoch,
+            )
         )
-    )
+
 
 def create_draft_issue_activity(
     requested_data,
@@ -1474,7 +1460,7 @@ def delete_draft_issue_activity(
 
 
 # Receive message from room group
-@shared_task
+@shared_task(queue='internal_tasks')
 def issue_activity(
     type,
     requested_data,

apiserver/plane/bgtasks/issue_automation_task.py

@@ -16,7 +16,7 @@ from plane.db.models import Issue, Project, State
 from plane.bgtasks.issue_activites_task import issue_activity
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def archive_and_close_old_issues():
     archive_old_issues()
     close_old_issues()

apiserver/plane/bgtasks/issue_sync_task.py

@@ -0,0 +1,5 @@
+from celery import shared_task
+
+@shared_task(queue="segway_tasks")
+def issue_sync(data):
+    print(f"Received data from Segway: {data}")

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -17,7 +17,7 @@ from sentry_sdk import capture_exception
 from plane.license.utils.instance_value import get_email_configuration
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def magic_link(email, key, token, current_site):
     try:
         (

apiserver/plane/bgtasks/notification_task.py

@@ -183,7 +183,7 @@ def createMentionNotification(project, notification_comment, issue, actor_id, me
     )
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def notifications(type, issue_id, project_id, actor_id, subscriber, issue_activities_created, requested_data, current_instance):
     issue_activities_created = (
         json.loads(
@@ -291,9 +291,6 @@ def notifications(type, issue_id, project_id, actor_id, subscriber, issue_activi
                 sender = "in_app:issue_activities:assigned"
 
             for issue_activity in issue_activities_created:
-                # Do not send notification for description update
-                if issue_activity.get("field") == "description":
-                    continue;
                 issue_comment = issue_activity.get("issue_comment")
                 if issue_comment is not None:
                     issue_comment = IssueComment.objects.get(
@@ -344,7 +341,7 @@ def notifications(type, issue_id, project_id, actor_id, subscriber, issue_activi
             .order_by("-created_at")
             .first()
         )
-
+        
         actor = User.objects.get(pk=actor_id)
         
         for mention_id in comment_mentions:

apiserver/plane/bgtasks/project_invitation_task.py

@@ -15,7 +15,7 @@ from sentry_sdk import capture_exception
 from plane.db.models import Project, User, ProjectMemberInvite
 from plane.license.utils.instance_value import get_email_configuration
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def project_invitation(email, project_id, token, current_site, invitor):
     try:
         user = User.objects.get(email=invitor)

apiserver/plane/bgtasks/user_welcome_task.py

@@ -11,7 +11,7 @@ from slack_sdk.errors import SlackApiError
 from plane.db.models import User
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def send_welcome_slack(user_id, created, message):
     try:
         instance = User.objects.get(pk=user_id)

apiserver/plane/bgtasks/webhook_task.py

@@ -71,6 +71,7 @@ def get_model_data(event, event_id, many=False):
     retry_backoff=600,
     max_retries=5,
     retry_jitter=True,
+    queue='internal_tasks'
 )
 def webhook_task(self, webhook, slug, event, event_data, action):
     try:
@@ -161,7 +162,7 @@ def webhook_task(self, webhook, slug, event, event_data, action):
         return
 
 
-@shared_task()
+@shared_task(queue='internal_tasks')
 def send_webhook(event, payload, kw, action, slug, bulk):
     try:
         webhooks = Webhook.objects.filter(workspace__slug=slug, is_active=True)

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -20,7 +20,7 @@ from plane.db.models import Workspace, WorkspaceMemberInvite, User
 from plane.license.utils.instance_value import get_email_configuration
 
 
-@shared_task
+@shared_task(queue='internal_tasks')
 def workspace_invitation(email, workspace_id, token, current_site, invitor):
     try:
         user = User.objects.get(email=invitor)

apiserver/plane/celery.py

@@ -8,7 +8,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
 
 ri = redis_instance()
 
-app = Celery("plane")
+app = Celery('tasks', broker='pyamqp://guest:guest@localhost:5672//')
 
 # Using a string here means the worker will not have to
 # pickle the object when using Windows.

apiserver/plane/db/migrations/0051_cycle_external_id_cycle_external_source_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2023-12-29 10:20
+# Generated by Django 4.2.7 on 2023-12-20 14:33
 
 from django.db import migrations, models
 
@@ -18,17 +18,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cycle',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='inboxissue',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='inboxissue',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            model_name='importer',
+            name='reason',
+            field=models.TextField(blank=True),
         ),
         migrations.AddField(
             model_name='issue',
@@ -38,7 +33,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='issue',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.AddField(
             model_name='issuecomment',
@@ -48,7 +43,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='issuecomment',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.AddField(
             model_name='label',
@@ -58,7 +53,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='label',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.AddField(
             model_name='module',
@@ -68,7 +63,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='module',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.AddField(
             model_name='state',
@@ -78,6 +73,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='state',
             name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
+            field=models.CharField(blank=True, null=True),
         ),
     ]

apiserver/plane/db/migrations/0052_auto_20231220_1141.py

@@ -1,136 +0,0 @@
-# Generated by Django 4.2.7 on 2023-12-20 11:14
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import plane.db.models.cycle
-import plane.db.models.issue
-import plane.db.models.module
-import plane.db.models.view
-import plane.db.models.workspace
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0051_cycle_external_id_cycle_external_source_and_more'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='issueview',
-            old_name='query_data',
-            new_name='filters',
-        ),
-        migrations.RenameField(
-            model_name='issueproperty',
-            old_name='properties',
-            new_name='display_properties',
-        ),
-        migrations.AlterField(
-            model_name='issueproperty',
-            name='display_properties',
-            field=models.JSONField(default=plane.db.models.issue.get_default_display_properties),
-        ),
-        migrations.AddField(
-            model_name='issueproperty',
-            name='display_filters',
-            field=models.JSONField(default=plane.db.models.issue.get_default_display_filters),
-        ),
-        migrations.AddField(
-            model_name='issueproperty',
-            name='filters',
-            field=models.JSONField(default=plane.db.models.issue.get_default_filters),
-        ),
-        migrations.AddField(
-            model_name='issueview',
-            name='display_filters',
-            field=models.JSONField(default=plane.db.models.view.get_default_display_filters),
-        ),
-        migrations.AddField(
-            model_name='issueview',
-            name='display_properties',
-            field=models.JSONField(default=plane.db.models.view.get_default_display_properties),
-        ),
-        migrations.AddField(
-            model_name='issueview',
-            name='sort_order',
-            field=models.FloatField(default=65535),
-        ),
-        migrations.AlterField(
-            model_name='issueview',
-            name='project',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project'),
-        ),
-        migrations.CreateModel(
-            name='WorkspaceUserProperties',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('filters', models.JSONField(default=plane.db.models.workspace.get_default_filters)),
-                ('display_filters', models.JSONField(default=plane.db.models.workspace.get_default_display_filters)),
-                ('display_properties', models.JSONField(default=plane.db.models.workspace.get_default_display_properties)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_user_properties', to=settings.AUTH_USER_MODEL)),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_user_properties', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Workspace User Property',
-                'verbose_name_plural': 'Workspace User Property',
-                'db_table': 'Workspace_user_properties',
-                'ordering': ('-created_at',),
-                'unique_together': {('workspace', 'user')},
-            },
-        ),
-        migrations.CreateModel(
-            name='ModuleUserProperties',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('filters', models.JSONField(default=plane.db.models.module.get_default_filters)),
-                ('display_filters', models.JSONField(default=plane.db.models.module.get_default_display_filters)),
-                ('display_properties', models.JSONField(default=plane.db.models.module.get_default_display_properties)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('module', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='module_user_properties', to='db.module')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='module_user_properties', to=settings.AUTH_USER_MODEL)),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Module User Property',
-                'verbose_name_plural': 'Module User Property',
-                'db_table': 'module_user_properties',
-                'ordering': ('-created_at',),
-                'unique_together': {('module', 'user')},
-            },
-        ),
-        migrations.CreateModel(
-            name='CycleUserProperties',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('filters', models.JSONField(default=plane.db.models.cycle.get_default_filters)),
-                ('display_filters', models.JSONField(default=plane.db.models.cycle.get_default_display_filters)),
-                ('display_properties', models.JSONField(default=plane.db.models.cycle.get_default_display_properties)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('cycle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cycle_user_properties', to='db.cycle')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cycle_user_properties', to=settings.AUTH_USER_MODEL)),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Cycle User Property',
-                'verbose_name_plural': 'Cycle User Properties',
-                'db_table': 'cycle_user_properties',
-                'ordering': ('-created_at',),
-                'unique_together': {('cycle', 'user')},
-            },
-        ),
-    ]

apiserver/plane/db/migrations/0053_auto_20240102_1315.py

@@ -1,65 +0,0 @@
-# Generated by Django 4.2.7 on 2024-01-02 13:15
-
-from plane.db.models import WorkspaceUserProperties, ProjectMember, IssueView
-from django.db import migrations
-
-
-def workspace_user_properties(apps, schema_editor):
-    WorkspaceMember = apps.get_model("db", "WorkspaceMember")
-    updated_workspace_user_properties = []
-    for workspace_members in WorkspaceMember.objects.all():
-        updated_workspace_user_properties.append(
-            WorkspaceUserProperties(
-                user_id=workspace_members.member_id,
-                display_filters=workspace_members.view_props.get("display_filters"),
-                display_properties=workspace_members.view_props.get("display_properties"),
-                workspace_id=workspace_members.workspace_id,
-            )
-        )
-    WorkspaceUserProperties.objects.bulk_create(updated_workspace_user_properties, batch_size=2000)
-
-
-def project_user_properties(apps, schema_editor):
-    IssueProperty = apps.get_model("db", "IssueProperty")
-    updated_issue_user_properties = []
-    for issue_property in IssueProperty.objects.all():
-        project_member = ProjectMember.objects.filter(project_id=issue_property.project_id, member_id=issue_property.user_id).first()
-        if project_member:
-            issue_property.filters = project_member.view_props.get("filters")
-            issue_property.display_filters = project_member.view_props.get("display_filters")
-            updated_issue_user_properties.append(issue_property)
-
-    IssueProperty.objects.bulk_update(updated_issue_user_properties, ["filters", "display_filters"], batch_size=2000)
-
-
-def issue_view(apps, schema_editor):
-    GlobalView = apps.get_model("db", "GlobalView")
-    updated_issue_views = []
-    
-    for global_view in GlobalView.objects.all():
-        updated_issue_views.append(
-            IssueView(
-                workspace_id=global_view.workspace_id,
-                name=global_view.name,
-                description=global_view.description,
-                query=global_view.query,
-                access=global_view.access,
-                filters=global_view.query_data.get("filters", {}),
-                sort_order=global_view.sort_order,
-                created_by_id=global_view.created_by_id,
-                updated_by_id=global_view.updated_by_id,
-            )
-        )
-    IssueView.objects.bulk_create(updated_issue_views, batch_size=100)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0052_auto_20231220_1141'),
-    ]
-
-    operations = [
-        migrations.RunPython(workspace_user_properties),
-        migrations.RunPython(project_user_properties),
-        migrations.RunPython(issue_view),
-    ]

apiserver/plane/db/models/__init__.py

@@ -9,8 +9,6 @@ from .workspace import (
     WorkspaceMemberInvite,
     TeamMember,
     WorkspaceTheme,
-    WorkspaceUserProperties,
-    WorkspaceBaseModel,
 )
 
 from .project import (
@@ -50,11 +48,11 @@ from .social_connection import SocialLoginConnection
 
 from .state import State
 
-from .cycle import Cycle, CycleIssue, CycleFavorite, CycleUserProperties
+from .cycle import Cycle, CycleIssue, CycleFavorite
 
 from .view import GlobalView, IssueView, IssueViewFavorite
 
-from .module import Module, ModuleMember, ModuleIssue, ModuleLink, ModuleFavorite, ModuleUserProperties
+from .module import Module, ModuleMember, ModuleIssue, ModuleLink, ModuleFavorite
 
 from .api import APIToken, APIActivityLog
 

apiserver/plane/db/models/base.py

@@ -22,8 +22,6 @@ class BaseModel(AuditModel):
         user = get_current_user()
 
         if user is None or user.is_anonymous:
-            self.created_by = None
-            self.updated_by = None
             super(BaseModel, self).save(*args, **kwargs)
         else:
             # Check if the model is being created or updated

apiserver/plane/db/models/cycle.py

@@ -6,47 +6,6 @@ from django.conf import settings
 from . import ProjectBaseModel
 
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    }
-
-def get_default_display_filters():
-    return {
-        "group_by": None,
-        "order_by": "-created_at",
-        "type": None,
-        "sub_issue": True,
-        "show_empty_groups": True,
-        "layout": "list",
-        "calendar_date_range": "",
-    }
-
-def get_default_display_properties():
-    return {
-        "assignee": True,
-        "attachment_count": True,
-        "created_on": True,
-        "due_date": True,
-        "estimate": True,
-        "key": True,
-        "labels": True,
-        "link": True,
-        "priority": True,
-        "start_date": True,
-        "state": True,
-        "sub_issue_count": True,
-        "updated_on": True,
-    }
-
 class Cycle(ProjectBaseModel):
     name = models.CharField(max_length=255, verbose_name="Cycle Name")
     description = models.TextField(verbose_name="Cycle Description", blank=True)
@@ -59,7 +18,7 @@ class Cycle(ProjectBaseModel):
     )
     view_props = models.JSONField(default=dict)
     sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
@@ -70,9 +29,9 @@ class Cycle(ProjectBaseModel):
 
     def save(self, *args, **kwargs):
         if self._state.adding:
-            smallest_sort_order = Cycle.objects.filter(
-                project=self.project
-            ).aggregate(smallest=models.Min("sort_order"))["smallest"]
+            smallest_sort_order = Cycle.objects.filter(project=self.project).aggregate(
+                smallest=models.Min("sort_order")
+            )["smallest"]
 
             if smallest_sort_order is not None:
                 self.sort_order = smallest_sort_order - 10000
@@ -130,28 +89,3 @@ class CycleFavorite(ProjectBaseModel):
     def __str__(self):
         """Return user and the cycle"""
         return f"{self.user.email} <{self.cycle.name}>"
-
-
-class CycleUserProperties(ProjectBaseModel):
-    cycle = models.ForeignKey(
-        "db.Cycle", on_delete=models.CASCADE, related_name="cycle_user_properties"
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="cycle_user_properties",
-    )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
-
-
-    class Meta:
-        unique_together = ["cycle", "user"]
-        verbose_name = "Cycle User Property"
-        verbose_name_plural = "Cycle User Properties"
-        db_table = "cycle_user_properties"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.cycle.name} {self.user.email}"

apiserver/plane/db/models/importer.py

@@ -34,6 +34,7 @@ class Importer(ProjectBaseModel):
         "db.APIToken", on_delete=models.CASCADE, related_name="importer"
     )
     imported_data = models.JSONField(null=True)
+    reason = models.TextField(blank=True)
 
     class Meta:
         verbose_name = "Importer"

apiserver/plane/db/models/inbox.py

@@ -39,8 +39,6 @@ class InboxIssue(ProjectBaseModel):
         "db.Issue", related_name="inbox_duplicate", on_delete=models.SET_NULL, null=True
     )
     source = models.TextField(blank=True, null=True)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
         verbose_name = "InboxIssue"

apiserver/plane/db/models/issue.py

@@ -33,48 +33,6 @@ def get_default_properties():
     }
 
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    }
-
-def get_default_display_filters():
-    return {
-        "group_by": None,
-        "order_by": "-created_at",
-        "type": None,
-        "sub_issue": True,
-        "show_empty_groups": True,
-        "layout": "list",
-        "calendar_date_range": "",
-    }
-
-def get_default_display_properties():
-    return {
-        "assignee": True,
-        "attachment_count": True,
-        "created_on": True,
-        "due_date": True,
-        "estimate": True,
-        "key": True,
-        "labels": True,
-        "link": True,
-        "priority": True,
-        "start_date": True,
-        "state": True,
-        "sub_issue_count": True,
-        "updated_on": True,
-    }
-
-
 # TODO: Handle identifiers for Bulk Inserts - nk
 class IssueManager(models.Manager):
     def get_queryset(self):
@@ -144,7 +102,7 @@ class Issue(ProjectBaseModel):
     completed_at = models.DateTimeField(null=True)
     archived_at = models.DateField(null=True)
     is_draft = models.BooleanField(default=False)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     objects = models.Manager()
@@ -176,7 +134,6 @@ class Issue(ProjectBaseModel):
             except ImportError:
                 pass
 
-
         if self._state.adding:
             # Get the maximum display_id value from the database
             last_id = IssueSequence.objects.filter(project=self.project).aggregate(
@@ -254,8 +211,9 @@ class IssueRelation(ProjectBaseModel):
         ordering = ("-created_at",)
 
     def __str__(self):
-        return f"{self.issue.name} {self.related_issue.name}"    
-    
+        return f"{self.issue.name} {self.related_issue.name}"
+
+
 class IssueMention(ProjectBaseModel):
     issue = models.ForeignKey(
         Issue, on_delete=models.CASCADE, related_name="issue_mention"
@@ -265,6 +223,7 @@ class IssueMention(ProjectBaseModel):
         on_delete=models.CASCADE,
         related_name="issue_mention",
     )
+
     class Meta:
         unique_together = ["issue", "mention"]
         verbose_name = "Issue Mention"
@@ -273,7 +232,7 @@ class IssueMention(ProjectBaseModel):
         ordering = ("-created_at",)
 
     def __str__(self):
-        return f"{self.issue.name} {self.mention.email}" 
+        return f"{self.issue.name} {self.mention.email}"
 
 
 class IssueAssignee(ProjectBaseModel):
@@ -410,7 +369,7 @@ class IssueComment(ProjectBaseModel):
         default="INTERNAL",
         max_length=100,
     )
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     def save(self, *args, **kwargs):
@@ -436,9 +395,7 @@ class IssueProperty(ProjectBaseModel):
         on_delete=models.CASCADE,
         related_name="issue_property_user",
     )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
+    properties = models.JSONField(default=get_default_properties)
 
     class Meta:
         verbose_name = "Issue Property"
@@ -464,7 +421,7 @@ class Label(ProjectBaseModel):
     description = models.TextField(blank=True)
     color = models.CharField(max_length=255, blank=True)
     sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:

apiserver/plane/db/models/module.py

@@ -6,47 +6,6 @@ from django.conf import settings
 from . import ProjectBaseModel
 
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    },
-
-def get_default_display_filters():
-    return {
-        "group_by": None,
-        "order_by": "-created_at",
-        "type": None,
-        "sub_issue": True,
-        "show_empty_groups": True,
-        "layout": "list",
-        "calendar_date_range": "",
-    }
-
-def get_default_display_properties():
-    return {
-        "assignee": True,
-        "attachment_count": True,
-        "created_on": True,
-        "due_date": True,
-        "estimate": True,
-        "key": True,
-        "labels": True,
-        "link": True,
-        "priority": True,
-        "start_date": True,
-        "state": True,
-        "sub_issue_count": True,
-        "updated_on": True,
-    }
-
 class Module(ProjectBaseModel):
     name = models.CharField(max_length=255, verbose_name="Module Name")
     description = models.TextField(verbose_name="Module Description", blank=True)
@@ -82,7 +41,7 @@ class Module(ProjectBaseModel):
     )
     view_props = models.JSONField(default=dict)
     sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
@@ -182,28 +141,3 @@ class ModuleFavorite(ProjectBaseModel):
     def __str__(self):
         """Return user and the module"""
         return f"{self.user.email} <{self.module.name}>"
-
-
-class ModuleUserProperties(ProjectBaseModel):
-    module = models.ForeignKey(
-        "db.Module", on_delete=models.CASCADE, related_name="module_user_properties"
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="module_user_properties",
-    )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
-
-
-    class Meta:
-        unique_together = ["module", "user"]
-        verbose_name = "Module User Property"
-        verbose_name_plural = "Module User Property"
-        db_table = "module_user_properties"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.module.name} {self.user.email}"

apiserver/plane/db/models/state.py

@@ -24,7 +24,7 @@ class State(ProjectBaseModel):
         max_length=20,
     )
     default = models.BooleanField(default=False)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_source = models.CharField(null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     def __str__(self):

apiserver/plane/db/models/view.py

@@ -3,50 +3,9 @@ from django.db import models
 from django.conf import settings
 
 # Module import
-from . import ProjectBaseModel, BaseModel, WorkspaceBaseModel
+from . import ProjectBaseModel, BaseModel
 
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    }
-
-def get_default_display_filters():
-    return {
-        "group_by": None,
-        "order_by": "-created_at",
-        "type": None,
-        "sub_issue": True,
-        "show_empty_groups": True,
-        "layout": "list",
-        "calendar_date_range": "",
-    }
-
-def get_default_display_properties():
-    return {
-        "assignee": True,
-        "attachment_count": True,
-        "created_on": True,
-        "due_date": True,
-        "estimate": True,
-        "key": True,
-        "labels": True,
-        "link": True,
-        "priority": True,
-        "start_date": True,
-        "state": True,
-        "sub_issue_count": True,
-        "updated_on": True,
-    }
-
 class GlobalView(BaseModel):
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="global_views"
@@ -81,20 +40,14 @@ class GlobalView(BaseModel):
         return f"{self.name} <{self.workspace.name}>"
 
 
-class IssueView(WorkspaceBaseModel):
+class IssueView(ProjectBaseModel):
     name = models.CharField(max_length=255, verbose_name="View Name")
     description = models.TextField(verbose_name="View Description", blank=True)
     query = models.JSONField(verbose_name="View Query")
-    filters = models.JSONField(default=dict)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
     access = models.PositiveSmallIntegerField(
         default=1, choices=((0, "Private"), (1, "Public"))
     )
-    sort_order = models.FloatField(default=65535)
-    cycle = models.ForeignKey("db.Cycle", on_delete=models.CASCADE, related_name="views")
-    module = models.ForeignKey("db.Module", on_delete=models.CASCADE, related_name="views")
-    layouts = models.JSONField(default=dict)
+    query_data = models.JSONField(default=dict)
 
     class Meta:
         verbose_name = "Issue View"

apiserver/plane/db/models/workspace.py

@@ -54,51 +54,6 @@ def get_default_props():
         },
     }
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    }
-
-def get_default_display_filters():
-    return {
-        "display_filters": {
-            "group_by": None,
-            "order_by": "-created_at",
-            "type": None,
-            "sub_issue": True,
-            "show_empty_groups": True,
-            "layout": "list",
-            "calendar_date_range": "",
-        },
-    }
-
-def get_default_display_properties():
-    return {
-        "display_properties": {
-            "assignee": True,
-            "attachment_count": True,
-            "created_on": True,
-            "due_date": True,
-            "estimate": True,
-            "key": True,
-            "labels": True,
-            "link": True,
-            "priority": True,
-            "start_date": True,
-            "state": True,
-            "sub_issue_count": True,
-            "updated_on": True,
-        },
-    }
-
 
 def get_issue_props():
     return {
@@ -148,22 +103,6 @@ class Workspace(BaseModel):
         ordering = ("-created_at",)
 
 
-class WorkspaceBaseModel(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace", models.CASCADE, related_name="workspace_%(class)s"
-    )
-    project = models.ForeignKey(
-        "db.Project", models.CASCADE, related_name="project_%(class)s", null=True
-    )
-
-    class Meta:
-        abstract = True
-    
-    def save(self, *args, **kwargs):
-        if self.project:
-            self.workspace = self.project.workspace
-        super(WorkspaceBaseModel, self).save(*args, **kwargs)
-
 class WorkspaceMember(BaseModel):
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="workspace_member"
@@ -279,28 +218,3 @@ class WorkspaceTheme(BaseModel):
         verbose_name_plural = "Workspace Themes"
         db_table = "workspace_themes"
         ordering = ("-created_at",)
-
-
-class WorkspaceUserProperties(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace", on_delete=models.CASCADE, related_name="workspace_user_properties"
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="workspace_user_properties",
-    )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
-
-
-    class Meta:
-        unique_together = ["workspace", "user"]
-        verbose_name = "Workspace User Property"
-        verbose_name_plural = "Workspace User Property"
-        db_table = "Workspace_user_properties"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.workspace.name} {self.user.email}"

apiserver/plane/settings/common.py

@@ -5,6 +5,7 @@ import ssl
 import certifi
 from datetime import timedelta
 from urllib.parse import urlparse
+from kombu import Exchange, Queue
 
 # Django imports
 from django.core.management.utils import get_random_secret_key
@@ -148,6 +149,9 @@ else:
 REDIS_URL = os.environ.get("REDIS_URL")
 REDIS_SSL = REDIS_URL and "rediss" in REDIS_URL
 
+# RabbitMq Config
+RABBITMQ_URL = os.environ.get("RABBITMQ_URL")
+
 if REDIS_SSL:
     CACHES = {
         "default": {
@@ -270,18 +274,28 @@ SIMPLE_JWT = {
 # Celery Configuration
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_TASK_SERIALIZER = "json"
-CELERY_ACCEPT_CONTENT = ["application/json"]
+CELERY_ACCEPT_CONTENT = ["json"]
 
-if REDIS_SSL:
-    redis_url = os.environ.get("REDIS_URL")
-    broker_url = (
-        f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
-    )
-    CELERY_BROKER_URL = broker_url
-    CELERY_RESULT_BACKEND = broker_url
-else:
-    CELERY_BROKER_URL = REDIS_URL
-    CELERY_RESULT_BACKEND = REDIS_URL
+CELERY_BROKER_URL = RABBITMQ_URL
+CELERY_RESULT_BACKEND = REDIS_URL
+
+CELERY_QUEUES = (
+    Queue(
+        "internal_tasks",
+        Exchange("internal_exchange", type="direct"),
+        routing_key="internal",
+    ),
+    Queue(
+        "external_tasks",
+        Exchange("external_exchange", type="direct"),
+        routing_key="external",
+    ),
+    Queue(
+        "segway_tasks",
+        Exchange("segway_exchange", type="direct"),
+        routing_key="segway",
+    ),
+)
 
 CELERY_IMPORTS = (
     "plane.bgtasks.issue_automation_task",
@@ -329,12 +343,11 @@ USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
 POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
 POSTHOG_HOST = os.environ.get("POSTHOG_HOST", False)
 
-# instance key
-INSTANCE_KEY = os.environ.get(
-    "INSTANCE_KEY", "ae6517d563dfc13d8270bd45cf17b08f70b37d989128a9dab46ff687603333c3"
-)
-
 # Skip environment variable configuration
 SKIP_ENV_VAR = os.environ.get("SKIP_ENV_VAR", "1") == "1"
 
 DATA_UPLOAD_MAX_MEMORY_SIZE = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
+
+# Segway
+SEGWAY_BASE_URL = os.environ.get("SEGWAY_BASE_URL", "http://localhost:9000")
+SEGWAY_KEY = os.environ.get("SEGWAY_KEY", False)

apiserver/requirements/base.txt

@@ -30,7 +30,7 @@ openpyxl==3.1.2
 beautifulsoup4==4.12.2
 dj-database-url==2.1.0
 posthog==3.0.2
-cryptography==41.0.5
+cryptography==41.0.6
 lxml==4.9.3
 boto3==1.28.40
 

deploy/selfhost/install.sh

@@ -39,7 +39,7 @@ function download(){
     echo ""
     echo "Latest version is now available for you to use"
     echo ""
-    echo "In case of Upgrade, your new setting file is availabe as 'variables-upgrade.env'. Please compare and set the required values in '.env 'file."
+    echo "In case of Upgrade, your new setting file is available as 'variables-upgrade.env'. Please compare and set the required values in '.env 'file."
     echo ""
 
 }

nginx/nginx.conf.dev

@@ -18,9 +18,6 @@ http {
 
         location / {
             proxy_pass http://web:3000/;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
 
         location /api/ {

package.json

@@ -10,8 +10,7 @@
     "packages/eslint-config-custom",
     "packages/tailwind-config-custom",
     "packages/tsconfig",
-    "packages/ui",
-    "packages/types"
+    "packages/ui"
   ],
   "scripts": {
     "build": "turbo run build",
@@ -28,7 +27,7 @@
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
-    "turbo": "^1.11.2"
+    "turbo": "^1.11.1"
   },
   "resolutions": {
     "@types/react": "18.2.42"

packages/editor/core/src/ui/extensions/index.tsx

@@ -52,12 +52,12 @@ export const CoreEditorExtensions = (
         class: "leading-normal -mb-2",
       },
     },
-    code: {
-      HTMLAttributes: {
-        class: "rounded-md bg-custom-primary-30 mx-1 px-1 py-1 font-mono font-medium text-custom-text-1000",
-        spellcheck: "false",
-      },
-    },
+    // blockquote: {
+    //   HTMLAttributes: {
+    //     class: "border-l-4 border-custom-border-300",
+    //   },
+    // },
+    code: false,
     codeBlock: false,
     horizontalRule: false,
     dropcursor: {

packages/editor/core/src/ui/extensions/table/table/table-view.tsx

@@ -1,5 +1,5 @@
 import { h } from "jsx-dom-cjs";
-import { Node as ProseMirrorNode, ResolvedPos } from "@tiptap/pm/model";
+import { Node as ProseMirrorNode } from "@tiptap/pm/model";
 import { Decoration, NodeView } from "@tiptap/pm/view";
 import tippy, { Instance, Props } from "tippy.js";
 
@@ -8,12 +8,6 @@ import { CellSelection, TableMap, updateColumnsOnResize } from "@tiptap/pm/table
 
 import { icons } from "src/ui/extensions/table/table/icons";
 
-type ToolboxItem = {
-  label: string;
-  icon: string;
-  action: (args: any) => void;
-};
-
 export function updateColumns(
   node: ProseMirrorNode,
   colgroup: HTMLElement,
@@ -81,7 +75,7 @@ const defaultTippyOptions: Partial<Props> = {
   placement: "right",
 };
 
-function setCellsBackgroundColor(editor: Editor, backgroundColor: string) {
+function setCellsBackgroundColor(editor: Editor, backgroundColor) {
   return editor
     .chain()
     .focus()
@@ -94,7 +88,7 @@ function setCellsBackgroundColor(editor: Editor, backgroundColor: string) {
     .run();
 }
 
-const columnsToolboxItems: ToolboxItem[] = [
+const columnsToolboxItems = [
   {
     label: "Add Column Before",
     icon: icons.insertLeftTableIcon,
@@ -115,7 +109,7 @@ const columnsToolboxItems: ToolboxItem[] = [
     }: {
       editor: Editor;
       triggerButton: HTMLElement;
-      controlsContainer: Element;
+      controlsContainer;
     }) => {
       createColorPickerToolbox({
         triggerButton,
@@ -133,7 +127,7 @@ const columnsToolboxItems: ToolboxItem[] = [
   },
 ];
 
-const rowsToolboxItems: ToolboxItem[] = [
+const rowsToolboxItems = [
   {
     label: "Add Row Above",
     icon: icons.insertTopTableIcon,
@@ -178,12 +172,11 @@ function createToolbox({
   tippyOptions,
   onClickItem,
 }: {
-  triggerButton: Element | null;
-  items: ToolboxItem[];
+  triggerButton: HTMLElement;
+  items: { icon: string; label: string }[];
   tippyOptions: any;
-  onClickItem: (item: ToolboxItem) => void;
+  onClickItem: any;
 }): Instance<Props> {
-  // @ts-expect-error
   const toolbox = tippy(triggerButton, {
     content: h(
       "div",
@@ -285,14 +278,14 @@ export class TableView implements NodeView {
   decorations: Decoration[];
   editor: Editor;
   getPos: () => number;
-  hoveredCell: ResolvedPos | null = null;
+  hoveredCell;
   map: TableMap;
   root: HTMLElement;
-  table: HTMLTableElement;
-  colgroup: HTMLTableColElement;
+  table: HTMLElement;
+  colgroup: HTMLElement;
   tbody: HTMLElement;
-  rowsControl?: HTMLElement | null;
-  columnsControl?: HTMLElement | null;
+  rowsControl?: HTMLElement;
+  columnsControl?: HTMLElement;
   columnsToolbox?: Instance<Props>;
   rowsToolbox?: Instance<Props>;
   controls?: HTMLElement;
@@ -405,13 +398,13 @@ export class TableView implements NodeView {
     this.render();
   }
 
-  update(node: ProseMirrorNode, decorations: readonly Decoration[]) {
+  update(node: ProseMirrorNode, decorations) {
     if (node.type !== this.node.type) {
       return false;
     }
 
     this.node = node;
-    this.decorations = [...decorations];
+    this.decorations = decorations;
     this.map = TableMap.get(this.node);
 
     if (this.editor.isEditable) {
@@ -437,16 +430,19 @@ export class TableView implements NodeView {
   }
 
   updateControls() {
-    const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce((acc, curr) => {
-      if (curr.spec.hoveredCell !== undefined) {
-        acc["hoveredCell"] = curr.spec.hoveredCell;
-      }
+    const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce(
+      (acc, curr) => {
+        if (curr.spec.hoveredCell !== undefined) {
+          acc["hoveredCell"] = curr.spec.hoveredCell;
+        }
 
-      if (curr.spec.hoveredTable !== undefined) {
-        acc["hoveredTable"] = curr.spec.hoveredTable;
-      }
-      return acc;
-    }, {} as Record<string, HTMLElement>) as any;
+        if (curr.spec.hoveredTable !== undefined) {
+          acc["hoveredTable"] = curr.spec.hoveredTable;
+        }
+        return acc;
+      },
+      {} as Record<string, HTMLElement>
+    ) as any;
 
     if (table === undefined || cell === undefined) {
       return this.root.classList.add("controls--disabled");
@@ -457,21 +453,14 @@ export class TableView implements NodeView {
 
     const cellDom = this.editor.view.nodeDOM(cell.pos) as HTMLElement;
 
-    if (!this.table) {
-      return;
-    }
-
     const tableRect = this.table.getBoundingClientRect();
     const cellRect = cellDom.getBoundingClientRect();
 
-    if (this.columnsControl) {
-      this.columnsControl.style.left = `${cellRect.left - tableRect.left - this.table.parentElement!.scrollLeft}px`;
-      this.columnsControl.style.width = `${cellRect.width}px`;
-    }
-    if (this.rowsControl) {
-      this.rowsControl.style.top = `${cellRect.top - tableRect.top}px`;
-      this.rowsControl.style.height = `${cellRect.height}px`;
-    }
+    this.columnsControl.style.left = `${cellRect.left - tableRect.left - this.table.parentElement!.scrollLeft}px`;
+    this.columnsControl.style.width = `${cellRect.width}px`;
+
+    this.rowsControl.style.top = `${cellRect.top - tableRect.top}px`;
+    this.rowsControl.style.height = `${cellRect.height}px`;
   }
 
   selectColumn() {
@@ -482,7 +471,10 @@ export class TableView implements NodeView {
     const headCellPos = this.map.map[colIndex + this.map.width * (this.map.height - 1)] + (this.getPos() + 1);
 
     const cellSelection = CellSelection.create(this.editor.view.state.doc, anchorCellPos, headCellPos);
-    this.editor.view.dispatch(this.editor.state.tr.setSelection(cellSelection));
+    this.editor.view.dispatch(
+      // @ts-ignore
+      this.editor.state.tr.setSelection(cellSelection)
+    );
   }
 
   selectRow() {
@@ -493,6 +485,9 @@ export class TableView implements NodeView {
     const headCellPos = this.map.map[anchorCellIndex + (this.map.width - 1)] + (this.getPos() + 1);
 
     const cellSelection = CellSelection.create(this.editor.state.doc, anchorCellPos, headCellPos);
-    this.editor.view.dispatch(this.editor.view.state.tr.setSelection(cellSelection));
+    this.editor.view.dispatch(
+      // @ts-ignore
+      this.editor.view.state.tr.setSelection(cellSelection)
+    );
   }
 }

packages/editor/document-editor/package.json

@@ -35,6 +35,7 @@
     "@tiptap/extension-placeholder": "^2.1.13",
     "@tiptap/pm": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
+    "eslint": "8.36.0",
     "eslint-config-next": "13.2.4",
     "react-popper": "^2.3.0",
     "tippy.js": "^6.3.7",
@@ -44,7 +45,7 @@
     "@types/node": "18.15.3",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "eslint": "8.36.0",
+    "eslint": "^7.32.0",
     "postcss": "^8.4.29",
     "tailwind-config-custom": "*",
     "tsconfig": "*",

packages/editor/extensions/package.json

@@ -33,6 +33,7 @@
     "@tiptap/pm": "^2.1.13",
     "@tiptap/react": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
+    "eslint": "8.36.0",
     "eslint-config-next": "13.2.4",
     "lucide-react": "^0.294.0",
     "tippy.js": "^6.3.7"
@@ -41,7 +42,7 @@
     "@types/node": "18.15.3",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "eslint": "8.36.0",
+    "eslint": "^7.32.0",
     "postcss": "^8.4.29",
     "tailwind-config-custom": "*",
     "tsconfig": "*",

packages/tsconfig/express.json

@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+      "target": "es2016",
+      "module": "commonjs",
+      "esModuleInterop": true,
+      "forceConsistentCasingInFileNames": true,
+      "strict": true,
+      "skipLibCheck": true,
+      "outDir": "./dist",
+      "baseUrl": "./src",
+      "moduleResolution": "node",
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true
+    },
+    "include": ["src/**/*.ts"],
+    "exclude": ["node_modules"]
+  }

packages/types/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "@plane/types",
-  "version": "0.14.0",
-  "private": true,
-  "main": "./src/index.d.ts"
-}
-  

packages/types/src/issues/base.d.ts

@@ -1,23 +0,0 @@
-// issues
-export * from "./issue";
-export * from "./issue_reaction";
-export * from "./issue_link";
-export * from "./issue_attachment";
-export * from "./issue_relation";
-export * from "./issue_activity";
-export * from "./issue_comment_reaction";
-export * from "./issue_sub_issues";
-
-export type TLoader = "init-loader" | "mutation" | undefined;
-
-export type TGroupedIssues = {
-  [group_id: string]: string[];
-};
-
-export type TSubGroupedIssues = {
-  [sub_grouped_id: string]: {
-    [group_id: string]: string[];
-  };
-};
-
-export type TUnGroupedIssues = string[];

packages/types/src/issues/issue.d.ts

@@ -1,36 +0,0 @@
-// new issue structure types
-export type TIssue = {
-  id: string;
-  name: string;
-  state_id: string;
-  description_html: string;
-  sort_order: number;
-  completed_at: string | null;
-  estimate_point: number | null;
-  priority: TIssuePriorities;
-  start_date: string;
-  target_date: string;
-  sequence_id: number;
-  project_id: string;
-  parent_id: string | null;
-  cycle_id: string | null;
-  module_id: string | null;
-  label_ids: string[];
-  assignee_ids: string[];
-  sub_issues_count: number;
-  created_at: string;
-  updated_at: string;
-  created_by: string;
-  updated_by: string;
-  attachment_count: number;
-  link_count: number;
-  is_subscribed: boolean;
-  archived_at: boolean;
-  is_draft: boolean;
-  // tempId is used for optimistic updates. It is not a part of the API response.
-  tempId?: string;
-};
-
-export type TIssueMap = {
-  [issue_id: string]: TIssue;
-};

packages/types/src/issues/issue_activity.d.ts

@@ -1,41 +0,0 @@
-export type TIssueActivity = {
-  access?: "EXTERNAL" | "INTERNAL";
-  actor: string;
-  actor_detail: IUserLite;
-  attachments: any[];
-  comment?: string;
-  comment_html?: string;
-  comment_stripped?: string;
-  created_at: Date;
-  created_by: string;
-  field: string | null;
-  id: string;
-  issue: string | null;
-  issue_comment?: string | null;
-  issue_detail: {
-    description_html: string;
-    id: string;
-    name: string;
-    priority: string | null;
-    sequence_id: string;
-  } | null;
-  new_identifier: string | null;
-  new_value: string | null;
-  old_identifier: string | null;
-  old_value: string | null;
-  project: string;
-  project_detail: IProjectLite;
-  updated_at: Date;
-  updated_by: string;
-  verb: string;
-  workspace: string;
-  workspace_detail?: IWorkspaceLite;
-};
-
-export type TIssueActivityMap = {
-  [issue_id: string]: TIssueActivity;
-};
-
-export type TIssueActivityIdMap = {
-  [issue_id: string]: string[];
-};

packages/types/src/issues/issue_attachment.d.ts

@@ -1,23 +0,0 @@
-export type TIssueAttachment = {
-  id: string;
-  created_at: string;
-  updated_at: string;
-  attributes: {
-    name: string;
-    size: number;
-  };
-  asset: string;
-  created_by: string;
-  updated_by: string;
-  project: string;
-  workspace: string;
-  issue: string;
-};
-
-export type TIssueAttachmentMap = {
-  [issue_id: string]: TIssueAttachment;
-};
-
-export type TIssueAttachmentIdMap = {
-  [issue_id: string]: string[];
-};

packages/types/src/issues/issue_comment_reaction.d.ts

@@ -1,20 +0,0 @@
-export type TIssueCommentReaction = {
-  id: string;
-  created_at: Date;
-  updated_at: Date;
-  reaction: string;
-  created_by: string;
-  updated_by: string;
-  project: string;
-  workspace: string;
-  actor: string;
-  comment: string;
-};
-
-export type TIssueCommentReactionMap = {
-  [issue_id: string]: TIssueCommentReaction;
-};
-
-export type TIssueCommentReactionIdMap = {
-  [issue_id: string]: string[];
-};

packages/types/src/issues/issue_link.d.ts

@@ -1,20 +0,0 @@
-export type TIssueLinkEditableFields = {
-  title: string;
-  url: string;
-};
-
-export type TIssueLink = TIssueLinkEditableFields & {
-  created_at: Date;
-  created_by: string;
-  created_by_detail: IUserLite;
-  id: string;
-  metadata: any;
-};
-
-export type TIssueLinkMap = {
-  [issue_id: string]: TIssueLink;
-};
-
-export type TIssueLinkIdMap = {
-  [issue_id: string]: string[];
-};

packages/types/src/issues/issue_reaction.d.ts

@@ -1,21 +0,0 @@
-export type TIssueReaction = {
-  actor: string;
-  actor_detail: IUserLite;
-  created_at: Date;
-  created_by: string;
-  id: string;
-  issue: string;
-  project: string;
-  reaction: string;
-  updated_at: Date;
-  updated_by: string;
-  workspace: string;
-};
-
-export type TIssueReactionMap = {
-  [issue_id: string]: TIssueReaction;
-};
-
-export type TIssueReactionIdMap = {
-  [issue_id: string]: string[];
-};

packages/types/src/issues/issue_relation.d.ts

@@ -1,20 +0,0 @@
-import { TIssue } from "./issues";
-
-export type TIssueRelationTypes =
-  | "blocking"
-  | "blocked_by"
-  | "duplicate"
-  | "relates_to";
-
-export type TIssueRelationObject = { issue_detail: TIssue };
-
-export type TIssueRelation = Record<
-  TIssueRelationTypes,
-  TIssueRelationObject[]
->;
-
-export type TIssueRelationMap = {
-  [issue_id: string]: Record<TIssueRelationTypes, string[]>;
-};
-
-export type TIssueRelationIdMap = Record<TIssueRelationTypes, string[]>;

packages/types/src/issues/issue_sub_issues.d.ts

@@ -1,22 +0,0 @@
-import { TIssue } from "./issue";
-
-export type TSubIssuesStateDistribution = {
-  backlog: number;
-  unstarted: number;
-  started: number;
-  completed: number;
-  cancelled: number;
-};
-
-export type TIssueSubIssues = {
-  state_distribution: TSubIssuesStateDistribution;
-  sub_issues: TIssue[];
-};
-
-export type TIssueSubIssuesStateDistributionMap = {
-  [issue_id: string]: TSubIssuesStateDistribution;
-};
-
-export type TIssueSubIssuesIdMap = {
-  [issue_id: string]: string[];
-};

packages/ui/src/icons/priority-icon.tsx

@@ -1,16 +1,13 @@
 import * as React from "react";
+
+// icons
 import { AlertCircle, Ban, SignalHigh, SignalLow, SignalMedium } from "lucide-react";
 
-type TIssuePriorities = "urgent" | "high" | "medium" | "low" | "none";
+// types
+import { IPriorityIcon } from "./type";
 
-interface IPriorityIcon {
-  className?: string;
-  priority: TIssuePriorities;
-  size?: number;
-}
-
-export const PriorityIcon: React.FC<IPriorityIcon> = (props) => {
-  const { priority, className = "", size = 14 } = props;
+export const PriorityIcon: React.FC<IPriorityIcon> = ({ priority, className = "", transparentBg = false }) => {
+  if (!className || className === "") className = "h-4 w-4";
 
   // Convert to lowercase for string comparison
   const lowercasePriority = priority?.toLowerCase();
@@ -19,17 +16,31 @@ export const PriorityIcon: React.FC<IPriorityIcon> = (props) => {
   const getPriorityIcon = (): React.ReactNode => {
     switch (lowercasePriority) {
       case "urgent":
-        return <AlertCircle size={size} className={`text-red-500 ${className}`} />;
+        return <AlertCircle className={`text-red-500 ${transparentBg ? "" : "p-0.5"} ${className}`} />;
       case "high":
-        return <SignalHigh size={size} strokeWidth={3} className={`text-orange-500 ${className}`} />;
+        return <SignalHigh className={`text-orange-500 ${transparentBg ? "" : "pl-1"} ${className}`} />;
       case "medium":
-        return <SignalMedium size={size} strokeWidth={3} className={`text-yellow-500 ${className}`} />;
+        return <SignalMedium className={`text-yellow-500 ${transparentBg ? "" : "ml-1.5"} ${className}`} />;
       case "low":
-        return <SignalLow size={size} strokeWidth={3} className={`text-custom-primary-100 ${className}`} />;
+        return <SignalLow className={`text-green-500 ${transparentBg ? "" : "ml-2"} ${className}`} />;
       default:
-        return <Ban size={size} className={`text-custom-text-200 ${className}`} />;
+        return <Ban className={`text-custom-text-200 ${transparentBg ? "" : "p-0.5"} ${className}`} />;
     }
   };
 
-  return <>{getPriorityIcon()}</>;
+  return (
+    <>
+      {transparentBg ? (
+        getPriorityIcon()
+      ) : (
+        <div
+          className={`grid h-5 w-5 place-items-center items-center rounded border ${
+            lowercasePriority === "urgent" ? "border-red-500/20 bg-red-500/20" : "border-custom-border-200"
+          }`}
+        >
+          {getPriorityIcon()}
+        </div>
+      )}
+    </>
+  );
 };

packages/ui/src/icons/type.d.ts

@@ -1,3 +1,11 @@
 export interface ISvgIcons extends React.SVGAttributes<SVGElement> {
   className?: string | undefined;
 }
+
+export type TIssuePriorities = "urgent" | "high" | "medium" | "low" | "none";
+
+export interface IPriorityIcon {
+  priority: TIssuePriorities | null;
+  className?: string;
+  transparentBg?: boolean | false;
+}

segway/.env.example

@@ -0,0 +1,7 @@
+APP_ENV=local
+SERVER_PORT=9000
+DATABASE_URL=""
+RABBITMQ_URL=""
+SENTRY_DSN=""
+GITHUB_APP_ID=""
+GITHUB_APP_PRIVATE_KEY=""

segway/Dockerfile.segway

@@ -0,0 +1,20 @@
+# Use the official Node.js 18-alpine image as the base image
+FROM node:18-alpine
+
+# Set the working directory inside the container
+WORKDIR /usr/src/app
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install
+
+# Copy the rest of the application code to the working directory
+COPY . .
+
+# Build the TypeScript code
+RUN npm run build
+
+# Expose the port that your application will run on
+EXPOSE 9000