chore: updated nginx config

chore: updated docker-compose hub
chore: added spaces packages
2023-09-02 08:00:53 +00:00 · 2023-09-02 08:00:24 +00:00 · 2023-09-02 07:57:40 +00:00 · 2023-09-02 07:57:29 +00:00 · 2023-09-02 07:57:00 +00:00 · 2023-09-02 07:03:44 +00:00
1362 changed files with 17069 additions and 36610 deletions
@@ -1,3 +1,36 @@
+# Frontend
+# Extra image domains that need to be added for Next Image
+NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS=
+# Google Client ID for Google OAuth
+NEXT_PUBLIC_GOOGLE_CLIENTID=""
+# Github ID for Github OAuth
+NEXT_PUBLIC_GITHUB_ID=""
+# Github App Name for GitHub Integration
+NEXT_PUBLIC_GITHUB_APP_NAME=""
+# Sentry DSN for error monitoring
+NEXT_PUBLIC_SENTRY_DSN=""
+# Enable/Disable OAUTH - default 0 for selfhosted instance
+NEXT_PUBLIC_ENABLE_OAUTH=0
+# Enable/Disable sentry
+NEXT_PUBLIC_ENABLE_SENTRY=0
+# Enable/Disable session recording
+NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
+# Enable/Disable event tracking
+NEXT_PUBLIC_TRACK_EVENTS=0
+# Slack for Slack Integration
+NEXT_PUBLIC_SLACK_CLIENT_ID=""
+# For Telemetry, set it to "app.plane.so"
+NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
+# public boards deploy url
+NEXT_PUBLIC_DEPLOY_URL=""
+
+# Backend
+# Debug value for api server use it as 0 for production use
+DEBUG=0
+
+# Error logs
+SENTRY_DSN=""
+
 # Database Settings
 PGUSER="plane"
 PGPASSWORD="plane"
@@ -10,6 +43,15 @@ REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"

+# Email Settings
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT=587
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
+
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -25,6 +67,9 @@ OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
 OPENAI_API_KEY="sk-" # add your openai key here
 GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access

+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+
 # Settings related to Docker
 DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
@@ -33,3 +78,10 @@ USE_MINIO=1
 # Nginx Configuration
 NGINX_PORT=80

+# Default Creds
+DEFAULT_EMAIL="captain@plane.so"
+DEFAULT_PASSWORD="password123"
+
+# SignUps
+ENABLE_SIGNUP="1"
+# Auto generated and Required that will be generated from setup.sh
@@ -4,7 +4,7 @@ module.exports = {
  extends: ["custom"],
  settings: {
    next: {
-      rootDir: ["web/", "space/"],
+      rootDir: ["apps/*"],
    },
  },
 };
@@ -29,21 +29,26 @@ jobs:
            apiserver:
              - apiserver/**
            web:
-              - web/**
+              - apps/app/**
            deploy:
-              - space/**
+              - apps/space/**
+
+      - name: Setup .npmrc for repository
+        run: |
+            echo -e "@tiptap-pro:registry=https://registry.tiptap.dev/\n//registry.tiptap.dev/:_authToken=${{ secrets.TIPTAP_TOKEN }}" > .npmrc

      - name: Build Plane's Main App
        if: steps.changed-files.outputs.web_any_changed == 'true'
        run: |
-          cd web
+          mv ./.npmrc ./apps/app
+          cd apps/app
          yarn
          yarn build

      - name: Build Plane's Deploy App
        if: steps.changed-files.outputs.deploy_any_changed == 'true'
        run: |
-          cd space
+          cd apps/space
          yarn 
          yarn build

@@ -2,7 +2,7 @@ name: Update Docker Images for Plane on Release

 on:
  release:
-    types: [released, prereleased]
+    types: [released]

 jobs:
  build_push_backend:
@@ -22,6 +22,10 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Setup .npmrc for repository
+        run: |
+            echo -e "@tiptap-pro:registry=https://registry.tiptap.dev/\n//registry.tiptap.dev/:_authToken=${{ secrets.TIPTAP_TOKEN }}" > .npmrc
+
      - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
        id: metaFrontend
        uses: docker/metadata-action@v4.3.0
@@ -58,7 +62,7 @@ jobs:
        uses: docker/build-push-action@v4.0.0
        with:
          context: .
-          file: ./web/Dockerfile.web
+          file: ./apps/app/Dockerfile.web
          platforms: linux/amd64
          tags: ${{ steps.metaFrontend.outputs.tags }}
          push: true
@@ -84,7 +88,7 @@ jobs:
        uses: docker/build-push-action@v4.0.0
        with:
          context: .
-          file: ./space/Dockerfile.space
+          file: ./apps/space/Dockerfile.space
          platforms: linux/amd64
          push: true
          tags: ${{ steps.metaDeploy.outputs.tags }}
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:

- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
  and learning from the experience
- Focusing on what is best not just for us as individuals, but for the
+* Focusing on what is best not just for us as individuals, but for the
  overall community

 Examples of unacceptable behavior include:

- The use of sexualized language or imagery, and sexual attention or
+* The use of sexualized language or imagery, and sexual attention or
  advances of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
  address, without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a
+* Other conduct which could reasonably be considered inappropriate in a
  professional setting

 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban

 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.

 **Consequence**: A permanent ban from any sort of public interaction within
@@ -125,4 +125,4 @@ enforcement ladder](https://github.com/mozilla/diversity).

 For answers to common questions about this code of conduct, see the FAQ at
 https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+https://www.contributor-covenant.org/translations.
@@ -35,10 +35,12 @@

 Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.

+
 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.

 The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting).

+
 ## ⚡️ Quick start with Docker Compose

 ### Docker Compose Setup
@@ -54,30 +56,40 @@ chmod +x setup.sh
 - Run setup.sh

 ```bash
-./setup.sh http://localhost
+./setup.sh http://localhost 
 ```

 > If running in a cloud env replace localhost with public facing IP address of the VM

+- Setup Tiptap Pro
+
+  Visit [Tiptap Pro](https://collab.tiptap.dev/pro-extensions) and signup (it is free).
+
+  Create a **`.npmrc`** file, copy the following and replace your registry token generated from Tiptap Pro. 
+
+```
+@tiptap-pro:registry=https://registry.tiptap.dev/
+//registry.tiptap.dev/:_authToken=YOUR_REGISTRY_TOKEN
+```
 - Run Docker compose up

 ```bash
 docker compose up -d
 ```

-<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong>
+<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong> 

 ## 🚀 Features

- **Issue Planning and Tracking**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to issues for better organization and tracking.
- **Issue Attachments**: Collaborate effectively by attaching files to issues, making it easy for your team to find and share important project-related documents.
- **Layouts**: Customize your project view with your preferred layout - choose from List, Kanban, or Calendar to visualize your project in a way that makes sense to you.
- **Cycles**: Plan sprints with Cycles to keep your team on track and productive. Gain insights into your project's progress with burn-down charts and other useful features.
- **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to easily track and plan your project's progress.
- **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
- **Pages**: Plane pages function as an AI-powered notepad, allowing you to easily document issues, cycle plans, and module details, and then synchronize them with your issues.
- **Command K**: Enjoy a better user experience with the new Command + K menu. Easily manage and navigate through your projects from one convenient location.
- **GitHub Sync**: Streamline your planning process by syncing your GitHub issues with Plane. Keep all your issues in one place for better tracking and collaboration.
+* **Issue Planning and Tracking**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to issues for better organization and tracking.
+* **Issue Attachments**: Collaborate effectively by attaching files to issues, making it easy for your team to find and share important project-related documents.
+* **Layouts**: Customize your project view with your preferred layout - choose from List, Kanban, or Calendar to visualize your project in a way that makes sense to you.
+* **Cycles**: Plan sprints with Cycles to keep your team on track and productive. Gain insights into your project's progress with burn-down charts and other useful features.
+* **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to easily track and plan your project's progress.
+* **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
+* **Pages**: Plane pages function as an AI-powered notepad, allowing you to easily document issues, cycle plans, and module details, and then synchronize them with your issues.
+* **Command K**: Enjoy a better user experience with the new Command + K menu. Easily manage and navigate through your projects from one convenient location.
+* **GitHub Sync**: Streamline your planning process by syncing your GitHub issues with Plane. Keep all your issues in one place for better tracking and collaboration.

 ## 📸 Screenshots

@@ -138,6 +150,7 @@ docker compose up -d
  </p>
 </p>

+
 ## 📚Documentation

 For full documentation, visit [docs.plane.so](https://docs.plane.so/)
@@ -1,61 +0,0 @@
-# Backend
-# Debug value for api server use it as 0 for production use
-DEBUG=0
-DJANGO_SETTINGS_MODULE="plane.settings.selfhosted"
-
-# Error logs
-SENTRY_DSN=""
-
-# Database Settings
-PGUSER="plane"
-PGPASSWORD="plane"
-PGHOST="plane-db"
-PGDATABASE="plane"
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
-
-# Redis Settings
-REDIS_HOST="plane-redis"
-REDIS_PORT="6379"
-REDIS_URL="redis://${REDIS_HOST}:6379/"
-
-# Email Settings
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-EMAIL_PORT=587
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
-EMAIL_USE_TLS="1"
-EMAIL_USE_SSL="0"
-
-# AWS Settings
-AWS_REGION=""
-AWS_ACCESS_KEY_ID="access-key"
-AWS_SECRET_ACCESS_KEY="secret-key"
-AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
-# Changing this requires change in the nginx.conf for uploads if using minio setup
-AWS_S3_BUCKET_NAME="uploads"
-# Maximum file upload limit
-FILE_SIZE_LIMIT=5242880
-
-# GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
-
-# Github
-GITHUB_CLIENT_SECRET="" # For fetching release notes
-
-# Settings related to Docker
-DOCKERIZED=1
-# set to 1 If using the pre-configured minio setup
-USE_MINIO=1
-
-# Nginx Configuration
-NGINX_PORT=80
-
-# Default Creds
-DEFAULT_EMAIL="captain@plane.so"
-DEFAULT_PASSWORD="password123"
-
-# SignUps
-ENABLE_SIGNUP="1"
@@ -23,7 +23,7 @@ from .project import (
    ProjectPublicMemberSerializer
 )
 from .state import StateSerializer, StateLiteSerializer
-from .view import GlobalViewSerializer, IssueViewSerializer, IssueViewFavoriteSerializer
+from .view import IssueViewSerializer, IssueViewFavoriteSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleFavoriteSerializer, CycleWriteSerializer
 from .asset import FileAssetSerializer
 from .issue import (
@@ -31,6 +31,8 @@ from .issue import (
    IssueActivitySerializer,
    IssueCommentSerializer,
    IssuePropertySerializer,
+    BlockerIssueSerializer,
+    BlockedIssueSerializer,
    IssueAssigneeSerializer,
    LabelSerializer,
    IssueSerializer,
@@ -43,8 +45,6 @@ from .issue import (
    IssueReactionSerializer,
    CommentReactionSerializer,
    IssueVoteSerializer,
-    IssueRelationSerializer,
-    RelatedIssueSerializer,
    IssuePublicSerializer,
 )

@@ -17,10 +17,12 @@ from plane.db.models import (
    IssueActivity,
    IssueComment,
    IssueProperty,
+    IssueBlocker,
    IssueAssignee,
    IssueSubscriber,
    IssueLabel,
    Label,
+    IssueBlocker,
    CycleIssue,
    Cycle,
    Module,
@@ -30,7 +32,6 @@ from plane.db.models import (
    IssueReaction,
    CommentReaction,
    IssueVote,
-    IssueRelation,
 )


@@ -49,7 +50,6 @@ class IssueFlatSerializer(BaseSerializer):
            "target_date",
            "sequence_id",
            "sort_order",
-            "is_draft",
        ]


@@ -81,12 +81,25 @@ class IssueCreateSerializer(BaseSerializer):
        required=False,
    )

+    # List of issues that are blocking this issue
+    blockers_list = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Issue.objects.all()),
+        write_only=True,
+        required=False,
+    )
    labels_list = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
        write_only=True,
        required=False,
    )

+    # List of issues that are blocked by this issue
+    blocks_list = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Issue.objects.all()),
+        write_only=True,
+        required=False,
+    )
+
    class Meta:
        model = Issue
        fields = "__all__"
@@ -109,8 +122,10 @@ class IssueCreateSerializer(BaseSerializer):
        return data

    def create(self, validated_data):
+        blockers = validated_data.pop("blockers_list", None)
        assignees = validated_data.pop("assignees_list", None)
        labels = validated_data.pop("labels_list", None)
+        blocks = validated_data.pop("blocks_list", None)

        project_id = self.context["project_id"]
        workspace_id = self.context["workspace_id"]
@@ -122,6 +137,22 @@ class IssueCreateSerializer(BaseSerializer):
        created_by_id = issue.created_by_id
        updated_by_id = issue.updated_by_id

+        if blockers is not None and len(blockers):
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=issue,
+                        blocked_by=blocker,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for blocker in blockers
+                ],
+                batch_size=10,
+            )
+
        if assignees is not None and len(assignees):
            IssueAssignee.objects.bulk_create(
                [
@@ -165,11 +196,29 @@ class IssueCreateSerializer(BaseSerializer):
                batch_size=10,
            )

+        if blocks is not None and len(blocks):
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=block,
+                        blocked_by=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for block in blocks
+                ],
+                batch_size=10,
+            )
+
        return issue

    def update(self, instance, validated_data):
+        blockers = validated_data.pop("blockers_list", None)
        assignees = validated_data.pop("assignees_list", None)
        labels = validated_data.pop("labels_list", None)
+        blocks = validated_data.pop("blocks_list", None)

        # Related models
        project_id = instance.project_id
@@ -177,6 +226,23 @@ class IssueCreateSerializer(BaseSerializer):
        created_by_id = instance.created_by_id
        updated_by_id = instance.updated_by_id

+        if blockers is not None:
+            IssueBlocker.objects.filter(block=instance).delete()
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=instance,
+                        blocked_by=blocker,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for blocker in blockers
+                ],
+                batch_size=10,
+            )
+
        if assignees is not None:
            IssueAssignee.objects.filter(issue=instance).delete()
            IssueAssignee.objects.bulk_create(
@@ -211,6 +277,23 @@ class IssueCreateSerializer(BaseSerializer):
                batch_size=10,
            )

+        if blocks is not None:
+            IssueBlocker.objects.filter(blocked_by=instance).delete()
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=block,
+                        blocked_by=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for block in blocks
+                ],
+                batch_size=10,
+            )
+
        # Time updation occues even when other related models are updated
        instance.updated_at = timezone.now()
        return super().update(instance, validated_data)
@@ -292,39 +375,32 @@ class IssueLabelSerializer(BaseSerializer):
        ]


-class IssueRelationSerializer(BaseSerializer):
-    issue_detail = IssueProjectLiteSerializer(read_only=True, source="related_issue")
+class BlockedIssueSerializer(BaseSerializer):
+    blocked_issue_detail = IssueProjectLiteSerializer(source="block", read_only=True)

    class Meta:
-        model = IssueRelation
+        model = IssueBlocker
        fields = [
-            "issue_detail",
-            "relation_type",
-            "related_issue",
-            "issue",
-            "id"
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
+            "blocked_issue_detail",
+            "blocked_by",
+            "block",
        ]
+        read_only_fields = fields

-class RelatedIssueSerializer(BaseSerializer):
-    issue_detail = IssueProjectLiteSerializer(read_only=True, source="issue")
+
+class BlockerIssueSerializer(BaseSerializer):
+    blocker_issue_detail = IssueProjectLiteSerializer(
+        source="blocked_by", read_only=True
+    )

    class Meta:
-        model = IssueRelation
+        model = IssueBlocker
        fields = [
-            "issue_detail",
-            "relation_type",
-            "related_issue",
-            "issue",
-            "id"
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
+            "blocker_issue_detail",
+            "blocked_by",
+            "block",
        ]
+        read_only_fields = fields


 class IssueAssigneeSerializer(BaseSerializer):
@@ -438,9 +514,6 @@ class IssueAttachmentSerializer(BaseSerializer):


 class IssueReactionSerializer(BaseSerializer):
-    
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-    
    class Meta:
        model = IssueReaction
        fields = "__all__"
@@ -452,6 +525,19 @@ class IssueReactionSerializer(BaseSerializer):
        ]


+class IssueReactionLiteSerializer(BaseSerializer):
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+
+    class Meta:
+        model = IssueReaction
+        fields = [
+            "id",
+            "reaction",
+            "issue",
+            "actor_detail",
+        ]
+
+
 class CommentReactionLiteSerializer(BaseSerializer):
    actor_detail = UserLiteSerializer(read_only=True, source="actor")

@@ -473,12 +559,9 @@ class CommentReactionSerializer(BaseSerializer):


 class IssueVoteSerializer(BaseSerializer):
-
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-
    class Meta:
        model = IssueVote
-        fields = ["issue", "vote", "workspace", "project", "actor", "actor_detail"]
+        fields = ["issue", "vote", "workspace_id", "project_id", "actor"]
        read_only_fields = fields


@@ -541,14 +624,16 @@ class IssueSerializer(BaseSerializer):
    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)
+    # List of issues blocked by this issue
+    blocked_issues = BlockedIssueSerializer(read_only=True, many=True)
+    # List of issues that block this issue
+    blocker_issues = BlockerIssueSerializer(read_only=True, 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)
-    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
+    issue_reactions = IssueReactionLiteSerializer(read_only=True, many=True)

    class Meta:
        model = Issue
@@ -574,7 +659,7 @@ class IssueLiteSerializer(BaseSerializer):
    module_id = serializers.UUIDField(read_only=True)
    attachment_count = serializers.IntegerField(read_only=True)
    link_count = serializers.IntegerField(read_only=True)
-    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
+    issue_reactions = IssueReactionLiteSerializer(read_only=True, many=True)

    class Meta:
        model = Issue
@@ -595,7 +680,7 @@ class IssueLiteSerializer(BaseSerializer):
 class IssuePublicSerializer(BaseSerializer):
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
    state_detail = StateLiteSerializer(read_only=True, source="state")
-    reactions = IssueReactionSerializer(read_only=True, many=True, source="issue_reactions")
+    reactions = IssueReactionLiteSerializer(read_only=True, many=True, source="issue_reactions")
    votes = IssueVoteSerializer(read_only=True, many=True)

    class Meta:
@@ -5,39 +5,10 @@ from rest_framework import serializers
 from .base import BaseSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import GlobalView, IssueView, IssueViewFavorite
+from plane.db.models import IssueView, IssueViewFavorite
 from plane.utils.issue_filters import issue_filters


-class GlobalViewSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
-
-    class Meta:
-        model = GlobalView
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "query",
-        ]
-
-    def create(self, validated_data):
-        query_params = validated_data.get("query_data", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
-        return GlobalView.objects.create(**validated_data)
-
-    def update(self, instance, validated_data):
-        query_params = validated_data.get("query_data", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
-        validated_data["query"] = issue_filters(query_params, "PATCH")
-        return super().update(instance, validated_data)
-
-
 class IssueViewSerializer(BaseSerializer):
    is_favorite = serializers.BooleanField(read_only=True)
    project_detail = ProjectLiteSerializer(source="project", read_only=True)
@@ -51,7 +51,6 @@ from plane.api.views import (
    WorkspaceUserProfileEndpoint,
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
-    LeaveWorkspaceEndpoint,
    ## End Workspaces
    # File Assets
    FileAssetEndpoint,
@@ -69,7 +68,6 @@ from plane.api.views import (
    UserProjectInvitationsViewset,
    ProjectIdentifierEndpoint,
    ProjectFavoritesViewSet,
-    LeaveProjectEndpoint,
    ## End Projects
    # Issues
    IssueViewSet,
@@ -90,9 +88,7 @@ from plane.api.views import (
    IssueSubscriberViewSet,
    IssueCommentPublicViewSet,
    IssueReactionViewSet,
-    IssueRelationViewSet,
    CommentReactionViewSet,
-    IssueDraftViewSet,
    ## End Issues
    # States
    StateViewSet,
@@ -102,8 +98,6 @@ from plane.api.views import (
    BulkEstimatePointEndpoint,
    ## End Estimates
    # Views
-    GlobalViewViewSet,
-    GlobalViewIssuesViewSet,
    IssueViewViewSet,
    ViewIssuesEndpoint,
    IssueViewFavoriteViewSet,
@@ -186,6 +180,7 @@ from plane.api.views import (
    ## Exporter
    ExportIssuesEndpoint,
    ## End Exporter
+
 )


@@ -242,11 +237,7 @@ urlpatterns = [
        UpdateUserTourCompletedEndpoint.as_view(),
        name="user-tour",
    ),
-    path(
-        "users/workspaces/<str:slug>/activities/",
-        UserActivityEndpoint.as_view(),
-        name="user-activities",
-    ),
+    path("users/workspaces/<str:slug>/activities/", UserActivityEndpoint.as_view(), name="user-activities"),
    # user workspaces
    path(
        "users/me/workspaces/",
@@ -450,11 +441,6 @@ urlpatterns = [
        WorkspaceLabelsEndpoint.as_view(),
        name="workspace-labels",
    ),
-    path(
-        "workspaces/<str:slug>/members/leave/",
-        LeaveWorkspaceEndpoint.as_view(),
-        name="workspace-labels",
-    ),
    ## End Workspaces ##
    # Projects
    path(
@@ -568,11 +554,6 @@ urlpatterns = [
        ),
        name="project",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/members/leave/",
-        LeaveProjectEndpoint.as_view(),
-        name="project",
-    ),
    # End Projects
    #  States
    path(
@@ -654,37 +635,6 @@ urlpatterns = [
        ViewIssuesEndpoint.as_view(),
        name="project-view-issues",
    ),
-    path(
-        "workspaces/<str:slug>/views/",
-        GlobalViewViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="global-view",
-    ),
-    path(
-        "workspaces/<str:slug>/views/<uuid:pk>/",
-        GlobalViewViewSet.as_view(
-            {
-                "get": "retrieve",
-                "put": "update",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="global-view",
-    ),
-    path(
-        "workspaces/<str:slug>/issues/",
-        GlobalViewIssuesViewSet.as_view(
-            {
-                "get": "list",
-            }
-        ),
-        name="global-view-issues",
-    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-views/",
        IssueViewFavoriteViewSet.as_view(
@@ -803,6 +753,11 @@ urlpatterns = [
        ),
        name="project-issue",
    ),
+    path(
+        "workspaces/<str:slug>/issues/",
+        WorkSpaceIssuesEndpoint.as_view(),
+        name="workspace-issue",
+    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-labels/",
        LabelViewSet.as_view(
@@ -1043,49 +998,6 @@ urlpatterns = [
        name="project-issue-archive",
    ),
    ## End Issue Archives
-    ## Issue Relation
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/",
-        IssueRelationViewSet.as_view(
-            {
-                "post": "create",
-            }
-        ),
-        name="issue-relation",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/<uuid:pk>/",
-        IssueRelationViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="issue-relation",
-    ),
-    ## End Issue Relation
-    ## Issue Drafts
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-drafts/",
-        IssueDraftViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-issue-draft",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-drafts/<uuid:pk>/",
-        IssueDraftViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-issue-draft",
-    ),
-    ## End Issue Drafts
    ## File Assets
    path(
        "workspaces/<str:slug>/file-assets/",
@@ -16,7 +16,6 @@ from .project import (
    ProjectDeployBoardPublicSettingsEndpoint,
    ProjectMemberEndpoint,
    WorkspaceProjectDeployBoardEndpoint,
-    LeaveProjectEndpoint,
 )
 from .user import (
    UserEndpoint,
@@ -53,10 +52,9 @@ from .workspace import (
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
    WorkspaceMembersEndpoint,
-    LeaveWorkspaceEndpoint,
 )
 from .state import StateViewSet
-from .view import GlobalViewViewSet, GlobalViewIssuesViewSet, IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
+from .view import IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
 from .cycle import (
    CycleViewSet,
    CycleIssueViewSet,
@@ -86,10 +84,8 @@ from .issue import (
    IssueReactionPublicViewSet,
    CommentReactionPublicViewSet,
    IssueVotePublicViewSet,
-    IssueRelationViewSet,
    IssueRetrievePublicEndpoint,
    ProjectIssuesPublicEndpoint,
-    IssueDraftViewSet,
 )

 from .auth_extended import (
@@ -169,4 +165,6 @@ from .analytic import (

 from .notification import NotificationViewSet, UnreadNotificationEndpoint, MarkAllReadNotificationViewSet

-from .exporter import ExportIssuesEndpoint
+from .exporter import (
+    ExportIssuesEndpoint,
+)
@@ -80,7 +80,6 @@ class CycleViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("pk", None)),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

        return super().perform_destroy(instance)
@@ -334,21 +333,13 @@ class CycleViewSet(BaseViewSet):
                workspace__slug=slug, project_id=project_id, pk=pk
            )

-            request_data = request.data
-
            if cycle.end_date is not None and cycle.end_date < timezone.now().date():
-                if "sort_order" in request_data:
-                    # Can only change sort order
-                    request_data = {
-                        "sort_order": request_data.get("sort_order", cycle.sort_order)
-                    }
-                else:
-                    return Response(
-                        {
-                            "error": "The Cycle has already been completed so it cannot be edited"
-                        },
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
+                return Response(
+                    {
+                        "error": "The Cycle has already been completed so it cannot be edited"
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
            if serializer.is_valid():
@@ -382,9 +373,7 @@ class CycleViewSet(BaseViewSet):
                .annotate(assignee_id=F("assignees__id"))
                .annotate(avatar=F("assignees__avatar"))
                .annotate(display_name=F("assignees__display_name"))
-                .values(
-                    "first_name", "last_name", "assignee_id", "avatar", "display_name"
-                )
+                .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
                .annotate(total_issues=Count("assignee_id"))
                .annotate(
                    completed_issues=Count(
@@ -488,7 +477,6 @@ class CycleIssueViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("pk", None)),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )
        return super().perform_destroy(instance)

@@ -519,7 +507,6 @@ class CycleIssueViewSet(BaseViewSet):
        try:
            order_by = request.GET.get("order_by", "created_at")
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
            filters = issue_filters(request.query_params, "GET")
            issues = (
                Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
@@ -558,15 +545,9 @@ class CycleIssueViewSet(BaseViewSet):

            issues_data = IssueStateSerializer(issues, many=True).data

-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if group_by:
                return Response(
-                    group_results(issues_data, group_by, sub_group_by),
+                    group_results(issues_data, group_by),
                    status=status.HTTP_200_OK,
                )

@@ -664,7 +645,6 @@ class CycleIssueViewSet(BaseViewSet):
                        ),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )

            # Return all Cycle Issues
@@ -729,6 +709,7 @@ class CycleDateCheckEndpoint(BaseAPIView):


 class CycleFavoriteViewSet(BaseViewSet):
+
    serializer_class = CycleFavoriteSerializer
    model = CycleFavorite

@@ -41,9 +41,9 @@ class GPTIntegrationEndpoint(BaseAPIView):
            final_text = task + "\n" + prompt

            openai.api_key = settings.OPENAI_API_KEY
-            response = openai.ChatCompletion.create(
+            response = openai.Completion.create(
                model=settings.GPT_ENGINE,
-                messages=[{"role": "user", "content": final_text}],
+                prompt=final_text,
                temperature=0.7,
                max_tokens=1024,
            )
@@ -51,7 +51,7 @@ class GPTIntegrationEndpoint(BaseAPIView):
            workspace = Workspace.objects.get(slug=slug)
            project = Project.objects.get(pk=project_id)

-            text = response.choices[0].message.content.strip()
+            text = response.choices[0].text.strip()
            text_html = text.replace("\n", "<br/>")
            return Response(
                {
@@ -213,7 +213,6 @@ class InboxIssueViewSet(BaseViewSet):
                issue_id=str(issue.id),
                project_id=str(project_id),
                current_instance=None,
-                epoch = int(timezone.now().timestamp())
            )
            # create an inbox issue
            InboxIssue.objects.create(
@@ -278,7 +277,6 @@ class InboxIssueViewSet(BaseViewSet):
                                IssueSerializer(current_instance).data,
                                cls=DjangoJSONEncoder,
                            ),
-                            epoch = int(timezone.now().timestamp())
                        )
                    issue_serializer.save()
                else:
@@ -520,7 +518,6 @@ class InboxIssuePublicViewSet(BaseViewSet):
                issue_id=str(issue.id),
                project_id=str(project_id),
                current_instance=None,
-                epoch = int(timezone.now().timestamp())
            )
            # create an inbox issue
            InboxIssue.objects.create(
@@ -585,7 +582,6 @@ class InboxIssuePublicViewSet(BaseViewSet):
                            IssueSerializer(current_instance).data,
                            cls=DjangoJSONEncoder,
                        ),
-                        epoch = int(timezone.now().timestamp())
                    )
                issue_serializer.save()
                return Response(issue_serializer.data, status=status.HTTP_200_OK)
@@ -4,7 +4,6 @@ import random
 from itertools import chain

 # Django imports
-from django.utils import timezone
 from django.db.models import (
    Prefetch,
    OuterRef,
@@ -18,14 +17,12 @@ from django.db.models import (
    When,
    Exists,
    Max,
-    IntegerField,
 )
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.db import IntegrityError
+from django.db.models.functions import Coalesce
 from django.conf import settings
-from django.db import IntegrityError

 # Third Party imports
 from rest_framework.response import Response
@@ -53,8 +50,6 @@ from plane.api.serializers import (
    IssueReactionSerializer,
    CommentReactionSerializer,
    IssueVoteSerializer,
-    IssueRelationSerializer,
-    RelatedIssueSerializer,
    IssuePublicSerializer,
 )
 from plane.api.permissions import (
@@ -80,7 +75,6 @@ from plane.db.models import (
    CommentReaction,
    ProjectDeployBoard,
    IssueVote,
-    IssueRelation,
    ProjectPublicMember,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -130,7 +124,6 @@ class IssueViewSet(BaseViewSet):
                current_instance=json.dumps(
                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
                ),
-                epoch  = int(timezone.now().timestamp())
            )

        return super().perform_update(serializer)
@@ -151,7 +144,6 @@ class IssueViewSet(BaseViewSet):
                current_instance=json.dumps(
                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
                ),
-                epoch = int(timezone.now().timestamp())
            )
        return super().perform_destroy(instance)

@@ -185,7 +177,7 @@ class IssueViewSet(BaseViewSet):
            filters = issue_filters(request.query_params, "GET")

            # Custom ordering for priority and state
-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            priority_order = ["urgent", "high", "medium", "low", None]
            state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

            order_by_param = request.GET.get("order_by", "-created_at")
@@ -273,16 +265,9 @@ class IssueViewSet(BaseViewSet):

            ## Grouping the results
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if group_by:
                return Response(
-                    group_results(issues, group_by, sub_group_by), status=status.HTTP_200_OK
+                    group_results(issues, group_by), status=status.HTTP_200_OK
                )

            return Response(issues, status=status.HTTP_200_OK)
@@ -318,7 +303,6 @@ class IssueViewSet(BaseViewSet):
                    issue_id=str(serializer.data.get("id", None)),
                    project_id=str(project_id),
                    current_instance=None,
-                    epoch = int(timezone.now().timestamp())
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -330,12 +314,7 @@ class IssueViewSet(BaseViewSet):

    def retrieve(self, request, slug, project_id, pk=None):
        try:
-            issue = Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            ).get(
+            issue = Issue.issue_objects.get(
                workspace__slug=slug, project_id=project_id, pk=pk
            )
            return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)
@@ -351,18 +330,14 @@ class UserWorkSpaceIssues(BaseAPIView):
        try:
            filters = issue_filters(request.query_params, "GET")
            # Custom ordering for priority and state
-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            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 = (
                Issue.issue_objects.filter(
-                    (
-                        Q(assignees__in=[request.user])
-                        | Q(created_by=request.user)
-                        | Q(issue_subscribers__subscriber=request.user)
-                    ),
+                    (Q(assignees__in=[request.user]) | Q(created_by=request.user) | Q(issue_subscribers__subscriber=request.user)),
                    workspace__slug=slug,
                )
                .annotate(
@@ -463,16 +438,9 @@ class UserWorkSpaceIssues(BaseAPIView):

            ## Grouping the results
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            
            if group_by:
                return Response(
-                    group_results(issues, group_by, sub_group_by), status=status.HTTP_200_OK
+                    group_results(issues, group_by), status=status.HTTP_200_OK
                )

            return Response(issues, status=status.HTTP_200_OK)
@@ -518,7 +486,7 @@ class IssueActivityEndpoint(BaseAPIView):
            issue_activities = (
                IssueActivity.objects.filter(issue_id=issue_id)
                .filter(
-                    ~Q(field__in=["comment", "vote", "reaction", "draft"]),
+                    ~Q(field__in=["comment", "vote", "reaction"]),
                    project__project_projectmember__member=self.request.user,
                )
                .select_related("actor", "workspace", "issue", "project")
@@ -577,7 +545,6 @@ class IssueCommentViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("issue_id")),
            project_id=str(self.kwargs.get("project_id")),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

    def perform_update(self, serializer):
@@ -596,7 +563,6 @@ class IssueCommentViewSet(BaseViewSet):
                    IssueCommentSerializer(current_instance).data,
                    cls=DjangoJSONEncoder,
                ),
-                epoch = int(timezone.now().timestamp())
            )

        return super().perform_update(serializer)
@@ -618,7 +584,6 @@ class IssueCommentViewSet(BaseViewSet):
                    IssueCommentSerializer(current_instance).data,
                    cls=DjangoJSONEncoder,
                ),
-                epoch = int(timezone.now().timestamp())
            )
        return super().perform_destroy(instance)

@@ -902,7 +867,6 @@ class IssueLinkViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("issue_id")),
            project_id=str(self.kwargs.get("project_id")),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

    def perform_update(self, serializer):
@@ -921,7 +885,6 @@ class IssueLinkViewSet(BaseViewSet):
                    IssueLinkSerializer(current_instance).data,
                    cls=DjangoJSONEncoder,
                ),
-                epoch = int(timezone.now().timestamp())
            )

        return super().perform_update(serializer)
@@ -943,7 +906,6 @@ class IssueLinkViewSet(BaseViewSet):
                    IssueLinkSerializer(current_instance).data,
                    cls=DjangoJSONEncoder,
                ),
-                epoch = int(timezone.now().timestamp())
            )
        return super().perform_destroy(instance)

@@ -1022,7 +984,6 @@ class IssueAttachmentEndpoint(BaseAPIView):
                        serializer.data,
                        cls=DjangoJSONEncoder,
                    ),
-                    epoch = int(timezone.now().timestamp())
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1045,7 +1006,6 @@ class IssueAttachmentEndpoint(BaseAPIView):
                issue_id=str(self.kwargs.get("issue_id", None)),
                project_id=str(self.kwargs.get("project_id", None)),
                current_instance=None,
-                epoch = int(timezone.now().timestamp())
            )

            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1103,7 +1063,7 @@ class IssueArchiveViewSet(BaseViewSet):
            show_sub_issues = request.GET.get("show_sub_issues", "true")

            # Custom ordering for priority and state
-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            priority_order = ["urgent", "high", "medium", "low", None]
            state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

            order_by_param = request.GET.get("order_by", "-created_at")
@@ -1248,7 +1208,6 @@ class IssueArchiveViewSet(BaseViewSet):
                issue_id=str(issue.id),
                project_id=str(project_id),
                current_instance=None,
-                epoch = int(timezone.now().timestamp())
            )

            return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)
@@ -1453,7 +1412,6 @@ class IssueReactionViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("issue_id", None)),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

    def destroy(self, request, slug, project_id, issue_id, reaction_code):
@@ -1477,7 +1435,6 @@ class IssueReactionViewSet(BaseViewSet):
                        "identifier": str(issue_reaction.id),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )
            issue_reaction.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1526,7 +1483,6 @@ class CommentReactionViewSet(BaseViewSet):
            issue_id=None,
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

    def destroy(self, request, slug, project_id, comment_id, reaction_code):
@@ -1551,7 +1507,6 @@ class CommentReactionViewSet(BaseViewSet):
                        "comment_id": str(comment_id),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )
            comment_reaction.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1590,35 +1545,32 @@ class IssueCommentPublicViewSet(BaseViewSet):
        return super(IssueCommentPublicViewSet, self).get_permissions()

    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.comments:
-                return self.filter_queryset(
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .filter(access="EXTERNAL")
-                    .select_related("project")
-                    .select_related("workspace")
-                    .select_related("issue")
-                    .annotate(
-                        is_member=Exists(
-                            ProjectMember.objects.filter(
-                                workspace__slug=self.kwargs.get("slug"),
-                                project_id=self.kwargs.get("project_id"),
-                                member_id=self.request.user.id,
-                            )
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=self.kwargs.get("slug"),
+            project_id=self.kwargs.get("project_id"),
+        )
+        if project_deploy_board.comments:
+            return self.filter_queryset(
+                super()
+                .get_queryset()
+                .filter(workspace__slug=self.kwargs.get("slug"))
+                .filter(issue_id=self.kwargs.get("issue_id"))
+                .filter(access="EXTERNAL")
+                .select_related("project")
+                .select_related("workspace")
+                .select_related("issue")
+                .annotate(
+                    is_member=Exists(
+                        ProjectMember.objects.filter(
+                            workspace__slug=self.kwargs.get("slug"),
+                            project_id=self.kwargs.get("project_id"),
+                            member_id=self.request.user.id,
                        )
                    )
-                    .distinct()
-                ).order_by("created_at")
-            else:
-                return IssueComment.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
+                )
+                .distinct()
+            )
+        else:
            return IssueComment.objects.none()

    def create(self, request, slug, project_id, issue_id):
@@ -1648,7 +1600,6 @@ class IssueCommentPublicViewSet(BaseViewSet):
                    issue_id=str(issue_id),
                    project_id=str(project_id),
                    current_instance=None,
-                    epoch = int(timezone.now().timestamp())
                )
                if not ProjectMember.objects.filter(
                    project_id=project_id,
@@ -1698,7 +1649,6 @@ class IssueCommentPublicViewSet(BaseViewSet):
                        IssueCommentSerializer(comment).data,
                        cls=DjangoJSONEncoder,
                    ),
-                    epoch = int(timezone.now().timestamp())
                )
                return Response(serializer.data, status=status.HTTP_200_OK)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1732,7 +1682,6 @@ class IssueCommentPublicViewSet(BaseViewSet):
                    IssueCommentSerializer(comment).data,
                    cls=DjangoJSONEncoder,
                ),
-                epoch = int(timezone.now().timestamp())
            )
            comment.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1754,24 +1703,21 @@ class IssueReactionPublicViewSet(BaseViewSet):
    model = IssueReaction

    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=self.kwargs.get("slug"),
+            project_id=self.kwargs.get("project_id"),
+        )
+        if project_deploy_board.reactions:
+            return (
+                super()
+                .get_queryset()
+                .filter(workspace__slug=self.kwargs.get("slug"))
+                .filter(project_id=self.kwargs.get("project_id"))
+                .filter(issue_id=self.kwargs.get("issue_id"))
+                .order_by("-created_at")
+                .distinct()
            )
-            if project_deploy_board.reactions:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .order_by("-created_at")
-                    .distinct()
-                )
-            else:
-                return IssueReaction.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
+        else:
            return IssueReaction.objects.none()

    def create(self, request, slug, project_id, issue_id):
@@ -1807,7 +1753,6 @@ class IssueReactionPublicViewSet(BaseViewSet):
                    issue_id=str(self.kwargs.get("issue_id", None)),
                    project_id=str(self.kwargs.get("project_id", None)),
                    current_instance=None,
-                    epoch = int(timezone.now().timestamp())
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1852,7 +1797,6 @@ class IssueReactionPublicViewSet(BaseViewSet):
                        "identifier": str(issue_reaction.id),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )
            issue_reaction.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1874,24 +1818,21 @@ class CommentReactionPublicViewSet(BaseViewSet):
    model = CommentReaction

    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=self.kwargs.get("slug"),
+            project_id=self.kwargs.get("project_id"),
+        )
+        if project_deploy_board.reactions:
+            return (
+                super()
+                .get_queryset()
+                .filter(workspace__slug=self.kwargs.get("slug"))
+                .filter(project_id=self.kwargs.get("project_id"))
+                .filter(comment_id=self.kwargs.get("comment_id"))
+                .order_by("-created_at")
+                .distinct()
            )
-            if project_deploy_board.reactions:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                    .filter(comment_id=self.kwargs.get("comment_id"))
-                    .order_by("-created_at")
-                    .distinct()
-                )
-            else:
-                return CommentReaction.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
+        else:
            return CommentReaction.objects.none()

    def create(self, request, slug, project_id, comment_id):
@@ -1926,7 +1867,6 @@ class CommentReactionPublicViewSet(BaseViewSet):
                    issue_id=None,
                    project_id=str(self.kwargs.get("project_id", None)),
                    current_instance=None,
-                    epoch = int(timezone.now().timestamp())
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1978,7 +1918,6 @@ class CommentReactionPublicViewSet(BaseViewSet):
                        "comment_id": str(comment_id),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )
            comment_reaction.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -2000,23 +1939,13 @@ class IssueVotePublicViewSet(BaseViewSet):
    serializer_class = IssueVoteSerializer

    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.votes:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                )
-            else:
-                return IssueVote.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
-            return IssueVote.objects.none()
+        return (
+            super()
+            .get_queryset()
+            .filter(issue_id=self.kwargs.get("issue_id"))
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+        )

    def create(self, request, slug, project_id, issue_id):
        try:
@@ -2042,14 +1971,9 @@ class IssueVotePublicViewSet(BaseViewSet):
                issue_id=str(self.kwargs.get("issue_id", None)),
                project_id=str(self.kwargs.get("project_id", None)),
                current_instance=None,
-                epoch = int(timezone.now().timestamp())
            )
            serializer = IssueVoteSerializer(issue_vote)
            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        except IntegrityError:
-            return Response(
-                {"error": "Reaction already exists"}, status=status.HTTP_400_BAD_REQUEST
-            )
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -2077,7 +2001,6 @@ class IssueVotePublicViewSet(BaseViewSet):
                        "identifier": str(issue_vote.id),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )
            issue_vote.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
@@ -2089,109 +2012,6 @@ class IssueVotePublicViewSet(BaseViewSet):
            )


-class IssueRelationViewSet(BaseViewSet):
-    serializer_class = IssueRelationSerializer
-    model = IssueRelation
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def perform_destroy(self, instance):
-        current_instance = (
-            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
-        )
-        if current_instance is not None:
-            issue_activity.delay(
-                type="issue_relation.activity.deleted",
-                requested_data=json.dumps({"related_list": None}),
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    IssueRelationSerializer(current_instance).data,
-                    cls=DjangoJSONEncoder,
-                ),
-                epoch = int(timezone.now().timestamp())
-            )
-        return super().perform_destroy(instance)
-
-    def create(self, request, slug, project_id, issue_id):
-        try:
-            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=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 related_issue in related_list
-                ],
-                batch_size=10,
-                ignore_conflicts=True,
-            )
-
-            issue_activity.delay(
-                type="issue_relation.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())
-            )
-            
-            if relation == "blocking":
-                return Response(
-                    RelatedIssueSerializer(issue_relation, many=True).data,
-                    status=status.HTTP_201_CREATED,
-                )
-            else:
-                return Response(
-                    IssueRelationSerializer(issue_relation, many=True).data,
-                    status=status.HTTP_201_CREATED,
-                )
-        except IntegrityError as e:
-            if "already exists" in str(e):
-                return Response(
-                    {"name": "The issue is already taken"},
-                    status=status.HTTP_410_GONE,
-                )
-            else:
-                capture_exception(e)
-                return Response(
-                    {"error": "Something went wrong please try again later"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(issue_id=self.kwargs.get("issue_id"))
-            .filter(project__project_projectmember__member=self.request.user)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("issue")
-            .distinct()
-        )
-
-
 class IssueRetrievePublicEndpoint(BaseAPIView):
    permission_classes = [
        AllowAny,
@@ -2230,7 +2050,7 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
            filters = issue_filters(request.query_params, "GET")

            # Custom ordering for priority and state
-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            priority_order = ["urgent", "high", "medium", "low", None]
            state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

            order_by_param = request.GET.get("order_by", "-created_at")
@@ -2252,12 +2072,6 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                        queryset=IssueReaction.objects.select_related("actor"),
                    )
                )
-                .prefetch_related(
-                    Prefetch(
-                        "votes",
-                        queryset=IssueVote.objects.select_related("actor"),
-                    )
-                )
                .filter(**filters)
                .annotate(cycle_id=F("issue_cycle__cycle_id"))
                .annotate(module_id=F("issue_module__module_id"))
@@ -2337,33 +2151,9 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):

            issues = IssuePublicSerializer(issue_queryset, many=True).data

-            state_group_order = [
-                "backlog",
-                "unstarted",
-                "started",
-                "completed",
-                "cancelled",
-            ]
-
-            states = (
-                State.objects.filter(
-                    ~Q(name="Triage"),
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .annotate(
-                    custom_order=Case(
-                        *[
-                            When(group=value, then=Value(index))
-                            for index, value in enumerate(state_group_order)
-                        ],
-                        default=Value(len(state_group_order)),
-                        output_field=IntegerField(),
-                    ),
-                )
-                .values("name", "group", "color", "id")
-                .order_by("custom_order", "sequence")
-            )
+            states = State.objects.filter(
+                workspace__slug=slug, project_id=project_id
+            ).values("name", "group", "color", "id")

            labels = Label.objects.filter(
                workspace__slug=slug, project_id=project_id
@@ -2392,235 +2182,3 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-
-
-class IssueDraftViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-    serializer_class = IssueFlatSerializer
-    model = Issue
-
-
-    def perform_update(self, serializer):
-        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        current_instance = (
-            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
-        )
-        if current_instance is not None:
-            issue_activity.delay(
-                type="issue_draft.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("pk", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
-                ),
-                epoch  = int(timezone.now().timestamp())
-            )
-
-        return super().perform_update(serializer)
-    
-
-    def perform_destroy(self, instance):
-        current_instance = (
-            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
-        )
-        if current_instance is not None:
-            issue_activity.delay(
-                type="issue_draft.activity.deleted",
-                requested_data=json.dumps(
-                    {"issue_id": str(self.kwargs.get("pk", None))}
-                ),
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("pk", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
-                ),
-            )
-        return super().perform_destroy(instance)
-
-
-    def get_queryset(self):
-        return (
-            Issue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(is_draft=True)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-        )
-
-
-    @method_decorator(gzip_page)
-    def list(self, request, slug, project_id):
-        try:
-            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(
-                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    attachment_count=IssueAttachment.objects.filter(
-                        issue=OuterRef("id")
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-            )
-
-            # Priority Ordering
-            if order_by_param == "priority" or order_by_param == "-priority":
-                priority_order = (
-                    priority_order
-                    if order_by_param == "priority"
-                    else priority_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    priority_order=Case(
-                        *[
-                            When(priority=p, then=Value(i))
-                            for i, p in enumerate(priority_order)
-                        ],
-                        output_field=CharField(),
-                    )
-                ).order_by("priority_order")
-
-            # State Ordering
-            elif order_by_param in [
-                "state__name",
-                "state__group",
-                "-state__name",
-                "-state__group",
-            ]:
-                state_order = (
-                    state_order
-                    if order_by_param in ["state__name", "state__group"]
-                    else state_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    state_order=Case(
-                        *[
-                            When(state__group=state_group, then=Value(i))
-                            for i, state_group in enumerate(state_order)
-                        ],
-                        default=Value(len(state_order)),
-                        output_field=CharField(),
-                    )
-                ).order_by("state_order")
-            # assignee and label ordering
-            elif order_by_param in [
-                "labels__name",
-                "-labels__name",
-                "assignees__first_name",
-                "-assignees__first_name",
-            ]:
-                issue_queryset = issue_queryset.annotate(
-                    max_values=Max(
-                        order_by_param[1::]
-                        if order_by_param.startswith("-")
-                        else order_by_param
-                    )
-                ).order_by(
-                    "-max_values" if order_by_param.startswith("-") else "max_values"
-                )
-            else:
-                issue_queryset = issue_queryset.order_by(order_by_param)
-
-            issues = IssueLiteSerializer(issue_queryset, many=True).data
-
-            ## Grouping the results
-            group_by = request.GET.get("group_by", False)
-            if group_by:
-                return Response(
-                    group_results(issues, group_by), status=status.HTTP_200_OK
-                )
-
-            return Response(issues, status=status.HTTP_200_OK)
-
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-    def create(self, request, slug, project_id):
-        try:
-            project = Project.objects.get(pk=project_id)
-
-            serializer = IssueCreateSerializer(
-                data=request.data,
-                context={
-                    "project_id": project_id,
-                    "workspace_id": project.workspace_id,
-                    "default_assignee_id": project.default_assignee_id,
-                },
-            )
-
-            if serializer.is_valid():
-                serializer.save(is_draft=True)
-
-                # Track the issue
-                issue_activity.delay(
-                    type="issue_draft.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())
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        except Project.DoesNotExist:
-            return Response(
-                {"error": "Project was not found"}, status=status.HTTP_404_NOT_FOUND
-            )
-
-
-    def retrieve(self, request, slug, project_id, pk=None):
-        try:
-            issue = Issue.objects.get(
-                workspace__slug=slug, project_id=project_id, pk=pk, is_draft=True
-            )
-            return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)
-        except Issue.DoesNotExist:
-            return Response(
-                {"error": "Issue Does not exist"}, status=status.HTTP_404_NOT_FOUND
-            )
-    
@@ -2,7 +2,6 @@
 import json

 # Django Imports
-from django.utils import timezone
 from django.db import IntegrityError
 from django.db.models import Prefetch, F, OuterRef, Func, Exists, Count, Q
 from django.core import serializers
@@ -130,7 +129,6 @@ class ModuleViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("pk", None)),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )

        return super().perform_destroy(instance)
@@ -279,7 +277,6 @@ class ModuleIssueViewSet(BaseViewSet):
            issue_id=str(self.kwargs.get("pk", None)),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
-            epoch = int(timezone.now().timestamp())
        )
        return super().perform_destroy(instance)

@@ -311,7 +308,6 @@ class ModuleIssueViewSet(BaseViewSet):
        try:
            order_by = request.GET.get("order_by", "created_at")
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
            filters = issue_filters(request.query_params, "GET")
            issues = (
                Issue.issue_objects.filter(issue_module__module_id=module_id)
@@ -350,15 +346,9 @@ class ModuleIssueViewSet(BaseViewSet):

            issues_data = IssueStateSerializer(issues, many=True).data

-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if group_by:
                return Response(
-                    group_results(issues_data, group_by, sub_group_by),
+                    group_results(issues_data, group_by),
                    status=status.HTTP_200_OK,
                )

@@ -447,7 +437,6 @@ class ModuleIssueViewSet(BaseViewSet):
                        ),
                    }
                ),
-                epoch = int(timezone.now().timestamp())
            )

            return Response(
@@ -11,8 +11,14 @@ from django.db.models import (
    OuterRef,
    Func,
    F,
+    Max,
+    CharField,
    Func,
    Subquery,
+    Prefetch,
+    When,
+    Case,
+    Value,
 )
 from django.core.validators import validate_email
 from django.conf import settings
@@ -41,7 +47,6 @@ from plane.api.permissions import (
    ProjectBasePermission,
    ProjectEntityPermission,
    ProjectMemberPermission,
-    ProjectLitePermission,
 )

 from plane.db.models import (
@@ -66,9 +71,16 @@ from plane.db.models import (
    ModuleMember,
    Inbox,
    ProjectDeployBoard,
+    Issue,
+    IssueReaction,
+    IssueLink,
+    IssueAttachment,
+    Label,
 )

 from plane.bgtasks.project_invitation_task import project_invitation
+from plane.utils.grouper import group_results
+from plane.utils.issue_filters import issue_filters


 class ProjectViewSet(BaseViewSet):
@@ -482,7 +494,7 @@ class UserProjectInvitationsViewset(BaseViewSet):
            # Delete joined project invites
            project_invitations.delete()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -617,7 +629,7 @@ class ProjectMemberViewSet(BaseViewSet):
            return Response(status=status.HTTP_204_NO_CONTENT)
        except ProjectMember.DoesNotExist:
            return Response(
-                {"error": "Project Member does not exist"}, status=status.HTTP_400_BAD_REQUEST
+                {"error": "Project Member does not exist"}, status=status.HTTP_400
            )
        except Exception as e:
            capture_exception(e)
@@ -924,7 +936,8 @@ class ProjectUserViewsEndpoint(BaseAPIView):

            project_member.save()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
+
        except Project.DoesNotExist:
            return Response(
                {"error": "The requested resource does not exists"},
@@ -1131,9 +1144,8 @@ class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):


 class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
+
+    permission_classes = [AllowAny,]

    def get(self, request, slug):
        try:
@@ -1164,48 +1176,3 @@ class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-
-
-class LeaveProjectEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def delete(self, request, slug, project_id):
-        try:
-            project_member = ProjectMember.objects.get(
-                workspace__slug=slug,
-                member=request.user,
-                project_id=project_id,
-            )
-
-            # Only Admin case
-            if (
-                project_member.role == 20
-                and ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    role=20,
-                    project_id=project_id,
-                ).count()
-                == 1
-            ):
-                return Response(
-                    {
-                        "error": "You cannot leave the project since you are the only admin of the project you should delete the project"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            # Delete the member from workspace
-            project_member.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except ProjectMember.DoesNotExist:
-            return Response(
-                {"error": "Workspace member does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
@@ -220,7 +220,7 @@ class IssueSearchEndpoint(BaseAPIView):
            query = request.query_params.get("search", False)
            workspace_search = request.query_params.get("workspace_search", "false")
            parent = request.query_params.get("parent", "false")
-            issue_relation = request.query_params.get("issue_relation", "false")
+            blocker_blocked_by = request.query_params.get("blocker_blocked_by", "false")
            cycle = request.query_params.get("cycle", "false")
            module = request.query_params.get("module", "false")
            sub_issue = request.query_params.get("sub_issue", "false")
@@ -247,12 +247,12 @@ class IssueSearchEndpoint(BaseAPIView):
                        "parent_id", flat=True
                    )
                )
-            if issue_relation == "true" and issue_id:
+            if blocker_blocked_by == "true" and issue_id:
                issue = Issue.issue_objects.get(pk=issue_id)
                issues = issues.filter(
                    ~Q(pk=issue_id),
-                    ~Q(issue_related__issue=issue),
-                    ~Q(issue_relation__related_issue=issue),
+                    ~Q(blocked_issues__block=issue),
+                    ~Q(blocker_issues__blocked_by=issue),
                )
            if sub_issue == "true" and issue_id:
                issue = Issue.issue_objects.get(pk=issue_id)
@@ -1,18 +1,4 @@
 # Django imports
-from django.db.models import (
-    Prefetch,
-    OuterRef,
-    Func,
-    F,
-    Case,
-    Value,
-    CharField,
-    When,
-    Exists,
-    Max,
-)
-from django.utils.decorators import method_decorator
-from django.views.decorators.gzip import gzip_page
 from django.db import IntegrityError
 from django.db.models import Prefetch, OuterRef, Exists

@@ -24,192 +10,18 @@ from sentry_sdk import capture_exception
 # Module imports
 from . import BaseViewSet, BaseAPIView
 from plane.api.serializers import (
-    GlobalViewSerializer,
    IssueViewSerializer,
    IssueLiteSerializer,
    IssueViewFavoriteSerializer,
 )
-from plane.api.permissions import WorkspaceEntityPermission, ProjectEntityPermission
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import (
-    Workspace,
-    GlobalView,
    IssueView,
    Issue,
    IssueViewFavorite,
    IssueReaction,
-    IssueLink,
-    IssueAttachment,
 )
 from plane.utils.issue_filters import issue_filters
-from plane.utils.grouper import group_results
-
-
-class GlobalViewViewSet(BaseViewSet):
-    serializer_class = GlobalViewSerializer
-    model = GlobalView
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def perform_create(self, serializer):
-        workspace = Workspace.objects.get(slug=self.kwargs.get("slug"))
-        serializer.save(workspace_id=workspace.id)
-
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("workspace")
-            .order_by("-created_at")
-            .distinct()
-        )
-
-
-class GlobalViewIssuesViewSet(BaseViewSet):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get_queryset(self):
-        return (
-            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-        )
-
-        
-    @method_decorator(gzip_page)
-    def list(self, request, slug):
-        try:
-            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)
-                .filter(project__project_projectmember__member=self.request.user)
-                .annotate(cycle_id=F("issue_cycle__cycle_id"))
-                .annotate(module_id=F("issue_module__module_id"))
-                .annotate(
-                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    attachment_count=IssueAttachment.objects.filter(
-                        issue=OuterRef("id")
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-            )
-
-            # Priority Ordering
-            if order_by_param == "priority" or order_by_param == "-priority":
-                priority_order = (
-                    priority_order
-                    if order_by_param == "priority"
-                    else priority_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    priority_order=Case(
-                        *[
-                            When(priority=p, then=Value(i))
-                            for i, p in enumerate(priority_order)
-                        ],
-                        output_field=CharField(),
-                    )
-                ).order_by("priority_order")
-
-            # State Ordering
-            elif order_by_param in [
-                "state__name",
-                "state__group",
-                "-state__name",
-                "-state__group",
-            ]:
-                state_order = (
-                    state_order
-                    if order_by_param in ["state__name", "state__group"]
-                    else state_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    state_order=Case(
-                        *[
-                            When(state__group=state_group, then=Value(i))
-                            for i, state_group in enumerate(state_order)
-                        ],
-                        default=Value(len(state_order)),
-                        output_field=CharField(),
-                    )
-                ).order_by("state_order")
-            # assignee and label ordering
-            elif order_by_param in [
-                "labels__name",
-                "-labels__name",
-                "assignees__first_name",
-                "-assignees__first_name",
-            ]:
-                issue_queryset = issue_queryset.annotate(
-                    max_values=Max(
-                        order_by_param[1::]
-                        if order_by_param.startswith("-")
-                        else order_by_param
-                    )
-                ).order_by(
-                    "-max_values" if order_by_param.startswith("-") else "max_values"
-                )
-            else:
-                issue_queryset = issue_queryset.order_by(order_by_param)
-
-            issues = IssueLiteSerializer(issue_queryset, many=True).data
-
-            ## Grouping the results
-            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            
-            if group_by:
-                return Response(
-                    group_results(issues, group_by, sub_group_by), status=status.HTTP_200_OK
-                )
-
-            return Response(issues, status=status.HTTP_200_OK)
-
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )


 class IssueViewViewSet(BaseViewSet):
@@ -116,7 +116,7 @@ class WorkSpaceViewSet(BaseViewSet):
        )

        issue_count = (
-            Issue.issue_objects.filter(workspace=OuterRef("id"))
+            Issue.objects.filter(workspace=OuterRef("id"))
            .order_by()
            .annotate(count=Func(F("id"), function="Count"))
            .values("count")
@@ -203,7 +203,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
            )

            issue_count = (
-                Issue.issue_objects.filter(workspace=OuterRef("id"))
+                Issue.objects.filter(workspace=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -532,7 +532,7 @@ class UserWorkspaceInvitationsEndpoint(BaseViewSet):
            # Delete joined workspace invites
            workspace_invitations.delete()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -846,7 +846,7 @@ class WorkspaceMemberUserViewsEndpoint(BaseAPIView):
            workspace_member.view_props = request.data.get("view_props", {})
            workspace_member.save()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except WorkspaceMember.DoesNotExist:
            return Response(
                {"error": "User not a member of workspace"},
@@ -1072,10 +1072,10 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                .order_by("state_group")
            )

-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            priority_order = ["urgent", "high", "medium", "low", None]

            priority_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                    workspace__slug=slug,
                    assignees__in=[user_id],
                    project__project_projectmember__member=request.user,
@@ -1473,44 +1473,3 @@ class WorkspaceMembersEndpoint(BaseAPIView):
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-
-
-class LeaveWorkspaceEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def delete(self, request, slug):
-        try:
-            workspace_member = WorkspaceMember.objects.get(
-                workspace__slug=slug, member=request.user
-            )
-
-            # Only Admin case
-            if (
-                workspace_member.role == 20
-                and WorkspaceMember.objects.filter(
-                    workspace__slug=slug, role=20
-                ).count()
-                == 1
-            ):
-                return Response(
-                    {
-                        "error": "You cannot leave the workspace since you are the only admin of the workspace you should delete the workspace"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            # Delete the member from workspace
-            workspace_member.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except WorkspaceMember.DoesNotExist:
-            return Response(
-                {"error": "Workspace member does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
@@ -39,7 +39,6 @@ def track_name(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("name") != requested_data.get("name"):
        issue_activities.append(
@@ -53,7 +52,6 @@ def track_name(
                project=project,
                workspace=project.workspace,
                comment=f"updated the name to {requested_data.get('name')}",
-                epoch=epoch,
            )
        )

@@ -66,7 +64,6 @@ def track_parent(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("parent") != requested_data.get("parent"):
        if requested_data.get("parent") == None:
@@ -84,7 +81,6 @@ def track_parent(
                    comment=f"updated the parent issue to None",
                    old_identifier=old_parent.id,
                    new_identifier=None,
-                    epoch=epoch,
                )
            )
        else:
@@ -105,7 +101,6 @@ def track_parent(
                    comment=f"updated the parent issue to {new_parent.name}",
                    old_identifier=old_parent.id if old_parent is not None else None,
                    new_identifier=new_parent.id,
-                    epoch=epoch,
                )
            )

@@ -118,7 +113,6 @@ def track_priority(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("priority") != requested_data.get("priority"):
        if requested_data.get("priority") == None:
@@ -133,7 +127,6 @@ def track_priority(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the priority to None",
-                    epoch=epoch,
                )
            )
        else:
@@ -148,7 +141,6 @@ def track_priority(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the priority to {requested_data.get('priority')}",
-                    epoch=epoch,
                )
            )

@@ -161,7 +153,6 @@ def track_state(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("state") != requested_data.get("state"):
        new_state = State.objects.get(pk=requested_data.get("state", None))
@@ -180,7 +171,6 @@ def track_state(
                comment=f"updated the state to {new_state.name}",
                old_identifier=old_state.id,
                new_identifier=new_state.id,
-                epoch=epoch,
            )
        )

@@ -193,7 +183,6 @@ def track_description(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("description_html") != requested_data.get(
        "description_html"
@@ -214,7 +203,6 @@ def track_description(
                        project=project,
                        workspace=project.workspace,
                        comment=f"updated the description to {requested_data.get('description_html')}",
-                        epoch=epoch,
                    )
                )

@@ -227,7 +215,6 @@ def track_target_date(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("target_date") != requested_data.get("target_date"):
        if requested_data.get("target_date") == None:
@@ -242,7 +229,6 @@ def track_target_date(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the target date to None",
-                    epoch=epoch,
                )
            )
        else:
@@ -257,7 +243,6 @@ def track_target_date(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the target date to {requested_data.get('target_date')}",
-                    epoch=epoch,
                )
            )

@@ -270,7 +255,6 @@ def track_start_date(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    if current_instance.get("start_date") != requested_data.get("start_date"):
        if requested_data.get("start_date") == None:
@@ -285,7 +269,6 @@ def track_start_date(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the start date to None",
-                    epoch=epoch,
                )
            )
        else:
@@ -300,7 +283,6 @@ def track_start_date(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the start date to {requested_data.get('start_date')}",
-                    epoch=epoch,
                )
            )

@@ -313,7 +295,6 @@ def track_labels(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    # Label Addition
    if len(requested_data.get("labels_list")) > len(current_instance.get("labels")):
@@ -333,7 +314,6 @@ def track_labels(
                        comment=f"added label {label.name}",
                        new_identifier=label.id,
                        old_identifier=None,
-                        epoch=epoch,
                    )
                )

@@ -355,7 +335,6 @@ def track_labels(
                        comment=f"removed label {label.name}",
                        old_identifier=label.id,
                        new_identifier=None,
-                        epoch=epoch,
                    )
                )

@@ -368,7 +347,6 @@ def track_assignees(
    project,
    actor,
    issue_activities,
-    epoch
 ):
    # Assignee Addition
    if len(requested_data.get("assignees_list")) > len(
@@ -389,7 +367,6 @@ def track_assignees(
                        workspace=project.workspace,
                        comment=f"added assignee {assignee.display_name}",
                        new_identifier=assignee.id,
-                        epoch=epoch,
                    )
                )

@@ -412,29 +389,151 @@ def track_assignees(
                        workspace=project.workspace,
                        comment=f"removed assignee {assignee.display_name}",
                        old_identifier=assignee.id,
-                        epoch=epoch,
+                    )
+                )
+
+
+# Track changes in blocking issues
+def track_blocks(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    if len(requested_data.get("blocks_list")) > len(
+        current_instance.get("blocked_issues")
+    ):
+        for block in requested_data.get("blocks_list"):
+            if (
+                len(
+                    [
+                        blocked
+                        for blocked in current_instance.get("blocked_issues")
+                        if blocked.get("block") == block
+                    ]
+                )
+                == 0
+            ):
+                issue = Issue.objects.get(pk=block)
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value="",
+                        new_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        field="blocks",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"added blocking issue {project.identifier}-{issue.sequence_id}",
+                        new_identifier=issue.id,
+                    )
+                )
+
+    # Blocked Issue Removal
+    if len(requested_data.get("blocks_list")) < len(
+        current_instance.get("blocked_issues")
+    ):
+        for blocked in current_instance.get("blocked_issues"):
+            if blocked.get("block") not in requested_data.get("blocks_list"):
+                issue = Issue.objects.get(pk=blocked.get("block"))
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        new_value="",
+                        field="blocks",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"removed blocking issue {project.identifier}-{issue.sequence_id}",
+                        old_identifier=issue.id,
+                    )
+                )
+
+
+# Track changes in blocked_by issues
+def track_blockings(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    if len(requested_data.get("blockers_list")) > len(
+        current_instance.get("blocker_issues")
+    ):
+        for block in requested_data.get("blockers_list"):
+            if (
+                len(
+                    [
+                        blocked
+                        for blocked in current_instance.get("blocker_issues")
+                        if blocked.get("blocked_by") == block
+                    ]
+                )
+                == 0
+            ):
+                issue = Issue.objects.get(pk=block)
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value="",
+                        new_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        field="blocking",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"added blocked by issue {project.identifier}-{issue.sequence_id}",
+                        new_identifier=issue.id,
+                    )
+                )
+
+    # Blocked Issue Removal
+    if len(requested_data.get("blockers_list")) < len(
+        current_instance.get("blocker_issues")
+    ):
+        for blocked in current_instance.get("blocker_issues"):
+            if blocked.get("blocked_by") not in requested_data.get("blockers_list"):
+                issue = Issue.objects.get(pk=blocked.get("blocked_by"))
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        new_value="",
+                        field="blocking",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"removed blocked by issue {project.identifier}-{issue.sequence_id}",
+                        old_identifier=issue.id,
                    )
                )


 def create_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                project=project,
-                workspace=project.workspace,
-                comment=f"created the issue",
-                verb="created",
-                actor=actor,
-                epoch=epoch,
-            )
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"created the issue",
+            verb="created",
+            actor=actor,
        )
+    )


 def track_estimate_points(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    if current_instance.get("estimate_point") != requested_data.get("estimate_point"):
        if requested_data.get("estimate_point") == None:
@@ -449,7 +548,6 @@ def track_estimate_points(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the estimate point to None",
-                    epoch=epoch,
                )
            )
        else:
@@ -464,13 +562,12 @@ def track_estimate_points(
                    project=project,
                    workspace=project.workspace,
                    comment=f"updated the estimate point to {requested_data.get('estimate_point')}",
-                    epoch=epoch,
                )
            )


 def track_archive_at(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    if requested_data.get("archived_at") is None:
        issue_activities.append(
@@ -484,7 +581,6 @@ def track_archive_at(
                field="archived_at",
                old_value="archive",
                new_value="restore",
-                epoch=epoch,
            )
        )
    else:
@@ -499,13 +595,12 @@ def track_archive_at(
                field="archived_at",
                old_value=None,
                new_value="archive",
-                epoch=epoch,
            )
        )


 def track_closed_to(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    if requested_data.get("closed_to") is not None:
        updated_state = State.objects.get(
@@ -525,13 +620,12 @@ def track_closed_to(
                comment=f"Plane updated the state to {updated_state.name}",
                old_identifier=None,
                new_identifier=updated_state.id,
-                epoch=epoch,
            )
        )


 def update_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    ISSUE_ACTIVITY_MAPPER = {
        "name": track_name,
@@ -543,6 +637,8 @@ def update_issue_activity(
        "start_date": track_start_date,
        "labels_list": track_labels,
        "assignees_list": track_assignees,
+        "blocks_list": track_blocks,
+        "blockers_list": track_blockings,
        "estimate_point": track_estimate_points,
        "archived_at": track_archive_at,
        "closed_to": track_closed_to,
@@ -563,12 +659,11 @@ def update_issue_activity(
                project,
                actor,
                issue_activities,
-                epoch
            )


 def delete_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    issue_activities.append(
        IssueActivity(
@@ -578,13 +673,12 @@ def delete_issue_activity(
            verb="deleted",
            actor=actor,
            field="issue",
-            epoch=epoch,
        )
    )


 def create_comment_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -603,13 +697,12 @@ def create_comment_activity(
            new_value=requested_data.get("comment_html", ""),
            new_identifier=requested_data.get("id", None),
            issue_comment_id=requested_data.get("id", None),
-            epoch=epoch,
        )
    )


 def update_comment_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -631,13 +724,12 @@ def update_comment_activity(
                new_value=requested_data.get("comment_html", ""),
                new_identifier=current_instance.get("id", None),
                issue_comment_id=current_instance.get("id", None),
-                epoch=epoch,
            )
        )


 def delete_comment_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    issue_activities.append(
        IssueActivity(
@@ -648,13 +740,12 @@ def delete_comment_activity(
            verb="deleted",
            actor=actor,
            field="comment",
-            epoch=epoch,
        )
    )


 def create_cycle_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -686,7 +777,6 @@ def create_cycle_issue_activity(
                comment=f"updated cycle from {old_cycle.name} to {new_cycle.name}",
                old_identifier=old_cycle.id,
                new_identifier=new_cycle.id,
-                epoch=epoch,
            )
        )

@@ -707,13 +797,12 @@ def create_cycle_issue_activity(
                workspace=project.workspace,
                comment=f"added cycle {cycle.name}",
                new_identifier=cycle.id,
-                epoch=epoch,
            )
        )


 def delete_cycle_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -737,13 +826,12 @@ def delete_cycle_issue_activity(
                workspace=project.workspace,
                comment=f"removed this issue from {cycle.name if cycle is not None else None}",
                old_identifier=cycle.id if cycle is not None else None,
-                epoch=epoch,
            )
        )


 def create_module_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -775,7 +863,6 @@ def create_module_issue_activity(
                comment=f"updated module from {old_module.name} to {new_module.name}",
                old_identifier=old_module.id,
                new_identifier=new_module.id,
-                epoch=epoch,
            )
        )

@@ -795,13 +882,12 @@ def create_module_issue_activity(
                workspace=project.workspace,
                comment=f"added module {module.name}",
                new_identifier=module.id,
-                epoch=epoch,
            )
        )


 def delete_module_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -825,13 +911,12 @@ def delete_module_issue_activity(
                workspace=project.workspace,
                comment=f"removed this issue from {module.name if module is not None else None}",
                old_identifier=module.id if module is not None else None,
-                epoch=epoch,
            )
        )


 def create_link_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -849,13 +934,12 @@ def create_link_activity(
            field="link",
            new_value=requested_data.get("url", ""),
            new_identifier=requested_data.get("id", None),
-            epoch=epoch,
        )
    )


 def update_link_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -876,13 +960,12 @@ def update_link_activity(
                old_identifier=current_instance.get("id"),
                new_value=requested_data.get("url", ""),
                new_identifier=current_instance.get("id", None),
-                epoch=epoch,
            )
        )


 def delete_link_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):

    current_instance = (
@@ -899,14 +982,13 @@ def delete_link_activity(
            actor=actor,
            field="link",
            old_value=current_instance.get("url", ""),
-            new_value="",
-            epoch=epoch,
+            new_value=""
        )
    )


 def create_attachment_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    current_instance = (
@@ -924,13 +1006,12 @@ def create_attachment_activity(
            field="attachment",
            new_value=current_instance.get("asset", ""),
            new_identifier=current_instance.get("id", None),
-            epoch=epoch,
        )
    )


 def delete_attachment_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    issue_activities.append(
        IssueActivity(
@@ -941,12 +1022,11 @@ def delete_attachment_activity(
            verb="deleted",
            actor=actor,
            field="attachment",
-            epoch=epoch,
        )
    )

 def create_issue_reaction_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    if requested_data and requested_data.get("reaction") is not None:
@@ -965,13 +1045,12 @@ def create_issue_reaction_activity(
                    comment="added the reaction",
                    old_identifier=None,
                    new_identifier=issue_reaction,
-                    epoch=epoch,
                )
            )


 def delete_issue_reaction_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+        requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    current_instance = (
        json.loads(current_instance) if current_instance is not None else None
@@ -990,13 +1069,12 @@ def delete_issue_reaction_activity(
                comment="removed the reaction",
                old_identifier=current_instance.get("identifier"),
                new_identifier=None,
-                epoch=epoch,
            )
        )


 def create_comment_reaction_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    if requested_data and requested_data.get("reaction") is not None:
@@ -1016,13 +1094,12 @@ def create_comment_reaction_activity(
                    comment="added the reaction",
                    old_identifier=None,
                    new_identifier=comment_reaction_id,
-                    epoch=epoch,
                )
            )


 def delete_comment_reaction_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+        requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    current_instance = (
        json.loads(current_instance) if current_instance is not None else None
@@ -1043,13 +1120,12 @@ def delete_comment_reaction_activity(
                    comment="removed the reaction",
                    old_identifier=current_instance.get("identifier"),
                    new_identifier=None,
-                    epoch=epoch,
                )
            )


 def create_issue_vote_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    requested_data = json.loads(requested_data) if requested_data is not None else None
    if requested_data and requested_data.get("vote") is not None:
@@ -1066,13 +1142,12 @@ def create_issue_vote_activity(
                comment="added the vote",
                old_identifier=None,
                new_identifier=None,
-                epoch=epoch,
            )
        )


 def delete_issue_vote_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
+        requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
    current_instance = (
        json.loads(current_instance) if current_instance is not None else None
@@ -1091,170 +1166,10 @@ def delete_issue_vote_activity(
                comment="removed the vote",
                old_identifier=current_instance.get("identifier"),
                new_identifier=None,
-                epoch=epoch,
            )
        )


-def create_issue_relation_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    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_relation.get("related_issue"),
-                    actor=actor,
-                    verb="created",
-                    old_value="",
-                    new_value=f"{project.identifier}-{issue.sequence_id}",
-                    field=relation_type,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'added {relation_type} relation',
-                    old_identifier=issue_relation.get("issue"),
-                )
-            )
-            issue = Issue.objects.get(pk=issue_relation.get("related_issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_relation.get("issue"),
-                    actor=actor,
-                    verb="created",
-                    old_value="",
-                    new_value=f"{project.identifier}-{issue.sequence_id}",
-                    field=f'{issue_relation.get("relation_type")}',
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'added {issue_relation.get("relation_type")} relation',
-                    old_identifier=issue_relation.get("related_issue"),
-                    epoch=epoch,
-                )
-            )
-
-
-def delete_issue_relation_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    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=actor,
-                    verb="deleted",
-                    old_value=f"{project.identifier}-{issue.sequence_id}",
-                    new_value="",
-                    field=relation_type,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'deleted {relation_type} relation',
-                    old_identifier=current_instance.get("issue"),
-                    epoch=epoch,
-                )
-            )
-            issue = Issue.objects.get(pk=current_instance.get("related_issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=current_instance.get("issue"),
-                    actor=actor,
-                    verb="deleted",
-                    old_value=f"{project.identifier}-{issue.sequence_id}",
-                    new_value="",
-                    field=f'{current_instance.get("relation_type")}',
-                    project=project,
-                    workspace=project.workspace,
-                    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, current_instance, issue_id, project, actor, issue_activities, epoch
-):
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                project=project,
-                workspace=project.workspace,
-                comment=f"drafted the issue",
-                field="draft",
-                verb="created",
-                actor=actor,
-                epoch=epoch,
-            )
-        )
-
-
-def update_draft_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
-):
-        requested_data = json.loads(requested_data) if requested_data is not None else None
-        current_instance = (
-            json.loads(current_instance) if current_instance is not None else None
-        )
-        if requested_data.get("is_draft") is not None and requested_data.get("is_draft") == False:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f"created the issue",
-                    verb="updated",
-                    actor=actor,
-                    epoch=epoch,
-                )
-            )
-        else:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f"updated the draft issue",
-                    field="draft",
-                    verb="updated",
-                    actor=actor,
-                    epoch=epoch,
-                )
-            )
-
-
-
-def delete_draft_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities, epoch
-):
-    issue_activities.append(
-        IssueActivity(
-            project=project,
-            workspace=project.workspace,
-            comment=f"deleted the draft issue",
-            field="draft",
-            verb="deleted",
-            actor=actor,
-            epoch=epoch,
-        )
-    )
-
 # Receive message from room group
@shared_task
 def issue_activity(
@@ -1264,7 +1179,6 @@ def issue_activity(
    issue_id,
    actor_id,
    project_id,
-    epoch,
    subscriber=True,
 ):
    try:
@@ -1319,17 +1233,12 @@ def issue_activity(
            "link.activity.deleted": delete_link_activity,
            "attachment.activity.created": create_attachment_activity,
            "attachment.activity.deleted": delete_attachment_activity,
-            "issue_relation.activity.created": create_issue_relation_activity,
-            "issue_relation.activity.deleted": delete_issue_relation_activity,
            "issue_reaction.activity.created": create_issue_reaction_activity,
            "issue_reaction.activity.deleted": delete_issue_reaction_activity,
            "comment_reaction.activity.created": create_comment_reaction_activity,
            "comment_reaction.activity.deleted": delete_comment_reaction_activity,
            "issue_vote.activity.created": create_issue_vote_activity,
            "issue_vote.activity.deleted": delete_issue_vote_activity,
-            "issue_draft.activity.created": create_draft_issue_activity,
-            "issue_draft.activity.updated": update_draft_issue_activity,
-            "issue_draft.activity.deleted": delete_draft_issue_activity,
        }

        func = ACTIVITY_MAPPER.get(type)
@@ -1341,7 +1250,6 @@ def issue_activity(
                project,
                actor,
                issue_activities,
-                epoch,
            )

        # Save all the values to database
@@ -32,7 +32,7 @@ def archive_old_issues():
            archive_in = project.archive_in

            # Get all the issues whose updated_at in less that the archive_in month
-            issues = Issue.issue_objects.filter(
+            issues = Issue.objects.filter(
                Q(
                    project=project_id,
                    archived_at__isnull=True,
@@ -64,23 +64,21 @@ def archive_old_issues():
                    issues_to_update.append(issue)

                # Bulk Update the issues and log the activity
-                if issues_to_update: 
-                    updated_issues = Issue.objects.bulk_update(
-                        issues_to_update, ["archived_at"], batch_size=100
+                updated_issues = Issue.objects.bulk_update(
+                    issues_to_update, ["archived_at"], batch_size=100
+                )
+                [
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=json.dumps({"archived_at": str(issue.archived_at)}),
+                        actor_id=str(project.created_by_id),
+                        issue_id=issue.id,
+                        project_id=project_id,
+                        current_instance=None,
+                        subscriber=False,
                    )
-                    [
-                        issue_activity.delay(
-                            type="issue.activity.updated",
-                            requested_data=json.dumps({"archived_at": str(issue.archived_at)}),
-                            actor_id=str(project.created_by_id),
-                            issue_id=issue.id,
-                            project_id=project_id,
-                            current_instance=None,
-                            subscriber=False,
-                            epoch = int(timezone.now().timestamp())
-                        )
-                        for issue in updated_issues
-                    ]
+                    for issue in updated_issues
+                ]
        return
    except Exception as e:
        if settings.DEBUG:
@@ -101,7 +99,7 @@ def close_old_issues():
            close_in = project.close_in

            # Get all the issues whose updated_at in less that the close_in month
-            issues = Issue.issue_objects.filter(
+            issues = Issue.objects.filter(
                Q(
                    project=project_id,
                    archived_at__isnull=True,
@@ -138,21 +136,19 @@ def close_old_issues():
                    issues_to_update.append(issue)

                # Bulk Update the issues and log the activity
-                if issues_to_update:
-                    updated_issues = Issue.objects.bulk_update(issues_to_update, ["state"], batch_size=100)
-                    [
-                        issue_activity.delay(
-                            type="issue.activity.updated",
-                            requested_data=json.dumps({"closed_to": str(issue.state_id)}),
-                            actor_id=str(project.created_by_id),
-                            issue_id=issue.id,
-                            project_id=project_id,
-                            current_instance=None,
-                            subscriber=False,
-                            epoch = int(timezone.now().timestamp())
-                        )
-                        for issue in updated_issues
-                    ]
+                updated_issues = Issue.objects.bulk_update(issues_to_update, ["state"], batch_size=100)
+                [
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=json.dumps({"closed_to": str(issue.state_id)}),
+                        actor_id=str(project.created_by_id),
+                        issue_id=issue.id,
+                        project_id=project_id,
+                        current_instance=None,
+                        subscriber=False,
+                    )
+                    for issue in updated_issues
+                ]
        return
    except Exception as e:
        if settings.DEBUG:
@@ -32,11 +32,19 @@ class Migration(migrations.Migration):
            field=models.CharField(blank=True, max_length=255, null=True),
        ),
        migrations.RunPython(update_user_timezones),
+        migrations.AlterUniqueTogether(
+            name='issuevote',
+            unique_together=set(),
+        ),
        migrations.AlterField(
            model_name='issuevote',
            name='vote',
            field=models.IntegerField(choices=[(-1, 'DOWNVOTE'), (1, 'UPVOTE')], default=1),
        ),
+        migrations.AlterUniqueTogether(
+            name='issuevote',
+            unique_together={('issue', 'actor', 'vote')},
+        ),
        migrations.CreateModel(
            name='ProjectPublicMember',
            fields=[
@@ -1,84 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-12 07:29
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-from plane.db.models import IssueRelation
-from sentry_sdk import capture_exception
-import uuid
-
-
-def create_issue_relation(apps, schema_editor):
-    try:
-        IssueBlockerModel = apps.get_model("db", "IssueBlocker")
-        updated_issue_relation = []
-        for blocked_issue in IssueBlockerModel.objects.all():
-            updated_issue_relation.append(
-                IssueRelation(
-                    issue_id=blocked_issue.block_id,
-                    related_issue_id=blocked_issue.blocked_by_id,
-                    relation_type="blocked_by",
-                    project_id=blocked_issue.project_id,
-                    workspace_id=blocked_issue.workspace_id,
-                    created_by_id=blocked_issue.created_by_id,
-                    updated_by_id=blocked_issue.updated_by_id,
-                )
-            )
-        IssueRelation.objects.bulk_create(updated_issue_relation, batch_size=100)
-    except Exception as e:
-        print(e)
-        capture_exception(e)
-
-
-def update_issue_priority_choice(apps, schema_editor):
-    IssueModel = apps.get_model("db", "Issue")
-    updated_issues = []
-    for obj in IssueModel.objects.all():
-        if obj.priority is None:
-            obj.priority = "none"
-        updated_issues.append(obj)
-    IssueModel.objects.bulk_update(updated_issues, ["priority"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0042_alter_analyticview_created_by_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='IssueRelation',
-            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)),
-                ('relation_type', models.CharField(choices=[('duplicate', 'Duplicate'), ('relates_to', 'Relates To'), ('blocked_by', 'Blocked By')], default='blocked_by', max_length=20, verbose_name='Issue Relation Type')),
-                ('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')),
-                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_relation', to='db.issue')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('related_issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_related', to='db.issue')),
-                ('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')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Issue Relation',
-                'verbose_name_plural': 'Issue Relations',
-                'db_table': 'issue_relations',
-                'ordering': ('-created_at',),
-                'unique_together': {('issue', 'related_issue')},
-            },
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='is_draft',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='issue',
-            name='priority',
-            field=models.CharField(choices=[('urgent', 'Urgent'), ('high', 'High'), ('medium', 'Medium'), ('low', 'Low'), ('none', 'None')], default='none', max_length=30, verbose_name='Issue Priority'),
-        ),
-        migrations.RunPython(create_issue_relation),
-        migrations.RunPython(update_issue_priority_choice),
-    ]
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.3 on 2023-08-29 07:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0042_alter_analyticview_created_by_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='issuevote',
+            unique_together=set(),
+        ),
+        migrations.AlterField(
+            model_name='issuevote',
+            name='vote',
+            field=models.IntegerField(choices=[(-1, 'DOWNVOTE'), (1, 'UPVOTE')], default=1),
+        ),
+        migrations.AlterUniqueTogether(
+            name='issuevote',
+            unique_together={('issue', 'actor', 'vote')},
+        ),
+    ]
@@ -1,138 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-13 07:09
-
-from django.db import migrations
-
-
-def workspace_member_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-        "display_filters": {
-            "group_by": old_props.get("groupByProperty", None),
-            "order_by": old_props.get("orderBy", "-created_at"),
-            "type": old_props.get("filters", {}).get("type", None),
-            "sub_issue": old_props.get("showSubIssues", True),
-            "show_empty_groups": old_props.get("showEmptyGroups", True),
-            "layout": old_props.get("issueView", "list"),
-            "calendar_date_range": old_props.get("calendarDateRange", ""),
-        },
-        "display_properties": {
-            "assignee": old_props.get("properties", {}).get("assignee",None),
-            "attachment_count": old_props.get("properties", {}).get("attachment_count", None),
-            "created_on": old_props.get("properties", {}).get("created_on", None),
-            "due_date": old_props.get("properties", {}).get("due_date", None),
-            "estimate": old_props.get("properties", {}).get("estimate", None),
-            "key": old_props.get("properties", {}).get("key", None),
-            "labels": old_props.get("properties", {}).get("labels", None),
-            "link": old_props.get("properties", {}).get("link", None),
-            "priority": old_props.get("properties", {}).get("priority", None),
-            "start_date": old_props.get("properties", {}).get("start_date", None),
-            "state": old_props.get("properties", {}).get("state", None),
-            "sub_issue_count": old_props.get("properties", {}).get("sub_issue_count", None),
-            "updated_on": old_props.get("properties", {}).get("updated_on", None),
-        },
-    }
-    return new_props
-
-
-def project_member_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-        "display_filters": {
-            "group_by": old_props.get("groupByProperty", None),
-            "order_by": old_props.get("orderBy", "-created_at"),
-            "type": old_props.get("filters", {}).get("type", None),
-            "sub_issue": old_props.get("showSubIssues", True),
-            "show_empty_groups": old_props.get("showEmptyGroups", True),
-            "layout": old_props.get("issueView", "list"),
-            "calendar_date_range": old_props.get("calendarDateRange", ""),
-        },
-    }
-    return new_props
-
-
-def cycle_module_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-    }
-    return new_props
-     
-
-def update_workspace_member_view_props(apps, schema_editor):
-    WorkspaceMemberModel = apps.get_model("db", "WorkspaceMember")
-    updated_workspace_member = []
-    for obj in WorkspaceMemberModel.objects.all():
-            obj.view_props = workspace_member_props(obj.view_props)
-            obj.default_props = workspace_member_props(obj.default_props)
-            updated_workspace_member.append(obj)
-    WorkspaceMemberModel.objects.bulk_update(updated_workspace_member, ["view_props", "default_props"], batch_size=100)
-
-def update_project_member_view_props(apps, schema_editor):
-    ProjectMemberModel = apps.get_model("db", "ProjectMember")
-    updated_project_member = []
-    for obj in ProjectMemberModel.objects.all():
-            obj.view_props = project_member_props(obj.view_props)
-            obj.default_props = project_member_props(obj.default_props)
-            updated_project_member.append(obj)
-    ProjectMemberModel.objects.bulk_update(updated_project_member, ["view_props", "default_props"], batch_size=100)
-
-def update_cycle_props(apps, schema_editor):
-    CycleModel = apps.get_model("db", "Cycle")
-    updated_cycle = []
-    for obj in CycleModel.objects.all():
-            if "filter" in obj.view_props:
-                obj.view_props = cycle_module_props(obj.view_props)
-                updated_cycle.append(obj)
-    CycleModel.objects.bulk_update(updated_cycle, ["view_props"], batch_size=100)
-
-def update_module_props(apps, schema_editor):
-    ModuleModel = apps.get_model("db", "Module")
-    updated_module = []
-    for obj in ModuleModel.objects.all():
-            if "filter" in obj.view_props:
-                obj.view_props = cycle_module_props(obj.view_props)
-                updated_module.append(obj)
-    ModuleModel.objects.bulk_update(updated_module, ["view_props"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0043_alter_analyticview_created_by_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(update_workspace_member_view_props),
-        migrations.RunPython(update_project_member_view_props),
-        migrations.RunPython(update_cycle_props),
-        migrations.RunPython(update_module_props),
-    ]
@@ -1,24 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-15 06:55
-
-from django.db import migrations
-
-
-def update_issue_activity(apps, schema_editor):
-    IssueActivityModel = apps.get_model("db", "IssueActivity")
-    updated_issue_activity = []
-    for obj in IssueActivityModel.objects.all():
-            if obj.field == "blocks":
-                obj.field = "blocked_by"
-                updated_issue_activity.append(obj)
-    IssueActivityModel.objects.bulk_update(updated_issue_activity, ["field"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0044_auto_20230913_0709'),
-    ]
-
-    operations = [
-         migrations.RunPython(update_issue_activity),
-    ]
@@ -1,53 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-19 14:21
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-def update_epoch(apps, schema_editor):
-    IssueActivity = apps.get_model('db', 'IssueActivity')
-    updated_issue_activity = []
-    for obj in IssueActivity.objects.all():
-        obj.epoch = int(obj.created_at.timestamp())
-        updated_issue_activity.append(obj)
-    IssueActivity.objects.bulk_update(updated_issue_activity, ["epoch"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0045_auto_20230915_0655'),
-    ]
-
-    operations = [
-    migrations.CreateModel(
-            name='GlobalView',
-            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)),
-                ('name', models.CharField(max_length=255, verbose_name='View Name')),
-                ('description', models.TextField(blank=True, verbose_name='View Description')),
-                ('query', models.JSONField(verbose_name='View Query')),
-                ('access', models.PositiveSmallIntegerField(choices=[(0, 'Private'), (1, 'Public')], default=1)),
-                ('query_data', models.JSONField(default=dict)),
-                ('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')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='global_views', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Global View',
-                'verbose_name_plural': 'Global Views',
-                'db_table': 'global_views',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.AddField(
-            model_name='issueactivity',
-            name='epoch',
-            field=models.FloatField(null=True),
-        ),
-        migrations.RunPython(update_epoch),
-    ]
@@ -32,7 +32,6 @@ from .issue import (
    IssueAssignee,
    Label,
    IssueBlocker,
-    IssueRelation,
    IssueLink,
    IssueSequence,
    IssueAttachment,
@@ -50,7 +49,7 @@ from .state import State

 from .cycle import Cycle, CycleIssue, CycleFavorite

-from .view import GlobalView, IssueView, IssueViewFavorite
+from .view import IssueView, IssueViewFavorite

 from .module import Module, ModuleMember, ModuleIssue, ModuleLink, ModuleFavorite

@@ -29,7 +29,6 @@ class IssueManager(models.Manager):
                | models.Q(issue_inbox__isnull=True)
            )
            .exclude(archived_at__isnull=False)
-            .exclude(is_draft=True)
        )


@@ -39,7 +38,6 @@ class Issue(ProjectBaseModel):
        ("high", "High"),
        ("medium", "Medium"),
        ("low", "Low"),
-        ("none", "None")
    )
    parent = models.ForeignKey(
        "self",
@@ -66,7 +64,8 @@ class Issue(ProjectBaseModel):
        max_length=30,
        choices=PRIORITY_CHOICES,
        verbose_name="Issue Priority",
-        default="none",
+        null=True,
+        blank=True,
    )
    start_date = models.DateField(null=True, blank=True)
    target_date = models.DateField(null=True, blank=True)
@@ -84,7 +83,6 @@ class Issue(ProjectBaseModel):
    sort_order = models.FloatField(default=65535)
    completed_at = models.DateTimeField(null=True)
    archived_at = models.DateField(null=True)
-    is_draft = models.BooleanField(default=False)

    objects = models.Manager()
    issue_objects = IssueManager()
@@ -180,37 +178,6 @@ class IssueBlocker(ProjectBaseModel):
        return f"{self.block.name} {self.blocked_by.name}"


-class IssueRelation(ProjectBaseModel):
-    RELATION_CHOICES = (
-        ("duplicate", "Duplicate"),
-        ("relates_to", "Relates To"),
-        ("blocked_by", "Blocked By"),
-    )
-        
-    issue = models.ForeignKey(
-        Issue, related_name="issue_relation", on_delete=models.CASCADE
-    )
-    related_issue = models.ForeignKey(
-        Issue, related_name="issue_related", on_delete=models.CASCADE
-    )
-    relation_type = models.CharField(
-        max_length=20,
-        choices=RELATION_CHOICES,
-        verbose_name="Issue Relation Type",
-        default="blocked_by",
-    )
-
-    class Meta:
-        unique_together = ["issue", "related_issue"]
-        verbose_name = "Issue Relation"
-        verbose_name_plural = "Issue Relations"
-        db_table = "issue_relations"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.issue.name} {self.related_issue.name}"    
-
-
 class IssueAssignee(ProjectBaseModel):
    issue = models.ForeignKey(
        Issue, on_delete=models.CASCADE, related_name="issue_assignee"
@@ -309,7 +276,6 @@ class IssueActivity(ProjectBaseModel):
    )
    old_identifier = models.UUIDField(null=True)
    new_identifier = models.UUIDField(null=True)
-    epoch = models.FloatField(null=True)

    class Meta:
        verbose_name = "Issue Activity"
@@ -515,7 +481,7 @@ class IssueVote(ProjectBaseModel):
    )

    class Meta:
-        unique_together = ["issue", "actor",]
+        unique_together = ["issue", "actor", "vote"]
        verbose_name = "Issue Vote"
        verbose_name_plural = "Issue Votes"
        db_table = "issue_votes"
@@ -25,26 +25,13 @@ ROLE_CHOICES = (

 def get_default_props():
    return {
-        "filters": {
-            "priority": None,
-            "state": None,
-            "state_group": None,
-            "assignees": None,
-            "created_by": None,
-            "labels": None,
-            "start_date": None,
-            "target_date": None,
-            "subscriber": None,
-        },
-        "display_filters": {
-            "group_by": None,
-            "order_by": '-created_at',
-            "type": None,
-            "sub_issue": True,
-            "show_empty_groups": True,
-            "layout": "list",
-            "calendar_date_range": "",
-        },
+        "filters": {"type": None},
+        "orderBy": "-created_at",
+        "collapsed": True,
+        "issueView": "list",
+        "filterIssue": None,
+        "groupByProperty": None,
+        "showEmptyGroups": True,
    }


@@ -3,30 +3,7 @@ from django.db import models
 from django.conf import settings

 # Module import
-from . import ProjectBaseModel, BaseModel
-
-
-class GlobalView(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace", on_delete=models.CASCADE, related_name="global_views"
-    )
-    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")
-    access = models.PositiveSmallIntegerField(
-        default=1, choices=((0, "Private"), (1, "Public"))
-    )
-    query_data = models.JSONField(default=dict)
-
-    class Meta:
-        verbose_name = "Global View"
-        verbose_name_plural = "Global Views"
-        db_table = "global_views"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        """Return name of the View"""
-        return f"{self.name} <{self.workspace.name}>"
+from . import ProjectBaseModel


 class IssueView(ProjectBaseModel):
@@ -16,41 +16,26 @@ ROLE_CHOICES = (

 def get_default_props():
    return {
-        "filters": {
-            "priority": None,
-            "state": None,
-            "state_group": None,
-            "assignees": None,
-            "created_by": None,
-            "labels": None,
-            "start_date": None,
-            "target_date": None,
-            "subscriber": None,
-        },
-        "display_filters": {
-            "group_by": None,
-            "order_by": '-created_at',
-            "type": None,
-            "sub_issue": True,
-            "show_empty_groups": True,
-            "layout": "list",
-            "calendar_date_range": "",
-        },
-        "display_properties": {
+        "filters": {"type": None},
+        "groupByProperty": None,
+        "issueView": "list",
+        "orderBy": "-created_at",
+        "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,
+            "attachment_count": True,
+            "link": True,
+            "estimate": True,
+            "created_on": True,
            "updated_on": True,
-        }
+            "start_date": True,
+        },
+        "showEmptyGroups": True,
    }


@@ -1,8 +1,10 @@
 """Production settings and globals."""
+from urllib.parse import urlparse
 import ssl
 import certifi

 import dj_database_url
+from urllib.parse import urlparse

 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
@@ -89,89 +91,112 @@ if bool(os.environ.get("SENTRY_DSN", False)):
        profiles_sample_rate=1.0,
    )

-# The AWS region to connect to.
-AWS_REGION = os.environ.get("AWS_REGION", "")
+if DOCKERIZED and USE_MINIO:
+    INSTALLED_APPS += ("storages",)
+    STORAGES["default"] = {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage"}
+    # The AWS access key to use.
+    AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "access-key")
+    # The AWS secret access key to use.
+    AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "secret-key")
+    # The name of the bucket to store files in.
+    AWS_STORAGE_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME", "uploads")
+    # The full URL to the S3 endpoint. Leave blank to use the default region URL.
+    AWS_S3_ENDPOINT_URL = os.environ.get(
+        "AWS_S3_ENDPOINT_URL", "http://plane-minio:9000"
+    )
+    # Default permissions
+    AWS_DEFAULT_ACL = "public-read"
+    AWS_QUERYSTRING_AUTH = False
+    AWS_S3_FILE_OVERWRITE = False

-# The AWS access key to use.
-AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "")
+    # Custom Domain settings
+    parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost"))
+    AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
+    AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
+else:
+    # The AWS region to connect to.
+    AWS_REGION = os.environ.get("AWS_REGION", "")

-# The AWS secret access key to use.
-AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "")
+    # The AWS access key to use.
+    AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "")

-# The optional AWS session token to use.
-# AWS_SESSION_TOKEN = ""
+    # The AWS secret access key to use.
+    AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "")

-# The name of the bucket to store files in.
-AWS_S3_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME")
+    # The optional AWS session token to use.
+    # AWS_SESSION_TOKEN = ""

-# How to construct S3 URLs ("auto", "path", "virtual").
-AWS_S3_ADDRESSING_STYLE = "auto"
+    # The name of the bucket to store files in.
+    AWS_S3_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME")

-# The full URL to the S3 endpoint. Leave blank to use the default region URL.
-AWS_S3_ENDPOINT_URL = os.environ.get("AWS_S3_ENDPOINT_URL", "")
+    # How to construct S3 URLs ("auto", "path", "virtual").
+    AWS_S3_ADDRESSING_STYLE = "auto"

-# A prefix to be applied to every stored file. This will be joined to every filename using the "/" separator.
-AWS_S3_KEY_PREFIX = ""
+    # The full URL to the S3 endpoint. Leave blank to use the default region URL.
+    AWS_S3_ENDPOINT_URL = os.environ.get("AWS_S3_ENDPOINT_URL", "")

-# Whether to enable authentication for stored files. If True, then generated URLs will include an authentication
-# token valid for `AWS_S3_MAX_AGE_SECONDS`. If False, then generated URLs will not include an authentication token,
-# and their permissions will be set to "public-read".
-AWS_S3_BUCKET_AUTH = False
+    # A prefix to be applied to every stored file. This will be joined to every filename using the "/" separator.
+    AWS_S3_KEY_PREFIX = ""

-# How long generated URLs are valid for. This affects the expiry of authentication tokens if `AWS_S3_BUCKET_AUTH`
-# is True. It also affects the "Cache-Control" header of the files.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_MAX_AGE_SECONDS = 60 * 60  # 1 hours.
+    # Whether to enable authentication for stored files. If True, then generated URLs will include an authentication
+    # token valid for `AWS_S3_MAX_AGE_SECONDS`. If False, then generated URLs will not include an authentication token,
+    # and their permissions will be set to "public-read".
+    AWS_S3_BUCKET_AUTH = False

-# A URL prefix to be used for generated URLs. This is useful if your bucket is served through a CDN. This setting
-# cannot be used with `AWS_S3_BUCKET_AUTH`.
-AWS_S3_PUBLIC_URL = ""
+    # How long generated URLs are valid for. This affects the expiry of authentication tokens if `AWS_S3_BUCKET_AUTH`
+    # is True. It also affects the "Cache-Control" header of the files.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_MAX_AGE_SECONDS = 60 * 60  # 1 hours.

-# If True, then files will be stored with reduced redundancy. Check the S3 documentation and make sure you
-# understand the consequences before enabling.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_REDUCED_REDUNDANCY = False
+    # A URL prefix to be used for generated URLs. This is useful if your bucket is served through a CDN. This setting
+    # cannot be used with `AWS_S3_BUCKET_AUTH`.
+    AWS_S3_PUBLIC_URL = ""

-# The Content-Disposition header used when the file is downloaded. This can be a string, or a function taking a
-# single `name` argument.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_CONTENT_DISPOSITION = ""
+    # If True, then files will be stored with reduced redundancy. Check the S3 documentation and make sure you
+    # understand the consequences before enabling.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_REDUCED_REDUNDANCY = False

-# The Content-Language header used when the file is downloaded. This can be a string, or a function taking a
-# single `name` argument.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_CONTENT_LANGUAGE = ""
+    # The Content-Disposition header used when the file is downloaded. This can be a string, or a function taking a
+    # single `name` argument.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_CONTENT_DISPOSITION = ""

-# A mapping of custom metadata for each file. Each value can be a string, or a function taking a
-# single `name` argument.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_METADATA = {}
+    # The Content-Language header used when the file is downloaded. This can be a string, or a function taking a
+    # single `name` argument.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_CONTENT_LANGUAGE = ""

-# If True, then files will be stored using AES256 server-side encryption.
-# If this is a string value (e.g., "aws:kms"), that encryption type will be used.
-# Otherwise, server-side encryption is not be enabled.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_ENCRYPT_KEY = False
+    # A mapping of custom metadata for each file. Each value can be a string, or a function taking a
+    # single `name` argument.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_METADATA = {}

-# The AWS S3 KMS encryption key ID (the `SSEKMSKeyId` parameter) is set from this string if present.
-# This is only relevant if AWS S3 KMS server-side encryption is enabled (above).
-# AWS_S3_KMS_ENCRYPTION_KEY_ID = ""
+    # If True, then files will be stored using AES256 server-side encryption.
+    # If this is a string value (e.g., "aws:kms"), that encryption type will be used.
+    # Otherwise, server-side encryption is not be enabled.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_ENCRYPT_KEY = False

-# If True, then text files will be stored using gzip content encoding. Files will only be gzipped if their
-# compressed size is smaller than their uncompressed size.
-# Important: Changing this setting will not affect existing files.
-AWS_S3_GZIP = True
+    # The AWS S3 KMS encryption key ID (the `SSEKMSKeyId` parameter) is set from this string if present.
+    # This is only relevant if AWS S3 KMS server-side encryption is enabled (above).
+    # AWS_S3_KMS_ENCRYPTION_KEY_ID = ""

-# The signature version to use for S3 requests.
-AWS_S3_SIGNATURE_VERSION = None
+    # If True, then text files will be stored using gzip content encoding. Files will only be gzipped if their
+    # compressed size is smaller than their uncompressed size.
+    # Important: Changing this setting will not affect existing files.
+    AWS_S3_GZIP = True

-# If True, then files with the same name will overwrite each other. By default it's set to False to have
-# extra characters appended.
-AWS_S3_FILE_OVERWRITE = False
+    # The signature version to use for S3 requests.
+    AWS_S3_SIGNATURE_VERSION = None

-STORAGES["default"] = {
-    "BACKEND": "django_s3_storage.storage.S3Storage",
-}
+    # If True, then files with the same name will overwrite each other. By default it's set to False to have
+    # extra characters appended.
+    AWS_S3_FILE_OVERWRITE = False
+
+    STORAGES["default"] = {
+        "BACKEND": "django_s3_storage.storage.S3Storage",
+    }

 # AWS Settings End

@@ -193,16 +218,27 @@ CSRF_COOKIE_SECURE = True

 REDIS_URL = os.environ.get("REDIS_URL")

-CACHES = {
-    "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": REDIS_URL,
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-            "CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": False},
-        },
+if DOCKERIZED:
+    CACHES = {
+        "default": {
+            "BACKEND": "django_redis.cache.RedisCache",
+            "LOCATION": REDIS_URL,
+            "OPTIONS": {
+                "CLIENT_CLASS": "django_redis.client.DefaultClient",
+            },
+        }
+    }
+else:
+    CACHES = {
+        "default": {
+            "BACKEND": "django_redis.cache.RedisCache",
+            "LOCATION": REDIS_URL,
+            "OPTIONS": {
+                "CLIENT_CLASS": "django_redis.client.DefaultClient",
+                "CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": False},
+            },
+        }
    }
-}


 WEB_URL = os.environ.get("WEB_URL", "https://app.plane.so")
@@ -225,16 +261,19 @@ broker_url = (
    f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
 )

-CELERY_RESULT_BACKEND = broker_url
-CELERY_BROKER_URL = broker_url
+if DOCKERIZED:
+    CELERY_BROKER_URL = REDIS_URL
+    CELERY_RESULT_BACKEND = REDIS_URL
+else:
+    CELERY_RESULT_BACKEND = broker_url
+    CELERY_BROKER_URL = broker_url

 GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)

-# Enable or Disable signups
+
 ENABLE_SIGNUP = os.environ.get("ENABLE_SIGNUP", "1") == "1"

 # Scout Settings
 SCOUT_MONITOR = os.environ.get("SCOUT_MONITOR", False)
 SCOUT_KEY = os.environ.get("SCOUT_KEY", "")
 SCOUT_NAME = "Plane"
-
@@ -1,128 +0,0 @@
-"""Self hosted settings and globals."""
-from urllib.parse import urlparse
-
-import dj_database_url
-from urllib.parse import urlparse
-
-
-from .common import *  # noqa
-
-# Database
-DEBUG = int(os.environ.get("DEBUG", 0)) == 1
-
-# Docker configurations
-DOCKERIZED = 1
-USE_MINIO = 1
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": "plane",
-        "USER": os.environ.get("PGUSER", ""),
-        "PASSWORD": os.environ.get("PGPASSWORD", ""),
-        "HOST": os.environ.get("PGHOST", ""),
-    }
-}
-
-# Parse database configuration from $DATABASE_URL
-DATABASES["default"] = dj_database_url.config()
-SITE_ID = 1
-
-# File size limit
-FILE_SIZE_LIMIT = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
-
-CORS_ALLOW_METHODS = [
-    "DELETE",
-    "GET",
-    "OPTIONS",
-    "PATCH",
-    "POST",
-    "PUT",
-]
-
-CORS_ALLOW_HEADERS = [
-    "accept",
-    "accept-encoding",
-    "authorization",
-    "content-type",
-    "dnt",
-    "origin",
-    "user-agent",
-    "x-csrftoken",
-    "x-requested-with",
-]
-
-CORS_ALLOW_CREDENTIALS = True
-CORS_ALLOW_ALL_ORIGINS = True
-
-STORAGES = {
-    "staticfiles": {
-        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
-    },
-}
-
-INSTALLED_APPS += ("storages",)
-STORAGES["default"] = {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage"}
-# The AWS access key to use.
-AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "access-key")
-# The AWS secret access key to use.
-AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "secret-key")
-# The name of the bucket to store files in.
-AWS_STORAGE_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME", "uploads")
-# The full URL to the S3 endpoint. Leave blank to use the default region URL.
-AWS_S3_ENDPOINT_URL = os.environ.get(
-    "AWS_S3_ENDPOINT_URL", "http://plane-minio:9000"
-)
-# Default permissions
-AWS_DEFAULT_ACL = "public-read"
-AWS_QUERYSTRING_AUTH = False
-AWS_S3_FILE_OVERWRITE = False
-
-# Custom Domain settings
-parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost"))
-AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
-AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
-
-# Honor the 'X-Forwarded-Proto' header for request.is_secure()
-SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
-
-# Allow all host headers
-ALLOWED_HOSTS = [
-    "*",
-]
-
-# Security settings
-SESSION_COOKIE_SECURE = True
-CSRF_COOKIE_SECURE = True
-
-# Redis URL
-REDIS_URL = os.environ.get("REDIS_URL")
-
-# Caches 
-CACHES = {
-    "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": REDIS_URL,
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        },
-    }
-}
-
-# URL used for email redirects
-WEB_URL = os.environ.get("WEB_URL", "http://localhost")
-
-# Celery settings
-CELERY_BROKER_URL = REDIS_URL
-CELERY_RESULT_BACKEND = REDIS_URL
-
-# Enable or Disable signups
-ENABLE_SIGNUP = os.environ.get("ENABLE_SIGNUP", "1") == "1"
-
-# Analytics
-ANALYTICS_BASE_API = False
-
-# OPEN AI Settings
-OPENAI_API_BASE = os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1")
-OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY", False)
-GPT_ENGINE = os.environ.get("GPT_ENGINE", "gpt-3.5-turbo")
@@ -96,7 +96,7 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
        chart_data = {str(date): 0 for date in date_range}

        completed_issues_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                workspace__slug=slug,
                project_id=project_id,
                issue_cycle__cycle_id=cycle_id,
@@ -118,7 +118,7 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
        chart_data = {str(date): 0 for date in date_range}

        completed_issues_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                workspace__slug=slug,
                project_id=project_id,
                issue_module__module_id=module_id,
@@ -15,7 +15,7 @@ def resolve_keys(group_keys, value):
    return value


-def group_results(results_data, group_by, sub_group_by=False):
+def group_results(results_data, group_by):
    """group results data into certain group_by

    Args:
@@ -25,140 +25,38 @@ def group_results(results_data, group_by, sub_group_by=False):
    Returns:
        obj: grouped results
    """
-    if sub_group_by:
-        main_responsive_dict = dict()
+    response_dict = dict()

-        if sub_group_by == "priority":
-            main_responsive_dict = {
-                "urgent": {},
-                "high": {},
-                "medium": {},
-                "low": {},
-                "none": {},
-            }
+    if group_by == "priority":
+        response_dict = {
+            "urgent": [],
+            "high": [],
+            "medium": [],
+            "low": [],
+            "None": [],
+        }

-        for value in results_data:
-            main_group_attribute = resolve_keys(sub_group_by, value)
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(main_group_attribute, list) and not isinstance(group_attribute, list):
-                if len(main_group_attribute):
-                    for attrib in main_group_attribute:
-                        if str(attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(attrib)] = {}
-                        if str(group_attribute) in main_responsive_dict[str(attrib)]:
-                            main_responsive_dict[str(attrib)][str(group_attribute)].append(value)
-                        else:
-                            main_responsive_dict[str(attrib)][str(group_attribute)] = []
-                            main_responsive_dict[str(attrib)][str(group_attribute)].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
-
-                    if str(group_attribute) in main_responsive_dict[str(None)]:
-                        main_responsive_dict[str(None)][str(group_attribute)].append(value)
+    for value in results_data:
+        group_attribute = resolve_keys(group_by, value)
+        if isinstance(group_attribute, list):
+            if len(group_attribute):
+                for attrib in group_attribute:
+                    if str(attrib) in response_dict:
+                        response_dict[str(attrib)].append(value)
                    else:
-                        main_responsive_dict[str(None)][str(group_attribute)] = []
-                        main_responsive_dict[str(None)][str(group_attribute)].append(value)
-
-            elif isinstance(group_attribute, list) and not isinstance(main_group_attribute, list):
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if str(attrib) in main_responsive_dict[str(main_group_attribute)]:
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)].append(value)
-                        else:
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)] = []
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)].append(value)
-                else:
-                    if str(None) in main_responsive_dict[str(main_group_attribute)]:
-                        main_responsive_dict[str(main_group_attribute)][str(None)].append(value)
-                    else:
-                        main_responsive_dict[str(main_group_attribute)][str(None)] = []
-                        main_responsive_dict[str(main_group_attribute)][str(None)].append(value)
-
-            elif isinstance(group_attribute, list) and isinstance(main_group_attribute, list):
-                if len(main_group_attribute):
-                    for main_attrib in main_group_attribute:
-                        if str(main_attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(main_attrib)] = {}
-                        if len(group_attribute):
-                            for attrib in group_attribute:
-                                if str(attrib) in main_responsive_dict[str(main_attrib)]:
-                                    main_responsive_dict[str(main_attrib)][str(attrib)].append(value)
-                                else:
-                                    main_responsive_dict[str(main_attrib)][str(attrib)] = []
-                                    main_responsive_dict[str(main_attrib)][str(attrib)].append(value)
-                        else:
-                            if str(None) in main_responsive_dict[str(main_attrib)]:
-                                main_responsive_dict[str(main_attrib)][str(None)].append(value)
-                            else:
-                                main_responsive_dict[str(main_attrib)][str(None)] = []
-                                main_responsive_dict[str(main_attrib)][str(None)].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
-                    if len(group_attribute):
-                        for attrib in group_attribute:
-                            if str(attrib) in main_responsive_dict[str(None)]:
-                                main_responsive_dict[str(None)][str(attrib)].append(value)
-                            else:
-                                main_responsive_dict[str(None)][str(attrib)] = []
-                                main_responsive_dict[str(None)][str(attrib)].append(value)
-                    else:
-                        if str(None) in main_responsive_dict[str(None)]:
-                            main_responsive_dict[str(None)][str(None)].append(value)
-                        else:
-                            main_responsive_dict[str(None)][str(None)] = []
-                            main_responsive_dict[str(None)][str(None)].append(value)
+                        response_dict[str(attrib)] = []
+                        response_dict[str(attrib)].append(value)
            else:
-                main_group_attribute = resolve_keys(sub_group_by, value)
-                group_attribute = resolve_keys(group_by, value)
-
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
-
-                if str(group_attribute) in main_responsive_dict[str(main_group_attribute)]:
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)].append(value)
+                if str(None) in response_dict:
+                    response_dict[str(None)].append(value)
                else:
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)] = []
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)].append(value)   
-
-        return main_responsive_dict            
-
-    else:
-        response_dict = dict()
-
-        if group_by == "priority":
-            response_dict = {
-                "urgent": [],
-                "high": [],
-                "medium": [],
-                "low": [],
-                "none": [],
-            }
-
-        for value in results_data:
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(group_attribute, list):
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if str(attrib) in response_dict:
-                            response_dict[str(attrib)].append(value)
-                        else:
-                            response_dict[str(attrib)] = []
-                            response_dict[str(attrib)].append(value)
-                else:
-                    if str(None) in response_dict:
-                        response_dict[str(None)].append(value)
-                    else:
-                        response_dict[str(None)] = []
-                        response_dict[str(None)].append(value)
+                    response_dict[str(None)] = []
+                    response_dict[str(None)].append(value)
+        else:
+            if str(group_attribute) in response_dict:
+                response_dict[str(group_attribute)].append(value)
            else:
-                if str(group_attribute) in response_dict:
-                    response_dict[str(group_attribute)].append(value)
-                else:
-                    response_dict[str(group_attribute)] = []
-                    response_dict[str(group_attribute)].append(value)
+                response_dict[str(group_attribute)] = []
+                response_dict[str(group_attribute)].append(value)

-        return response_dict
+    return response_dict
@@ -1,7 +1,6 @@
 from django.utils.timezone import make_aware
 from django.utils.dateparse import parse_datetime

-
 def filter_state(params, filter, method):
    if method == "GET":
        states = params.get("state").split(",")
@@ -24,6 +23,7 @@ def filter_state_group(params, filter, method):
    return filter


+
 def filter_estimate_point(params, filter, method):
    if method == "GET":
        estimate_points = params.get("estimate_point").split(",")
@@ -39,10 +39,25 @@ def filter_priority(params, filter, method):
    if method == "GET":
        priorities = params.get("priority").split(",")
        if len(priorities) and "" not in priorities:
-            filter["priority__in"] = priorities
+            if len(priorities) == 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+            elif len(priorities) > 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+            else:
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+
    else:
        if params.get("priority", None) and len(params.get("priority")):
-            filter["priority__in"] = params.get("priority")
+            priorities = params.get("priority")
+            if len(priorities) == 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+            elif len(priorities) > 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+            else:
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+
    return filter


@@ -214,6 +229,7 @@ def filter_issue_state_type(params, filter, method):
    return filter


+
 def filter_project(params, filter, method):
    if method == "GET":
        projects = params.get("project").split(",")
@@ -313,7 +329,7 @@ def issue_filters(query_params, method):
        "module": filter_module,
        "inbox_status": filter_inbox_status,
        "sub_issue": filter_sub_issue_toggle,
-        "subscriber": filter_subscribed_issues,
+        "subscriber":  filter_subscribed_issues,
        "start_target_date": filter_start_target_date_issues,
    }

@@ -1,36 +1,36 @@
 # base requirements

-Django==4.2.5
+Django==4.2.3
 django-braces==1.15.0
 django-taggit==4.0.0
-psycopg==3.1.10
+psycopg==3.1.9
 django-oauth-toolkit==2.3.0
 mistune==3.0.1
 djangorestframework==3.14.0
 redis==4.6.0
 django-nested-admin==4.0.2
-django-cors-headers==4.2.0
+django-cors-headers==4.1.0
 whitenoise==6.5.0
-django-allauth==0.55.2
+django-allauth==0.54.0
 faker==18.11.2
 django-filter==23.2
 jsonmodels==2.6.0
-djangorestframework-simplejwt==5.3.0
-sentry-sdk==1.30.0
+djangorestframework-simplejwt==5.2.2
+sentry-sdk==1.27.0
 django-s3-storage==0.14.0
 django-crum==0.7.9
 django-guardian==2.4.0
 dj_rest_auth==2.2.5
-google-auth==2.22.0
-google-api-python-client==2.97.0
+google-auth==2.21.0
+google-api-python-client==2.92.0
 django-redis==5.3.0
-uvicorn==0.23.2
+uvicorn==0.22.0
 channels==4.0.0
-openai==0.28.0
+openai==0.27.8
 slack-sdk==3.21.3
-celery==5.3.4
+celery==5.3.1
 django_celery_beat==2.5.0
-psycopg-binary==3.1.10
-psycopg-c==3.1.10
+psycopg-binary==3.1.9
+psycopg-c==3.1.9
 scout-apm==2.26.1
 openpyxl==3.1.2
@@ -1,11 +1,11 @@
 -r base.txt

-dj-database-url==2.1.0
-gunicorn==21.2.0
+dj-database-url==2.0.0
+gunicorn==20.1.0
 whitenoise==6.5.0
-django-storages==1.14
-boto3==1.28.40
-django-anymail==10.1
+django-storages==1.13.2
+boto3==1.27.0
+django-anymail==10.0
 django-debug-toolbar==4.1.0
 gevent==23.7.0
 psycogreen==1.0.2
@@ -1,4 +1,7 @@
 module.exports = {
  root: true,
  extends: ["custom"],
+  rules: {
+    "@next/next/no-img-element": "off",
+  },
 };
@@ -1,5 +1,5 @@
 {
-  "printWidth": 120,
+  "printWidth": 100,
  "tabWidth": 2,
  "trailingComma": "es5"
 }
@@ -0,0 +1,74 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
+
+RUN yarn global add turbo
+COPY . .
+
+RUN turbo prune --scope=app --docker
+
+# Add lockfile and package.json's of isolated subworkspace
+FROM node:18-alpine AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ARG NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
+
+# First install the dependencies (as they change less often)
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
+
+# Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+COPY replace-env-vars.sh /usr/local/bin/
+USER root
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+
+RUN yarn turbo run build --filter=app
+
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+ENV NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL}
+RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} app
+
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+USER captain
+
+COPY --from=installer /app/apps/app/next.config.js .
+COPY --from=installer /app/apps/app/package.json .
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
+
+COPY --from=installer --chown=captain:plane /app/apps/app/.next ./apps/app/.next
+
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ARG NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
+
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    NEXT_PUBLIC_DEPLOY_URL=$NEXT_PUBLIC_DEPLOY_URL
+
+USER root
+COPY replace-env-vars.sh /usr/local/bin/
+COPY start.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+RUN chmod +x /usr/local/bin/start.sh
+
+USER captain
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+EXPOSE 3000
@@ -9,6 +9,7 @@ import { findStringWithMostCharacters } from "helpers/array.helper";
 import { generateBarColor } from "helpers/analytics.helper";
 // types
 import { IAnalyticsParams, IAnalyticsResponse } from "types";
+// constants

 type Props = {
  analytics: IAnalyticsResponse;
@@ -7,14 +7,19 @@ import analyticsService from "services/analytics.service";
 import projectService from "services/project.service";
 import cyclesService from "services/cycles.service";
 import modulesService from "services/modules.service";
-import trackEventServices from "services/track_event.service";
+import trackEventServices from "services/track-event.service";
 // hooks
 import useProjects from "hooks/use-projects";
 import useToast from "hooks/use-toast";
 // ui
 import { PrimaryButton, SecondaryButton } from "components/ui";
 // icons
-import { ArrowDownTrayIcon, ArrowPathIcon, CalendarDaysIcon, UserGroupIcon } from "@heroicons/react/24/outline";
+import {
+  ArrowDownTrayIcon,
+  ArrowPathIcon,
+  CalendarDaysIcon,
+  UserGroupIcon,
+} from "@heroicons/react/24/outline";
 import { ContrastIcon, LayerDiagonalIcon } from "components/icons";
 // helpers
 import { renderShortDate } from "helpers/date-time.helper";
@@ -41,7 +46,13 @@ type Props = {
  user: ICurrentUserResponse | undefined;
 };

-export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScreen, isProjectLevel = false, user }) => {
+export const AnalyticsSidebar: React.FC<Props> = ({
+  analytics,
+  params,
+  fullScreen,
+  isProjectLevel = false,
+  user,
+}) => {
  const router = useRouter();
  const { workspaceSlug, projectId, cycleId, moduleId } = router.query;

@@ -50,7 +61,9 @@ export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScree
  const { setToastAlert } = useToast();

  const { data: projectDetails } = useSWR(
-    workspaceSlug && projectId && !(cycleId || moduleId) ? PROJECT_DETAILS(projectId.toString()) : null,
+    workspaceSlug && projectId && !(cycleId || moduleId)
+      ? PROJECT_DETAILS(projectId.toString())
+      : null,
    workspaceSlug && projectId && !(cycleId || moduleId)
      ? () => projectService.getProject(workspaceSlug.toString(), projectId.toString())
      : null
@@ -59,14 +72,24 @@ export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScree
  const { data: cycleDetails } = useSWR(
    workspaceSlug && projectId && cycleId ? CYCLE_DETAILS(cycleId.toString()) : null,
    workspaceSlug && projectId && cycleId
-      ? () => cyclesService.getCycleDetails(workspaceSlug.toString(), projectId.toString(), cycleId.toString())
+      ? () =>
+          cyclesService.getCycleDetails(
+            workspaceSlug.toString(),
+            projectId.toString(),
+            cycleId.toString()
+          )
      : null
  );

  const { data: moduleDetails } = useSWR(
    workspaceSlug && projectId && moduleId ? MODULE_DETAILS(moduleId.toString()) : null,
    workspaceSlug && projectId && moduleId
-      ? () => modulesService.getModuleDetails(workspaceSlug.toString(), projectId.toString(), moduleId.toString())
+      ? () =>
+          modulesService.getModuleDetails(
+            workspaceSlug.toString(),
+            projectId.toString(),
+            moduleId.toString()
+          )
      : null
  );

@@ -155,7 +178,8 @@ export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScree
      );
  };

-  const selectedProjects = params.project && params.project.length > 0 ? params.project : projects?.map((p) => p.id);
+  const selectedProjects =
+    params.project && params.project.length > 0 ? params.project : projects?.map((p) => p.id);

  return (
    <div
@@ -212,7 +236,9 @@ export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScree
                            )}
                            <h5 className="flex items-center gap-1">
                              <p className="break-words">{truncateText(project.name, 20)}</p>
-                              <span className="text-custom-text-200 text-xs ml-1">({project.identifier})</span>
+                              <span className="text-custom-text-200 text-xs ml-1">
+                                ({project.identifier})
+                              </span>
                            </h5>
                          </div>
                          <div className="mt-4 space-y-3 pl-2 w-full">
@@ -318,7 +344,10 @@ export const AnalyticsSidebar: React.FC<Props> = ({ analytics, params, fullScree
                  <div className="space-y-4 mt-4">
                    <div className="flex items-center gap-2 text-xs">
                      <h6 className="text-custom-text-200">Network</h6>
-                      <span>{NETWORK_CHOICES.find((n) => n.key === projectDetails?.network)?.label ?? ""}</span>
+                      <span>
+                        {NETWORK_CHOICES.find((n) => n.key === projectDetails?.network)?.label ??
+                          ""}
+                      </span>
                    </div>
                  </div>
                </div>
@@ -1,13 +1,13 @@
 // nivo
 import { BarDatum } from "@nivo/bar";
 // icons
-import { PriorityIcon } from "components/icons";
+import { getPriorityIcon } from "components/icons";
 // helpers
 import { addSpaceIfCamelCase } from "helpers/string.helper";
 // helpers
 import { generateBarColor, renderMonthAndYear } from "helpers/analytics.helper";
 // types
-import { IAnalyticsParams, IAnalyticsResponse, TIssuePriorities } from "types";
+import { IAnalyticsParams, IAnalyticsResponse } from "types";
 // constants
 import { ANALYTICS_X_AXIS_VALUES, ANALYTICS_Y_AXIS_VALUES, DATE_KEYS } from "constants/analytics";

@@ -53,7 +53,7 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                    >
                      <div className="flex items-center gap-2">
                        {params.segment === "priority" ? (
-                          <PriorityIcon priority={key as TIssuePriorities} />
+                          getPriorityIcon(key)
                        ) : (
                          <span
                            className="h-3 w-3 flex-shrink-0 rounded"
@@ -91,7 +91,7 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                    }`}
                  >
                    {params.x_axis === "priority" ? (
-                      <PriorityIcon priority={item.name as TIssuePriorities} />
+                      getPriorityIcon(`${item.name}`)
                    ) : (
                      <span
                        className="h-3 w-3 rounded"
@@ -13,11 +13,15 @@ import analyticsService from "services/analytics.service";
 import projectService from "services/project.service";
 import cyclesService from "services/cycles.service";
 import modulesService from "services/modules.service";
-import trackEventServices from "services/track_event.service";
+import trackEventServices from "services/track-event.service";
 // components
 import { CustomAnalytics, ScopeAndDemand } from "components/analytics";
 // icons
-import { ArrowsPointingInIcon, ArrowsPointingOutIcon, XMarkIcon } from "@heroicons/react/24/outline";
+import {
+  ArrowsPointingInIcon,
+  ArrowsPointingOutIcon,
+  XMarkIcon,
+} from "@heroicons/react/24/outline";
 // types
 import { IAnalyticsParams, IWorkspace } from "types";
 // fetch-keys
@@ -63,7 +67,9 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
  );

  const { data: projectDetails } = useSWR(
-    workspaceSlug && projectId && !(cycleId || moduleId) ? PROJECT_DETAILS(projectId.toString()) : null,
+    workspaceSlug && projectId && !(cycleId || moduleId)
+      ? PROJECT_DETAILS(projectId.toString())
+      : null,
    workspaceSlug && projectId && !(cycleId || moduleId)
      ? () => projectService.getProject(workspaceSlug.toString(), projectId.toString())
      : null
@@ -72,14 +78,24 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
  const { data: cycleDetails } = useSWR(
    workspaceSlug && projectId && cycleId ? CYCLE_DETAILS(cycleId.toString()) : null,
    workspaceSlug && projectId && cycleId
-      ? () => cyclesService.getCycleDetails(workspaceSlug.toString(), projectId.toString(), cycleId.toString())
+      ? () =>
+          cyclesService.getCycleDetails(
+            workspaceSlug.toString(),
+            projectId.toString(),
+            cycleId.toString()
+          )
      : null
  );

  const { data: moduleDetails } = useSWR(
    workspaceSlug && projectId && moduleId ? MODULE_DETAILS(moduleId.toString()) : null,
    workspaceSlug && projectId && moduleId
-      ? () => modulesService.getModuleDetails(workspaceSlug.toString(), projectId.toString(), moduleId.toString())
+      ? () =>
+          modulesService.getModuleDetails(
+            workspaceSlug.toString(),
+            projectId.toString(),
+            moduleId.toString()
+          )
      : null
  );

@@ -118,7 +134,8 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
      eventPayload.moduleName = moduleDetails.name;
    }

-    const eventType = tab === "Scope and Demand" ? "SCOPE_AND_DEMAND_ANALYTICS" : "CUSTOM_ANALYTICS";
+    const eventType =
+      tab === "Scope and Demand" ? "SCOPE_AND_DEMAND_ANALYTICS" : "CUSTOM_ANALYTICS";

    trackEventServices.trackAnalyticsEvent(
      eventPayload,
@@ -133,9 +150,9 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {

  return (
    <div
-      className={`absolute top-0 z-30 h-full bg-custom-background-90 ${fullScreen ? "p-2 w-full" : "w-1/2"} ${
-        isOpen ? "right-0" : "-right-full"
-      } duration-300 transition-all`}
+      className={`absolute top-0 z-30 h-full bg-custom-background-90 ${
+        fullScreen ? "p-2 w-full" : "w-1/2"
+      } ${isOpen ? "right-0" : "-right-full"} duration-300 transition-all`}
    >
      <div
        className={`flex h-full flex-col overflow-hidden border-custom-border-200 bg-custom-background-100 text-left ${
@@ -144,7 +161,8 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
      >
        <div className="flex items-center justify-between gap-4 bg-custom-background-100 px-5 py-4 text-sm">
          <h3 className="break-words">
-            Analytics for {cycleId ? cycleDetails?.name : moduleId ? moduleDetails?.name : projectDetails?.name}
+            Analytics for{" "}
+            {cycleId ? cycleDetails?.name : moduleId ? moduleDetails?.name : projectDetails?.name}
          </h3>
          <div className="flex items-center gap-2">
            <button
@@ -1,7 +1,7 @@
 // icons
 import { PlayIcon } from "@heroicons/react/24/outline";
 // types
-import { IDefaultAnalyticsResponse, TStateGroups } from "types";
+import { IDefaultAnalyticsResponse } from "types";
 // constants
 import { STATE_GROUP_COLORS } from "constants/state";

@@ -27,7 +27,7 @@ export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
                <span
                  className="h-2 w-2 rounded-full"
                  style={{
-                    backgroundColor: STATE_GROUP_COLORS[group.state_group as TStateGroups],
+                    backgroundColor: STATE_GROUP_COLORS[group.state_group],
                  }}
                />
                <h6 className="capitalize">{group.state_group}</h6>
@@ -42,7 +42,7 @@ export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
                className="absolute top-0 left-0 h-1 rounded duration-300"
                style={{
                  width: `${percentage}%`,
-                  backgroundColor: STATE_GROUP_COLORS[group.state_group as TStateGroups],
+                  backgroundColor: STATE_GROUP_COLORS[group.state_group],
                }}
              />
            </div>
@@ -20,15 +20,18 @@ export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) =
          {
            id: "issues_closed",
            color: "rgb(var(--color-primary-100))",
-            data: Object.entries(MONTHS_LIST).map(([index, month]) => ({
-              x: month.shortTitle,
+            data: MONTHS_LIST.map((month) => ({
+              x: month.label.substring(0, 3),
              y:
-                defaultAnalytics.issue_completed_month_wise.find((data) => data.month === parseInt(index, 10))?.count ||
-                0,
+                defaultAnalytics.issue_completed_month_wise.find(
+                  (data) => data.month === month.value
+                )?.count || 0,
            })),
          },
        ]}
-        customYAxisTickValues={defaultAnalytics.issue_completed_month_wise.map((data) => data.count)}
+        customYAxisTickValues={defaultAnalytics.issue_completed_month_wise.map(
+          (data) => data.count
+        )}
        height="300px"
        colors={(datum) => datum.color}
        curve="monotoneX"
@@ -0,0 +1,90 @@
+import React, { useState } from "react";
+
+// component
+import { CustomSelect, ToggleSwitch } from "components/ui";
+import { SelectMonthModal } from "components/automation";
+// icons
+import { ChevronDownIcon } from "@heroicons/react/24/outline";
+// constants
+import { PROJECT_AUTOMATION_MONTHS } from "constants/project";
+// types
+import { IProject } from "types";
+
+type Props = {
+  projectDetails: IProject | undefined;
+  handleChange: (formData: Partial<IProject>) => Promise<void>;
+};
+
+export const AutoArchiveAutomation: React.FC<Props> = ({ projectDetails, handleChange }) => {
+  const [monthModal, setmonthModal] = useState(false);
+
+  const initialValues: Partial<IProject> = { archive_in: 1 };
+  return (
+    <>
+      <SelectMonthModal
+        type="auto-archive"
+        initialValues={initialValues}
+        isOpen={monthModal}
+        handleClose={() => setmonthModal(false)}
+        handleChange={handleChange}
+      />
+      <div className="flex flex-col gap-7 px-6 py-5 rounded-[10px] border border-custom-border-300 bg-custom-background-90">
+        <div className="flex items-center justify-between gap-x-8 gap-y-2">
+          <div className="flex flex-col gap-2.5">
+            <h4 className="text-lg font-semibold">Auto-archive closed issues</h4>
+            <p className="text-sm text-custom-text-200">
+              Plane will automatically archive issues that have been completed or cancelled for the
+              configured time period.
+            </p>
+          </div>
+          <ToggleSwitch
+            value={projectDetails?.archive_in !== 0}
+            onChange={() =>
+              projectDetails?.archive_in === 0
+                ? handleChange({ archive_in: 1 })
+                : handleChange({ archive_in: 0 })
+            }
+            size="sm"
+          />
+        </div>
+        {projectDetails?.archive_in !== 0 && (
+          <div className="flex items-center justify-between gap-2 w-full">
+            <div className="w-1/2 text-base font-medium">
+              Auto-archive issues that are closed for
+            </div>
+            <div className="w-1/2">
+              <CustomSelect
+                value={projectDetails?.archive_in}
+                label={`${projectDetails?.archive_in} ${
+                  projectDetails?.archive_in === 1 ? "Month" : "Months"
+                }`}
+                onChange={(val: number) => {
+                  handleChange({ archive_in: val });
+                }}
+                input
+                verticalPosition="top"
+                width="w-full"
+              >
+                <>
+                  {PROJECT_AUTOMATION_MONTHS.map((month) => (
+                    <CustomSelect.Option key={month.label} value={month.value}>
+                      {month.label}
+                    </CustomSelect.Option>
+                  ))}
+
+                  <button
+                    type="button"
+                    className="flex w-full select-none items-center rounded px-1 py-1.5 text-custom-text-200 hover:bg-custom-background-80"
+                    onClick={() => setmonthModal(true)}
+                  >
+                    Customize Time Range
+                  </button>
+                </>
+              </CustomSelect>
+            </div>
+          </div>
+        )}
+      </div>
+    </>
+  );
+};
@@ -0,0 +1,176 @@
+import React, { useState } from "react";
+
+import useSWR from "swr";
+
+import { useRouter } from "next/router";
+
+// component
+import { CustomSearchSelect, CustomSelect, ToggleSwitch } from "components/ui";
+import { SelectMonthModal } from "components/automation";
+// icons
+import { ChevronDownIcon, Squares2X2Icon } from "@heroicons/react/24/outline";
+import { getStateGroupIcon } from "components/icons";
+// services
+import stateService from "services/state.service";
+// constants
+import { PROJECT_AUTOMATION_MONTHS } from "constants/project";
+import { STATES_LIST } from "constants/fetch-keys";
+// types
+import { IProject } from "types";
+// helper
+import { getStatesList } from "helpers/state.helper";
+
+type Props = {
+  projectDetails: IProject | undefined;
+  handleChange: (formData: Partial<IProject>) => Promise<void>;
+};
+
+export const AutoCloseAutomation: React.FC<Props> = ({ projectDetails, handleChange }) => {
+  const [monthModal, setmonthModal] = useState(false);
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { data: stateGroups } = useSWR(
+    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
+    workspaceSlug && projectId
+      ? () => stateService.getStates(workspaceSlug as string, projectId as string)
+      : null
+  );
+  const states = getStatesList(stateGroups);
+
+  const options = states
+    ?.filter((state) => state.group === "cancelled")
+    .map((state) => ({
+      value: state.id,
+      query: state.name,
+      content: (
+        <div className="flex items-center gap-2">
+          {getStateGroupIcon(state.group, "16", "16", state.color)}
+          {state.name}
+        </div>
+      ),
+    }));
+
+  const multipleOptions = (options ?? []).length > 1;
+
+  const defaultState = stateGroups && stateGroups.cancelled ? stateGroups.cancelled[0].id : null;
+
+  const selectedOption = states?.find(
+    (s) => s.id === projectDetails?.default_state ?? defaultState
+  );
+  const currentDefaultState = states?.find((s) => s.id === defaultState);
+
+  const initialValues: Partial<IProject> = {
+    close_in: 1,
+    default_state: defaultState,
+  };
+
+  return (
+    <>
+      <SelectMonthModal
+        type="auto-close"
+        initialValues={initialValues}
+        isOpen={monthModal}
+        handleClose={() => setmonthModal(false)}
+        handleChange={handleChange}
+      />
+
+      <div className="flex flex-col gap-7 px-6 py-5 rounded-[10px] border border-custom-border-300 bg-custom-background-90">
+        <div className="flex items-center justify-between gap-x-8 gap-y-2 ">
+          <div className="flex flex-col gap-2.5">
+            <h4 className="text-lg font-semibold">Auto-close inactive issues</h4>
+            <p className="text-sm text-custom-text-200">
+              Plane will automatically close the issues that have not been updated for the
+              configured time period.
+            </p>
+          </div>
+          <ToggleSwitch
+            value={projectDetails?.close_in !== 0}
+            onChange={() =>
+              projectDetails?.close_in === 0
+                ? handleChange({ close_in: 1, default_state: defaultState })
+                : handleChange({ close_in: 0, default_state: null })
+            }
+            size="sm"
+          />
+        </div>
+        {projectDetails?.close_in !== 0 && (
+          <div className="flex flex-col gap-4 w-full">
+            <div className="flex items-center justify-between gap-2 w-full">
+              <div className="w-1/2 text-base font-medium">
+                Auto-close issues that are inactive for
+              </div>
+              <div className="w-1/2">
+                <CustomSelect
+                  value={projectDetails?.close_in}
+                  label={`${projectDetails?.close_in} ${
+                    projectDetails?.close_in === 1 ? "Month" : "Months"
+                  }`}
+                  onChange={(val: number) => {
+                    handleChange({ close_in: val });
+                  }}
+                  input
+                  width="w-full"
+                >
+                  <>
+                    {PROJECT_AUTOMATION_MONTHS.map((month) => (
+                      <CustomSelect.Option key={month.label} value={month.value}>
+                        {month.label}
+                      </CustomSelect.Option>
+                    ))}
+                    <button
+                      type="button"
+                      className="flex w-full select-none items-center rounded px-1 py-1.5 text-custom-text-200 hover:bg-custom-background-80"
+                      onClick={() => setmonthModal(true)}
+                    >
+                      Customize Time Range
+                    </button>
+                  </>
+                </CustomSelect>
+              </div>
+            </div>
+            <div className="flex items-center justify-between gap-2 w-full">
+              <div className="w-1/2 text-base font-medium">Auto-close Status</div>
+              <div className="w-1/2 ">
+                <CustomSearchSelect
+                  value={
+                    projectDetails?.default_state ? projectDetails?.default_state : defaultState
+                  }
+                  label={
+                    <div className="flex items-center gap-2">
+                      {selectedOption ? (
+                        getStateGroupIcon(selectedOption.group, "16", "16", selectedOption.color)
+                      ) : currentDefaultState ? (
+                        getStateGroupIcon(
+                          currentDefaultState.group,
+                          "16",
+                          "16",
+                          currentDefaultState.color
+                        )
+                      ) : (
+                        <Squares2X2Icon className="h-3.5 w-3.5 text-custom-text-200" />
+                      )}
+                      {selectedOption?.name
+                        ? selectedOption.name
+                        : currentDefaultState?.name ?? (
+                            <span className="text-custom-text-200">State</span>
+                          )}
+                    </div>
+                  }
+                  onChange={(val: string) => {
+                    handleChange({ default_state: val });
+                  }}
+                  options={options}
+                  disabled={!multipleOptions}
+                  width="w-full"
+                  input
+                />
+              </div>
+            </div>
+          </div>
+        )}
+      </div>
+    </>
+  );
+};
@@ -104,7 +104,7 @@ export const SelectMonthModal: React.FC<Props> = ({
                      as="h3"
                      className="text-lg font-medium leading-6 text-custom-text-100"
                    >
-                      Customise Time Range
+                      Customize Time Range
                    </Dialog.Title>
                    <div className="mt-8 flex items-center gap-2">
                      <div className="flex w-full flex-col gap-1 justify-center">
@@ -10,7 +10,7 @@ import { Command } from "cmdk";
 import { Dialog, Transition } from "@headlessui/react";
 // services
 import workspaceService from "services/workspace.service";
-import issuesService from "services/issue.service";
+import issuesService from "services/issues.service";
 import inboxService from "services/inbox.service";
 // hooks
 import useProjectDetails from "hooks/use-project-details";
@@ -79,13 +79,16 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
  const { data: issueDetails } = useSWR(
    workspaceSlug && projectId && issueId ? ISSUE_DETAILS(issueId as string) : null,
    workspaceSlug && projectId && issueId
-      ? () => issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
+      ? () =>
+          issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
      : null
  );

  const { data: inboxList } = useSWR(
    workspaceSlug && projectId ? INBOX_LIST(projectId as string) : null,
-    workspaceSlug && projectId ? () => inboxService.getInboxes(workspaceSlug as string, projectId as string) : null
+    workspaceSlug && projectId
+      ? () => inboxService.getInboxes(workspaceSlug as string, projectId as string)
+      : null
  );

  const updateIssue = useCallback(
@@ -269,7 +272,8 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                >
                  {issueDetails && (
                    <div className="overflow-hidden truncate rounded-md bg-custom-background-80 p-2 text-xs font-medium text-custom-text-200">
-                      {issueDetails.project_detail.identifier}-{issueDetails.sequence_id} {issueDetails.name}
+                      {issueDetails.project_detail.identifier}-{issueDetails.sequence_id}{" "}
+                      {issueDetails.name}
                    </div>
                  )}
                  {projectId && (
@@ -320,9 +324,12 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                    </h5>
                  )}

-                  {!isLoading && resultsCount === 0 && searchTerm !== "" && debouncedSearchTerm !== "" && (
-                    <div className="my-4 text-center text-custom-text-200">No results found.</div>
-                  )}
+                  {!isLoading &&
+                    resultsCount === 0 &&
+                    searchTerm !== "" &&
+                    debouncedSearchTerm !== "" && (
+                      <div className="my-4 text-center text-custom-text-200">No results found.</div>
+                    )}

                  {(isLoading || isSearching) && (
                    <Command.Loading>
@@ -355,7 +362,9 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                              >
                                <div className="flex items-center gap-2 overflow-hidden text-custom-text-200">
                                  <Icon iconName={currentSection.icon} />
-                                  <p className="block flex-1 truncate">{currentSection.itemName(item)}</p>
+                                  <p className="block flex-1 truncate">
+                                    {currentSection.itemName(item)}
+                                  </p>
                                </div>
                              </Command.Item>
                            ))}
@@ -568,7 +577,9 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                              <Command.Item
                                onSelect={() => {
                                  setIsPaletteOpen(false);
-                                  redirect(`/${workspaceSlug}/projects/${projectId}/inbox/${inboxList?.[0]?.id}`);
+                                  redirect(
+                                    `/${workspaceSlug}/projects/${projectId}/inbox/${inboxList?.[0]?.id}`
+                                  );
                                }}
                                className="focus:outline-none"
                              >
@@ -661,7 +672,10 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                        <Command.Item
                          onSelect={() => {
                            setIsPaletteOpen(false);
-                            window.open("https://github.com/makeplane/plane/issues/new/choose", "_blank");
+                            window.open(
+                              "https://github.com/makeplane/plane/issues/new/choose",
+                              "_blank"
+                            );
                          }}
                          className="focus:outline-none"
                        >
@@ -745,15 +759,29 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                    </>
                  )}
                  {page === "change-issue-state" && issueDetails && (
-                    <ChangeIssueState issue={issueDetails} setIsPaletteOpen={setIsPaletteOpen} user={user} />
+                    <ChangeIssueState
+                      issue={issueDetails}
+                      setIsPaletteOpen={setIsPaletteOpen}
+                      user={user}
+                    />
                  )}
                  {page === "change-issue-priority" && issueDetails && (
-                    <ChangeIssuePriority issue={issueDetails} setIsPaletteOpen={setIsPaletteOpen} user={user} />
+                    <ChangeIssuePriority
+                      issue={issueDetails}
+                      setIsPaletteOpen={setIsPaletteOpen}
+                      user={user}
+                    />
                  )}
                  {page === "change-issue-assignee" && issueDetails && (
-                    <ChangeIssueAssignee issue={issueDetails} setIsPaletteOpen={setIsPaletteOpen} user={user} />
+                    <ChangeIssueAssignee
+                      issue={issueDetails}
+                      setIsPaletteOpen={setIsPaletteOpen}
+                      user={user}
+                    />
+                  )}
+                  {page === "change-interface-theme" && (
+                    <ChangeInterfaceTheme setIsPaletteOpen={setIsPaletteOpen} />
                  )}
-                  {page === "change-interface-theme" && <ChangeInterfaceTheme setIsPaletteOpen={setIsPaletteOpen} />}
                </Command.List>
              </Command>
            </Dialog.Panel>
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from "react";
+
 import { useRouter } from "next/router";
 import useSWR from "swr";
-import { observer } from "mobx-react-lite";
 // hooks
 import useToast from "hooks/use-toast";
 import useUser from "hooks/use-user";
@@ -17,11 +17,14 @@ import { CreateUpdatePageModal } from "components/pages";
 // helpers
 import { copyTextToClipboard } from "helpers/string.helper";
 // services
-import issuesService from "services/issue.service";
+import issuesService from "services/issues.service";
+import inboxService from "services/inbox.service";
 // fetch keys
-import { ISSUE_DETAILS } from "constants/fetch-keys";
+import { INBOX_LIST, ISSUE_DETAILS } from "constants/fetch-keys";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
+import { observable } from "mobx";
+import { observer } from "mobx-react-lite";

 export const CommandPalette: React.FC = observer(() => {
  const store: any = useMobxStore();
@@ -38,7 +41,7 @@ export const CommandPalette: React.FC = observer(() => {
  const [isCreateUpdatePageModalOpen, setIsCreateUpdatePageModalOpen] = useState(false);

  const router = useRouter();
-  const { workspaceSlug, projectId, issueId, inboxId, cycleId, moduleId } = router.query;
+  const { workspaceSlug, projectId, issueId, inboxId } = router.query;

  const { user } = useUser();

@@ -47,7 +50,8 @@ export const CommandPalette: React.FC = observer(() => {
  const { data: issueDetails } = useSWR(
    workspaceSlug && projectId && issueId ? ISSUE_DETAILS(issueId as string) : null,
    workspaceSlug && projectId && issueId
-      ? () => issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
+      ? () =>
+        issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
      : null
  );

@@ -72,7 +76,7 @@ export const CommandPalette: React.FC = observer(() => {

  const handleKeyDown = useCallback(
    (e: KeyboardEvent) => {
-      const { key, ctrlKey, metaKey, altKey } = e;
+      const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
      if (!key) return;

      const keyPressed = key.toLowerCase();
@@ -85,37 +89,37 @@ export const CommandPalette: React.FC = observer(() => {
      )
        return;

-      if (cmdClicked) {
-        if (keyPressed === "k") {
-          e.preventDefault();
-          setIsPaletteOpen(true);
-        } else if (keyPressed === "c" && altKey) {
-          e.preventDefault();
-          copyIssueUrlToClipboard();
-        } else if (keyPressed === "b") {
-          e.preventDefault();
-          store.theme.setSidebarCollapsed(!store?.theme?.sidebarCollapsed);
+        if (cmdClicked) {
+          if (keyPressed === "k") {
+            e.preventDefault();
+            setIsPaletteOpen(true);
+          } else if (keyPressed === "c" && altKey) {
+            e.preventDefault();
+            copyIssueUrlToClipboard();
+          } else if (keyPressed === "b") {
+            e.preventDefault();
+            store.theme.setSidebarCollapsed(!store?.theme?.sidebarCollapsed);
+          }
+        } else {
+          if (keyPressed === "c") {
+            setIsIssueModalOpen(true);
+          } else if (keyPressed === "p") {
+            setIsProjectModalOpen(true);
+          } else if (keyPressed === "v") {
+            setIsCreateViewModalOpen(true);
+          } else if (keyPressed === "d") {
+            setIsCreateUpdatePageModalOpen(true);
+          } else if (keyPressed === "h") {
+            setIsShortcutsModalOpen(true);
+          } else if (keyPressed === "q") {
+            setIsCreateCycleModalOpen(true);
+          } else if (keyPressed === "m") {
+            setIsCreateModuleModalOpen(true);
+          } else if (keyPressed === "backspace" || keyPressed === "delete") {
+            e.preventDefault();
+            setIsBulkDeleteIssuesModalOpen(true);
+          }
        }
-      } else {
-        if (keyPressed === "c") {
-          setIsIssueModalOpen(true);
-        } else if (keyPressed === "p") {
-          setIsProjectModalOpen(true);
-        } else if (keyPressed === "v") {
-          setIsCreateViewModalOpen(true);
-        } else if (keyPressed === "d") {
-          setIsCreateUpdatePageModalOpen(true);
-        } else if (keyPressed === "h") {
-          setIsShortcutsModalOpen(true);
-        } else if (keyPressed === "q") {
-          setIsCreateCycleModalOpen(true);
-        } else if (keyPressed === "m") {
-          setIsCreateModuleModalOpen(true);
-        } else if (keyPressed === "backspace" || keyPressed === "delete") {
-          e.preventDefault();
-          setIsBulkDeleteIssuesModalOpen(true);
-        }
-      }
    },
    [copyIssueUrlToClipboard]
  );
@@ -137,7 +141,11 @@ export const CommandPalette: React.FC = observer(() => {
    <>
      <ShortcutsModal isOpen={isShortcutsModalOpen} setIsOpen={setIsShortcutsModalOpen} />
      {workspaceSlug && (
-        <CreateProjectModal isOpen={isProjectModalOpen} setIsOpen={setIsProjectModalOpen} user={user} />
+        <CreateProjectModal
+          isOpen={isProjectModalOpen}
+          setIsOpen={setIsProjectModalOpen}
+          user={user}
+        />
      )}
      {projectId && (
        <>
@@ -175,16 +183,17 @@ export const CommandPalette: React.FC = observer(() => {
        isOpen={isIssueModalOpen}
        handleClose={() => setIsIssueModalOpen(false)}
        fieldsToShow={inboxId ? ["name", "description", "priority"] : ["all"]}
-        prePopulateData={
-          cycleId ? { cycle: cycleId.toString() } : moduleId ? { module: moduleId.toString() } : undefined
-        }
      />
      <BulkDeleteIssuesModal
        isOpen={isBulkDeleteIssuesModalOpen}
        setIsOpen={setIsBulkDeleteIssuesModalOpen}
        user={user}
      />
-      <CommandK deleteIssue={deleteIssue} isPaletteOpen={isPaletteOpen} setIsPaletteOpen={setIsPaletteOpen} />
+      <CommandK
+        deleteIssue={deleteIssue}
+        isPaletteOpen={isPaletteOpen}
+        setIsPaletteOpen={setIsPaletteOpen}
+      />
    </>
  );
-});
+})
@@ -7,7 +7,7 @@ import { mutate } from "swr";
 // cmdk
 import { Command } from "cmdk";
 // services
-import issuesService from "services/issue.service";
+import issuesService from "services/issues.service";
 // hooks
 import useProjectMembers from "hooks/use-project-members";
 // constants
@@ -1,20 +1,18 @@
-import React, { Dispatch, SetStateAction, useCallback } from "react";
-
 import { useRouter } from "next/router";
-
+import React, { Dispatch, SetStateAction, useCallback } from "react";
 import { mutate } from "swr";

 // cmdk
 import { Command } from "cmdk";
 // services
-import issuesService from "services/issue.service";
+import issuesService from "services/issues.service";
 // types
-import { ICurrentUserResponse, IIssue, TIssuePriorities } from "types";
+import { ICurrentUserResponse, IIssue } from "types";
 // constants
 import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY } from "constants/fetch-keys";
 import { PRIORITIES } from "constants/project";
 // icons
-import { CheckIcon, PriorityIcon } from "components/icons";
+import { CheckIcon, getPriorityIcon } from "components/icons";

 type Props = {
  setIsPaletteOpen: Dispatch<SetStateAction<boolean>>;
@@ -56,7 +54,7 @@ export const ChangeIssuePriority: React.FC<Props> = ({ setIsPaletteOpen, issue,
    [workspaceSlug, issueId, projectId, user]
  );

-  const handleIssueState = (priority: TIssuePriorities) => {
+  const handleIssueState = (priority: string | null) => {
    submitChanges({ priority });
    setIsPaletteOpen(false);
  };
@@ -64,9 +62,13 @@ export const ChangeIssuePriority: React.FC<Props> = ({ setIsPaletteOpen, issue,
  return (
    <>
      {PRIORITIES.map((priority) => (
-        <Command.Item key={priority} onSelect={() => handleIssueState(priority)} className="focus:outline-none">
+        <Command.Item
+          key={priority}
+          onSelect={() => handleIssueState(priority)}
+          className="focus:outline-none"
+        >
          <div className="flex items-center space-x-3">
-            <PriorityIcon priority={priority} />
+            {getPriorityIcon(priority)}
            <span className="capitalize">{priority ?? "None"}</span>
          </div>
          <div>{priority === issue.priority && <CheckIcon className="h-3 w-3" />}</div>
@@ -1,24 +1,22 @@
-import React, { Dispatch, SetStateAction, useCallback } from "react";
-
 import { useRouter } from "next/router";
-
+import React, { Dispatch, SetStateAction, useCallback } from "react";
 import useSWR, { mutate } from "swr";

 // cmdk
 import { Command } from "cmdk";
-// services
-import issuesService from "services/issue.service";
-import stateService from "services/project_state.service";
 // ui
 import { Spinner } from "components/ui";
-// icons
-import { CheckIcon, StateGroupIcon } from "components/icons";
 // helpers
 import { getStatesList } from "helpers/state.helper";
+// services
+import issuesService from "services/issues.service";
+import stateService from "services/state.service";
 // types
 import { ICurrentUserResponse, IIssue } from "types";
 // fetch keys
 import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY, STATES_LIST } from "constants/fetch-keys";
+// icons
+import { CheckIcon, getStateGroupIcon } from "components/icons";

 type Props = {
  setIsPaletteOpen: Dispatch<SetStateAction<boolean>>;
@@ -32,7 +30,9 @@ export const ChangeIssueState: React.FC<Props> = ({ setIsPaletteOpen, issue, use

  const { data: stateGroups, mutate: mutateIssueDetails } = useSWR(
    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
-    workspaceSlug && projectId ? () => stateService.getStates(workspaceSlug as string, projectId as string) : null
+    workspaceSlug && projectId
+      ? () => stateService.getStates(workspaceSlug as string, projectId as string)
+      : null
  );
  const states = getStatesList(stateGroups);

@@ -76,9 +76,13 @@ export const ChangeIssueState: React.FC<Props> = ({ setIsPaletteOpen, issue, use
      {states ? (
        states.length > 0 ? (
          states.map((state) => (
-            <Command.Item key={state.id} onSelect={() => handleIssueState(state.id)} className="focus:outline-none">
+            <Command.Item
+              key={state.id}
+              onSelect={() => handleIssueState(state.id)}
+              className="focus:outline-none"
+            >
              <div className="flex items-center space-x-3">
-                <StateGroupIcon stateGroup={state.group} color={state.color} height="16px" width="16px" />
+                {getStateGroupIcon(state.group, "16", "16", state.color)}
                <p>{state.name}</p>
              </div>
              <div>{state.id === issue.state && <CheckIcon className="h-3 w-3" />}</div>
@@ -22,6 +22,8 @@ const shortcuts = [
      { keys: "↓", description: "Move down" },
      { keys: "←", description: "Move left" },
      { keys: "→", description: "Move right" },
+      { keys: "Enter", description: "Select" },
+      { keys: "Esc", description: "Close" },
    ],
  },
  {
@@ -1,35 +1,34 @@
 import { useRouter } from "next/router";

-import useSWR from "swr";
-
-// services
-import issuesService from "services/issue.service";
 // icons
 import { Icon, Tooltip } from "components/ui";
-import { CopyPlus } from "lucide-react";
 import { Squares2X2Icon } from "@heroicons/react/24/outline";
-import { BlockedIcon, BlockerIcon, RelatedIcon } from "components/icons";
+import { BlockedIcon, BlockerIcon } from "components/icons";
 // helpers
 import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
 import { capitalizeFirstLetter } from "helpers/string.helper";
 // types
 import { IIssueActivity } from "types";
-// fetch-keys
-import { WORKSPACE_LABELS } from "constants/fetch-keys";

 const IssueLink = ({ activity }: { activity: IIssueActivity }) => {
  const router = useRouter();
  const { workspaceSlug } = router.query;

  return (
-    <Tooltip tooltipContent={activity.issue_detail ? activity.issue_detail.name : "This issue has been deleted"}>
+    <Tooltip
+      tooltipContent={
+        activity.issue_detail ? activity.issue_detail.name : "This issue has been deleted"
+      }
+    >
      <a
        href={`/${workspaceSlug}/projects/${activity.project}/issues/${activity.issue}`}
        target="_blank"
        rel="noopener noreferrer"
        className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
      >
-        {activity.issue_detail ? `${activity.project_detail.identifier}-${activity.issue_detail.sequence_id}` : "Issue"}
+        {activity.issue_detail
+          ? `${activity.project_detail.identifier}-${activity.issue_detail.sequence_id}`
+          : "Issue"}
        <Icon iconName="launch" className="!text-xs" />
      </a>
    </Tooltip>
@@ -52,29 +51,13 @@ const UserLink = ({ activity }: { activity: IIssueActivity }) => {
  );
 };

-const LabelPill = ({ labelId }: { labelId: string }) => {
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { data: labels } = useSWR(
-    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
-    workspaceSlug ? () => issuesService.getWorkspaceLabels(workspaceSlug.toString()) : null
-  );
-
-  return (
-    <span
-      className="h-1.5 w-1.5 rounded-full"
-      style={{
-        backgroundColor: labels?.find((l) => l.id === labelId)?.color ?? "#000000",
-      }}
-      aria-hidden="true"
-    />
-  );
-};
-
 const activityDetails: {
  [key: string]: {
-    message: (activity: IIssueActivity, showIssue: boolean, workspaceSlug: string) => React.ReactNode;
+    message: (
+      activity: IIssueActivity,
+      showIssue: boolean,
+      workspaceSlug: string
+    ) => React.ReactNode;
    icon: React.ReactNode;
  };
 } = {
@@ -107,14 +90,14 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="group" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
  },
  archived_at: {
    message: (activity) => {
      if (activity.new_value === "restore") return "restored the issue.";
      else return "archived the issue.";
    },
-    icon: <Icon iconName="archive" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="archive" className="!text-sm" aria-hidden="true" />,
  },
  attachment: {
    message: (activity, showIssue) => {
@@ -153,7 +136,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="attach_file" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
  },
  blocking: {
    message: (activity) => {
@@ -167,13 +150,14 @@ const activityDetails: {
      else
        return (
          <>
-            removed the blocking issue <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
+            removed the blocking issue{" "}
+            <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
          </>
        );
    },
    icon: <BlockerIcon height="12" width="12" color="#6b7280" />,
  },
-  blocked_by: {
+  blocks: {
    message: (activity) => {
      if (activity.old_value === "")
        return (
@@ -192,43 +176,6 @@ const activityDetails: {
    },
    icon: <BlockedIcon height="12" width="12" color="#6b7280" />,
  },
-  duplicate: {
-    message: (activity) => {
-      if (activity.old_value === "")
-        return (
-          <>
-            marked this issue as duplicate of{" "}
-            <span className="font-medium text-custom-text-100">{activity.new_value}</span>.
-          </>
-        );
-      else
-        return (
-          <>
-            removed this issue as a duplicate of{" "}
-            <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
-          </>
-        );
-    },
-    icon: <CopyPlus size={12} color="#6b7280" />,
-  },
-  relates_to: {
-    message: (activity) => {
-      if (activity.old_value === "")
-        return (
-          <>
-            marked that this issue relates to{" "}
-            <span className="font-medium text-custom-text-100">{activity.new_value}</span>.
-          </>
-        );
-      else
-        return (
-          <>
-            removed the relation from <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
-          </>
-        );
-    },
-    icon: <RelatedIcon height="12" width="12" color="#6b7280" />,
-  },
  cycles: {
    message: (activity, showIssue, workspaceSlug) => {
      if (activity.verb === "created")
@@ -277,7 +224,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="contrast" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
  },
  description: {
    message: (activity, showIssue) => (
@@ -292,7 +239,7 @@ const activityDetails: {
        .
      </>
    ),
-    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
  },
  estimate_point: {
    message: (activity, showIssue) => {
@@ -312,7 +259,8 @@ const activityDetails: {
      else
        return (
          <>
-            set the estimate point to <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+            set the estimate point to{" "}
+            <span className="font-medium text-custom-text-100">{activity.new_value}</span>
            {showIssue && (
              <>
                {" "}
@@ -323,14 +271,14 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="change_history" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
  },
  issue: {
    message: (activity) => {
      if (activity.verb === "created") return "created the issue.";
      else return "deleted an issue.";
    },
-    icon: <Icon iconName="stack" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="stack" className="!text-sm" aria-hidden="true" />,
  },
  labels: {
    message: (activity, showIssue) => {
@@ -338,8 +286,14 @@ const activityDetails: {
        return (
          <>
            added a new label{" "}
-            <span className="inline-flex items-center gap-2 rounded-full border border-custom-border-300 px-2 py-0.5 text-xs">
-              <LabelPill labelId={activity.new_identifier ?? ""} />
+            <span className="inline-flex items-center gap-3 rounded-full border border-custom-border-300 px-2 py-0.5 text-xs">
+              <span
+                className="h-1.5 w-1.5 rounded-full"
+                style={{
+                  backgroundColor: "#000000",
+                }}
+                aria-hidden="true"
+              />
              <span className="font-medium text-custom-text-100">{activity.new_value}</span>
            </span>
            {showIssue && (
@@ -355,7 +309,13 @@ const activityDetails: {
          <>
            removed the label{" "}
            <span className="inline-flex items-center gap-3 rounded-full border border-custom-border-300 px-2 py-0.5 text-xs">
-              <LabelPill labelId={activity.old_identifier ?? ""} />
+              <span
+                className="h-1.5 w-1.5 rounded-full"
+                style={{
+                  backgroundColor: "#000000",
+                }}
+                aria-hidden="true"
+              />
              <span className="font-medium text-custom-text-100">{activity.old_value}</span>
            </span>
            {showIssue && (
@@ -367,7 +327,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="sell" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
  },
  link: {
    message: (activity, showIssue) => {
@@ -393,28 +353,6 @@ const activityDetails: {
            .
          </>
        );
-      else if (activity.verb === "updated")
-        return (
-          <>
-            updated the{" "}
-            <a
-              href={`${activity.old_value}`}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
-            >
-              link
-              <Icon iconName="launch" className="!text-xs" />
-            </a>
-            {showIssue && (
-              <>
-                {" "}
-                from <IssueLink activity={activity} />
-              </>
-            )}
-            .
-          </>
-        );
      else
        return (
          <>
@@ -438,7 +376,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="link" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
  },
  modules: {
    message: (activity, showIssue, workspaceSlug) => {
@@ -488,7 +426,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="dataset" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
  },
  name: {
    message: (activity, showIssue) => (
@@ -503,14 +441,15 @@ const activityDetails: {
        .
      </>
    ),
-    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
  },
  parent: {
    message: (activity, showIssue) => {
      if (!activity.new_value)
        return (
          <>
-            removed the parent <span className="font-medium text-custom-text-100">{activity.old_value}</span>
+            removed the parent{" "}
+            <span className="font-medium text-custom-text-100">{activity.old_value}</span>
            {showIssue && (
              <>
                {" "}
@@ -523,7 +462,8 @@ const activityDetails: {
      else
        return (
          <>
-            set the parent to <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+            set the parent to{" "}
+            <span className="font-medium text-custom-text-100">{activity.new_value}</span>
            {showIssue && (
              <>
                {" "}
@@ -534,7 +474,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="supervised_user_circle" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
  },
  priority: {
    message: (activity, showIssue) => (
@@ -552,7 +492,7 @@ const activityDetails: {
        .
      </>
    ),
-    icon: <Icon iconName="signal_cellular_alt" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
  },
  start_date: {
    message: (activity, showIssue) => {
@@ -586,12 +526,13 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
  },
  state: {
    message: (activity, showIssue) => (
      <>
-        set the state to <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+        set the state to{" "}
+        <span className="font-medium text-custom-text-100">{activity.new_value}</span>
        {showIssue && (
          <>
            {" "}
@@ -601,7 +542,7 @@ const activityDetails: {
        .
      </>
    ),
-    icon: <Squares2X2Icon className="h-6 w-6 text-custom-sidebar-200" aria-hidden="true" />,
+    icon: <Squares2X2Icon className="h-3 w-3" aria-hidden="true" />,
  },
  target_date: {
    message: (activity, showIssue) => {
@@ -635,7 +576,7 @@ const activityDetails: {
          </>
        );
    },
-    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
  },
 };

@@ -643,7 +584,13 @@ export const ActivityIcon = ({ activity }: { activity: IIssueActivity }) => (
  <>{activityDetails[activity.field as keyof typeof activityDetails]?.icon}</>
 );

-export const ActivityMessage = ({ activity, showIssue = false }: { activity: IIssueActivity; showIssue?: boolean }) => {
+export const ActivityMessage = ({
+  activity,
+  showIssue = false,
+}: {
+  activity: IIssueActivity;
+  showIssue?: boolean;
+}) => {
  const router = useRouter();
  const { workspaceSlug } = router.query;

@@ -1,8 +1,15 @@
 import { Fragment } from "react";
-import { Controller, useForm } from "react-hook-form";
-import DatePicker from "react-datepicker";
-import { Dialog, Transition } from "@headlessui/react";

+import { useRouter } from "next/router";
+
+// react-hook-form
+import { Controller, useForm } from "react-hook-form";
+// react-datepicker
+import DatePicker from "react-datepicker";
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// hooks
+import useIssuesView from "hooks/use-issues-view";
 // components
 import { DateFilterSelect } from "./date-filter-select";
 // ui
@@ -11,12 +18,13 @@ import { PrimaryButton, SecondaryButton } from "components/ui";
 import { XMarkIcon } from "@heroicons/react/20/solid";
 // helpers
 import { renderDateFormat, renderShortDateWithYearFormat } from "helpers/date-time.helper";
+import { IIssueFilterOptions } from "types";

 type Props = {
  title: string;
-  handleClose: () => void;
+  field: keyof IIssueFilterOptions;
  isOpen: boolean;
-  onSelect: (val: string[]) => void;
+  handleClose: () => void;
 };

 type TFormValues = {
@@ -31,7 +39,12 @@ const defaultValues: TFormValues = {
  date2: new Date(new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()),
 };

-export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, onSelect }) => {
+export const DateFilterModal: React.FC<Props> = ({ title, field, isOpen, handleClose }) => {
+  const { filters, setFilters } = useIssuesView();
+
+  const router = useRouter();
+  const { viewId } = router.query;
+
  const { handleSubmit, watch, control } = useForm<TFormValues>({
    defaultValues,
  });
@@ -39,13 +52,37 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
  const handleFormSubmit = (formData: TFormValues) => {
    const { filterType, date1, date2 } = formData;

-    if (filterType === "range") onSelect([`${renderDateFormat(date1)};after`, `${renderDateFormat(date2)};before`]);
-    else onSelect([`${renderDateFormat(date1)};${filterType}`]);
+    if (filterType === "range") {
+      setFilters(
+        { [field]: [`${renderDateFormat(date1)};after`, `${renderDateFormat(date2)};before`] },
+        !Boolean(viewId)
+      );
+    } else {
+      const filteredArray = (filters?.[field] as string[])?.filter((item) => {
+        if (item?.includes(filterType)) return false;

+        return true;
+      });
+
+      const filterOne = filteredArray && filteredArray?.length > 0 ? filteredArray[0] : null;
+      if (filterOne)
+        setFilters(
+          { [field]: [filterOne, `${renderDateFormat(date1)};${filterType}`] },
+          !Boolean(viewId)
+        );
+      else
+        setFilters(
+          {
+            [field]: [`${renderDateFormat(date1)};${filterType}`],
+          },
+          !Boolean(viewId)
+        );
+    }
    handleClose();
  };

-  const isInvalid = watch("filterType") === "range" ? new Date(watch("date1")) > new Date(watch("date2")) : false;
+  const isInvalid =
+    watch("filterType") === "range" ? new Date(watch("date1")) > new Date(watch("date2")) : false;

  const nextDay = new Date(watch("date1"));
  nextDay.setDate(nextDay.getDate() + 1);
@@ -85,7 +122,10 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                        <DateFilterSelect title={title} value={value} onChange={onChange} />
                      )}
                    />
-                    <XMarkIcon className="border-base h-4 w-4 cursor-pointer" onClick={handleClose} />
+                    <XMarkIcon
+                      className="border-base h-4 w-4 cursor-pointer"
+                      onClick={handleClose}
+                    />
                  </div>
                  <div className="flex w-full justify-between gap-4">
                    <Controller
@@ -130,7 +170,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                    <SecondaryButton className="flex items-center gap-2" onClick={handleClose}>
                      Cancel
                    </SecondaryButton>
-                    <PrimaryButton type="submit" className="flex items-center gap-2" disabled={isInvalid}>
+                    <PrimaryButton
+                      type="submit"
+                      className="flex items-center gap-2"
+                      disabled={isInvalid}
+                    >
                      Apply
                    </PrimaryButton>
                  </div>
@@ -2,7 +2,7 @@ import React from "react";

 // icons
 import { XMarkIcon } from "@heroicons/react/24/outline";
-import { PriorityIcon, StateGroupIcon } from "components/icons";
+import { getPriorityIcon, getStateGroupIcon } from "components/icons";
 // ui
 import { Avatar } from "components/ui";
 // helpers
@@ -71,10 +71,12 @@ export const FiltersList: React.FC<Props> = ({
                            }}
                          >
                            <span>
-                              <StateGroupIcon
-                                stateGroup={state?.group ?? "backlog"}
-                                color={state?.color}
-                              />
+                              {getStateGroupIcon(
+                                state?.group ?? "backlog",
+                                "12",
+                                "12",
+                                state?.color
+                              )}
                            </span>
                            <span>{state?.name ?? ""}</span>
                            <span
@@ -103,9 +105,7 @@ export const FiltersList: React.FC<Props> = ({
                              backgroundColor: `${STATE_GROUP_COLORS[group]}20`,
                            }}
                          >
-                            <span>
-                              <StateGroupIcon stateGroup={group} color={undefined} />
-                            </span>
+                            <span>{getStateGroupIcon(group, "16", "16")}</span>
                            <span>{group}</span>
                            <span
                              className="cursor-pointer"
@@ -136,9 +136,7 @@ export const FiltersList: React.FC<Props> = ({
                              : "bg-custom-background-90 text-custom-text-200"
                          }`}
                        >
-                          <span>
-                            <PriorityIcon priority={priority} />
-                          </span>
+                          <span>{getPriorityIcon(priority)}</span>
                          <span>{priority === "null" ? "None" : priority}</span>
                          <span
                            className="cursor-pointer"
@@ -25,11 +25,11 @@ import {
 import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { Properties, TIssueLayouts } from "types";
+import { Properties, TIssueViewOptions } from "types";
 // constants
-import { ISSUE_GROUP_BY_OPTIONS, ISSUE_ORDER_BY_OPTIONS, ISSUE_FILTER_OPTIONS } from "constants/issue";
+import { GROUP_BY_OPTIONS, ORDER_BY_OPTIONS, FILTER_ISSUE_OPTIONS } from "constants/issue";

-const issueViewOptions: { type: TIssueLayouts; Icon: any }[] = [
+const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
  {
    type: "list",
    Icon: FormatListBulletedOutlined,
@@ -52,76 +52,55 @@ const issueViewOptions: { type: TIssueLayouts; Icon: any }[] = [
  },
 ];

-const issueViewForDraftIssues: { type: TIssueLayouts; Icon: any }[] = [
-  {
-    type: "list",
-    Icon: FormatListBulletedOutlined,
-  },
-  {
-    type: "kanban",
-    Icon: GridViewOutlined,
-  },
-];
-
 export const IssuesFilterView: React.FC = () => {
  const router = useRouter();
  const { workspaceSlug, projectId, viewId } = router.query;
  const isArchivedIssues = router.pathname.includes("archived-issues");
-  const isDraftIssues = router.pathname.includes("draft-issues");

-  const { displayFilters, setDisplayFilters, filters, setFilters, resetFilterToDefault, setNewFilterDefaultView } =
-    useIssuesView();
+  const {
+    issueView,
+    setIssueView,
+    groupByProperty,
+    setGroupByProperty,
+    orderBy,
+    setOrderBy,
+    showEmptyGroups,
+    showSubIssues,
+    setShowSubIssues,
+    setShowEmptyGroups,
+    filters,
+    setFilters,
+    resetFilterToDefault,
+    setNewFilterDefaultView,
+  } = useIssuesView();

-  const [properties, setProperties] = useIssuesProperties(workspaceSlug as string, projectId as string);
+  const [properties, setProperties] = useIssuesProperties(
+    workspaceSlug as string,
+    projectId as string
+  );

  const { isEstimateActive } = useEstimateOption();

  return (
    <div className="flex items-center gap-2">
-      {!isArchivedIssues && !isDraftIssues && (
+      {!isArchivedIssues && (
        <div className="flex items-center gap-x-1">
          {issueViewOptions.map((option) => (
            <Tooltip
              key={option.type}
-              tooltipContent={<span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>}
+              tooltipContent={
+                <span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>
+              }
              position="bottom"
            >
              <button
                type="button"
                className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
-                  displayFilters.layout === option.type
+                  issueView === option.type
                    ? "bg-custom-sidebar-background-80"
                    : "text-custom-sidebar-text-200"
                }`}
-                onClick={() => setDisplayFilters({ layout: option.type })}
-              >
-                <option.Icon
-                  sx={{
-                    fontSize: 16,
-                  }}
-                  className={option.type === "gantt_chart" ? "rotate-90" : ""}
-                />
-              </button>
-            </Tooltip>
-          ))}
-        </div>
-      )}
-      {isDraftIssues && (
-        <div className="flex items-center gap-x-1">
-          {issueViewForDraftIssues.map((option) => (
-            <Tooltip
-              key={option.type}
-              tooltipContent={<span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>}
-              position="bottom"
-            >
-              <button
-                type="button"
-                className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
-                  displayFilters.layout === option.type
-                    ? "bg-custom-sidebar-background-80"
-                    : "text-custom-sidebar-text-200"
-                }`}
-                onClick={() => setDisplayFilters({ layout: option.type })}
+                onClick={() => setIssueView(option.type)}
              >
                <option.Icon
                  sx={{
@@ -151,7 +130,9 @@ export const IssuesFilterView: React.FC = () => {
            if (valueExists)
              setFilters(
                {
-                  [option.key]: ((filters[key] ?? []) as any[])?.filter((val) => val !== option.value),
+                  [option.key]: ((filters[key] ?? []) as any[])?.filter(
+                    (val) => val !== option.value
+                  ),
                },
                !Boolean(viewId)
              );
@@ -172,10 +153,12 @@ export const IssuesFilterView: React.FC = () => {
          <>
            <Popover.Button
              className={`group flex items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
-                open ? "bg-custom-sidebar-background-90 text-custom-sidebar-text-100" : "text-custom-sidebar-text-200"
+                open
+                  ? "bg-custom-sidebar-background-90 text-custom-sidebar-text-100"
+                  : "text-custom-sidebar-text-200"
              }`}
            >
-              Display
+              View
              <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
            </Popover.Button>

@@ -191,32 +174,30 @@ export const IssuesFilterView: React.FC = () => {
              <Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-200 bg-custom-background-90 p-3 shadow-lg">
                <div className="relative divide-y-2 divide-custom-border-200">
                  <div className="space-y-4 pb-3 text-xs">
-                    {displayFilters.layout !== "calendar" &&
-                      displayFilters.layout !== "spreadsheet" &&
-                      displayFilters.layout !== "gantt_chart" && (
+                    {issueView !== "calendar" &&
+                      issueView !== "spreadsheet" &&
+                      issueView !== "gantt_chart" && (
                        <div className="flex items-center justify-between">
                          <h4 className="text-custom-text-200">Group by</h4>
                          <div className="w-28">
                            <CustomMenu
                              label={
-                                ISSUE_GROUP_BY_OPTIONS.find((option) => option.key === displayFilters.group_by)
-                                  ?.title ?? "Select"
+                                GROUP_BY_OPTIONS.find((option) => option.key === groupByProperty)
+                                  ?.name ?? "Select"
                              }
                              className="!w-full"
                              buttonClassName="w-full"
                            >
-                              {ISSUE_GROUP_BY_OPTIONS.map((option) => {
-                                if (displayFilters.layout === "kanban" && option.key === null) return null;
+                              {GROUP_BY_OPTIONS.map((option) => {
+                                if (issueView === "kanban" && option.key === null) return null;
                                if (option.key === "project") return null;

                                return (
                                  <CustomMenu.MenuItem
                                    key={option.key}
-                                    onClick={() => {
-                                      // setDisplayFilters({ group_by: option.key })
-                                    }}
+                                    onClick={() => setGroupByProperty(option.key)}
                                  >
-                                    {option.title}
+                                    {option.name}
                                  </CustomMenu.MenuItem>
                                );
                              })}
@@ -224,27 +205,27 @@ export const IssuesFilterView: React.FC = () => {
                          </div>
                        </div>
                      )}
-                    {displayFilters.layout !== "calendar" && displayFilters.layout !== "spreadsheet" && (
+                    {issueView !== "calendar" && issueView !== "spreadsheet" && (
                      <div className="flex items-center justify-between">
                        <h4 className="text-custom-text-200">Order by</h4>
                        <div className="w-28">
                          <CustomMenu
                            label={
-                              ISSUE_ORDER_BY_OPTIONS.find((option) => option.key === displayFilters.order_by)?.title ??
+                              ORDER_BY_OPTIONS.find((option) => option.key === orderBy)?.name ??
                              "Select"
                            }
                            className="!w-full"
                            buttonClassName="w-full"
                          >
-                            {ISSUE_ORDER_BY_OPTIONS.map((option) =>
-                              displayFilters.group_by === "priority" && option.key === "priority" ? null : (
+                            {ORDER_BY_OPTIONS.map((option) =>
+                              groupByProperty === "priority" && option.key === "priority" ? null : (
                                <CustomMenu.MenuItem
                                  key={option.key}
                                  onClick={() => {
-                                    // setDisplayFilters({ order_by: option.key });
+                                    setOrderBy(option.key);
                                  }}
                                >
-                                  {option.title}
+                                  {option.name}
                                </CustomMenu.MenuItem>
                              )
                            )}
@@ -257,58 +238,55 @@ export const IssuesFilterView: React.FC = () => {
                      <div className="w-28">
                        <CustomMenu
                          label={
-                            ISSUE_FILTER_OPTIONS.find((option) => option.key === displayFilters.type)?.title ?? "Select"
+                            FILTER_ISSUE_OPTIONS.find((option) => option.key === filters.type)
+                              ?.name ?? "Select"
                          }
                          className="!w-full"
                          buttonClassName="w-full"
                        >
-                          {ISSUE_FILTER_OPTIONS.map((option) => (
+                          {FILTER_ISSUE_OPTIONS.map((option) => (
                            <CustomMenu.MenuItem
                              key={option.key}
-                              onClick={() => {
-                                // setDisplayFilters({
-                                //   type: option.key,
-                                // })
-                              }}
+                              onClick={() =>
+                                setFilters({
+                                  type: option.key,
+                                })
+                              }
                            >
-                              {option.title}
+                              {option.name}
                            </CustomMenu.MenuItem>
                          ))}
                        </CustomMenu>
                      </div>
                    </div>

-                    {displayFilters.layout !== "calendar" && displayFilters.layout !== "spreadsheet" && (
+                    {issueView !== "calendar" && issueView !== "spreadsheet" && (
                      <div className="flex items-center justify-between">
                        <h4 className="text-custom-text-200">Show sub-issues</h4>
                        <div className="w-28">
                          <ToggleSwitch
-                            value={displayFilters.sub_issue ?? true}
-                            onChange={() => setDisplayFilters({ sub_issue: !displayFilters.sub_issue })}
+                            value={showSubIssues}
+                            onChange={() => setShowSubIssues(!showSubIssues)}
                          />
                        </div>
                      </div>
                    )}
-                    {displayFilters.layout !== "calendar" &&
-                      displayFilters.layout !== "spreadsheet" &&
-                      displayFilters.layout !== "gantt_chart" && (
+                    {issueView !== "calendar" &&
+                      issueView !== "spreadsheet" &&
+                      issueView !== "gantt_chart" && (
                        <div className="flex items-center justify-between">
                          <h4 className="text-custom-text-200">Show empty states</h4>
                          <div className="w-28">
                            <ToggleSwitch
-                              value={displayFilters.show_empty_groups ?? true}
-                              onChange={() =>
-                                setDisplayFilters({
-                                  show_empty_groups: !displayFilters.show_empty_groups,
-                                })
-                              }
+                              value={showEmptyGroups}
+                              onChange={() => setShowEmptyGroups(!showEmptyGroups)}
                            />
                          </div>
                        </div>
                      )}
-                    {displayFilters.layout !== "calendar" &&
-                      displayFilters.layout !== "spreadsheet" &&
-                      displayFilters.layout !== "gantt_chart" && (
+                    {issueView !== "calendar" &&
+                      issueView !== "spreadsheet" &&
+                      issueView !== "gantt_chart" && (
                        <div className="relative flex justify-end gap-x-3">
                          <button type="button" onClick={() => resetFilterToDefault()}>
                            Reset to default
@@ -324,7 +302,7 @@ export const IssuesFilterView: React.FC = () => {
                      )}
                  </div>

-                  {displayFilters.layout !== "gantt_chart" && (
+                  {issueView !== "gantt_chart" && (
                    <div className="space-y-2 py-3">
                      <h4 className="text-sm text-custom-text-200">Display Properties</h4>
                      <div className="flex flex-wrap items-center gap-2 text-custom-text-200">
@@ -332,12 +310,17 @@ export const IssuesFilterView: React.FC = () => {
                          if (key === "estimate" && !isEstimateActive) return null;

                          if (
-                            displayFilters.layout === "spreadsheet" &&
-                            (key === "attachment_count" || key === "link" || key === "sub_issue_count")
+                            issueView === "spreadsheet" &&
+                            (key === "attachment_count" ||
+                              key === "link" ||
+                              key === "sub_issue_count")
                          )
                            return null;

-                          if (displayFilters.layout !== "spreadsheet" && (key === "created_on" || key === "updated_on"))
+                          if (
+                            issueView !== "spreadsheet" &&
+                            (key === "created_on" || key === "updated_on")
+                          )
                            return null;

                          return (
@@ -20,7 +20,6 @@ import fileService from "services/file.service";
 import { Input, Spinner, PrimaryButton, SecondaryButton } from "components/ui";
 // hooks
 import useWorkspaceDetails from "hooks/use-workspace-details";
-import useOutsideClickDetector from "hooks/use-outside-click-detector";

 const unsplashEnabled =
  process.env.NEXT_PUBLIC_UNSPLASH_ENABLED === "true" ||
@@ -41,15 +40,9 @@ type Props = {
  label: string | React.ReactNode;
  value: string | null;
  onChange: (data: string) => void;
-  disabled?: boolean;
 };

-export const ImagePickerPopover: React.FC<Props> = ({
-  label,
-  value,
-  onChange,
-  disabled = false,
-}) => {
+export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange }) => {
  const ref = useRef<HTMLDivElement>(null);

  const router = useRouter();
@@ -68,8 +61,6 @@ export const ImagePickerPopover: React.FC<Props> = ({
    fileService.getUnsplashImages(1, searchParams)
  );

-  const imagePickerRef = useRef<HTMLDivElement>(null);
-
  const { workspaceDetails } = useWorkspaceDetails();

  const onDrop = useCallback((acceptedFiles: File[]) => {
@@ -119,16 +110,13 @@ export const ImagePickerPopover: React.FC<Props> = ({
    onChange(images[0].urls.regular);
  }, [value, onChange, images]);

-  useOutsideClickDetector(imagePickerRef, () => setIsOpen(false));
-
  if (!unsplashEnabled) return null;

  return (
    <Popover className="relative z-[2]" ref={ref}>
      <Popover.Button
-        className="rounded-sm border border-custom-border-300 bg-custom-background-100 px-2 py-1 text-xs text-custom-text-200 hover:text-custom-text-100"
+        className="rounded-md border border-custom-border-300 bg-custom-background-100 px-2 py-1 text-xs text-custom-text-200 hover:text-custom-text-100"
        onClick={() => setIsOpen((prev) => !prev)}
-        disabled={disabled}
      >
        {label}
      </Popover.Button>
@@ -142,10 +130,7 @@ export const ImagePickerPopover: React.FC<Props> = ({
        leaveTo="transform opacity-0 scale-95"
      >
        <Popover.Panel className="absolute right-0 z-10 mt-2 rounded-md border border-custom-border-200 bg-custom-background-80 shadow-lg">
-          <div
-            ref={imagePickerRef}
-            className="h-96 md:h-[28rem] w-80 md:w-[36rem] flex flex-col overflow-auto rounded border border-custom-border-300 bg-custom-background-100 p-3 shadow-2xl"
-          >
+          <div className="h-96 md:h-[28rem] w-80 md:w-[36rem] flex flex-col overflow-auto rounded border border-custom-border-300 bg-custom-background-100 p-3 shadow-2xl">
            <Tab.Group>
              <div>
                <Tab.List as="span" className="inline-block rounded bg-custom-background-80 p-1">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Henit Chobisa	016c8dc9c9	chore: updated nginx config	2023-09-02 08:00:53 +00:00
Henit Chobisa	eb5882876b	chore: updated docker-compose hub	2023-09-02 08:00:24 +00:00
Henit Chobisa	9379d5e4ec	chore: added spaces packages	2023-09-02 07:57:40 +00:00
Henit Chobisa	e91406bd3f	chore: modified next.js config	2023-09-02 07:57:29 +00:00
Henit Chobisa	f9c3b4ca12	chore: Updated dockerfiles for web and space	2023-09-02 07:57:00 +00:00
Henit Chobisa	702c27e015	chore: Updated Docker Compose with Added Spaces	2023-09-02 07:03:44 +00:00
Henit Chobisa	8b704f302c	chore: Modifed Migration Dependency from deploy-pages	2023-09-02 07:00:24 +00:00
Henit Chobisa	541c7a00d8	chore: Updated Icons from .png to .svg	2023-09-02 06:59:14 +00:00
Aaryan Khandelwal GitHub Nikhil Lakhan Baheti	367cfc4180	fix: plane deploy peek overview bugs (#2050 ) * chore: public board endpoints (#2030) * feat: editor for issue description (#2038) * chore: cycle endpoint to return display name as well in the assignee distribution (#2041) * chore: cycle endpoint to return display name as well in the assignee distribution * fix: value error * fix: Gantt chart bugs (#2024) * fix: only left mouse button should trigger all the events * fix: extra block shadow * chore: minor updates on the peek overview * chore: remove filters button from the navbar --------- Co-authored-by: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: Lakhan Baheti <94619783+1akhanBaheti@users.noreply.github.com>	2023-09-01 15:51:34 +05:30
sriram veeraghanta	a09e797de8	Merge branch 'develop' of github.com:makeplane/plane into feat/deploy-pages	2023-09-01 15:45:13 +05:30
sriram veeraghanta	6f84bc4f52	fix: delete vote fixes	2023-09-01 15:27:37 +05:30
sriram veeraghanta	a1e249a5bb	reaction fixes	2023-09-01 14:31:48 +05:30
sriram veeraghanta	77a043b141	fix: commenting fixes	2023-09-01 11:49:07 +05:30
sriramveeraghanta	5c8060c777	lock file updated	2023-09-01 00:35:29 +05:30
sriramveeraghanta	abe3cf9d68	fix: build issues by commenting few parts	2023-09-01 00:34:57 +05:30
sriramveeraghanta	376da835ba	fix: commenting issues fixed	2023-09-01 00:22:50 +05:30
sriramveeraghanta	4fd7a78d70	merge conflicts resolved	2023-08-31 23:27:04 +05:30
Aaryan Khandelwal GitHub Nikhil Bavisetti Narayan NarayanBavisetti Bavisetti Narayan M. Palanikannan	6b4084287c	style: plane deploy (#2039 ) * chore: improve access field for comments for public boards (#1956) Co-authored-by: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> * chore: update user activity endpoint to return only workspace activities (#1980) * fix: n+1 in issue history and issue automation tasks (#1994) * fix: issue exports in self hosted instances (#1996) * fix: issue exports in self hosted instances * dev: remove print logs * dev: update url creation function * fix: changed the presigned url for self hosted exports --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com> * dev: remove gunicorn config (#1999) * feat: mark all read notifications (#1963) * feat: mark all read notifications * fix: changed string to boolean * fix: changed snoozed condition * chore: project public board issue retrieve (#2003) * chore: project public board issue retrieve * dev: project issues list endpoint * fix: issue public retrieve endpoint * fix: only external comments will show in deploy boards (#2010) * fix: issue votes (#2006) * fix: issue votes * fix: added default as 1 in vote * fix: issue vote migration file * fix: access creation in comments (#2013) * dev: user timezone select option (#2002) * fix: start date filter not working on the platform (#2007) * feat: access selector for comment (#2012) * dev: access specifier for comment * chore: change access order * style: revamp of the issue details sidebar (#2014) * chore: update module status icons and colors (#2011) * chore: update module status icons and colors * refactor: import statements * fix: add default alue to module status * chore: track public board comments and reaction users for public deploy boards (#1972) * chore: track project deploy board comment and reaction users for public deploy boards * dev: remove tracking from project viewsets * feat: user timezones (#2009) * dev: user timezones * feat: user timezones * fix: user created by stats (#2016) * fix: asset key validation (#1938) * fix: asset key validation * chore: asset key validation in user assets --------- Co-authored-by: Bavisetti Narayan <narayan@Bavisettis-MacBook-Pro.local> * dev: revamp peek overview (#2021) * dev: mobx for issues store * refactor: peek overview component * chore: update open issue button * fix: issue mutation after any crud action * chore: remove peek overview from gantt * chore: refactor code * chore: tracking the history of issue reactions and votes. (#2020) * chore: tracking the issues reaction and vote history * fix: changed the keywords for vote and reaction * chore: added validation * dev: revamp publish project modal (#2022) * dev: revamp publish project modal * chore: sidebar dropdown text * fix: bugs on the user profile page (#2018) * chore: return issue votes in public issue list endpoint (#2026) * style: list view * [feat]: Tiptap table integration (#2008) * added basic table support * fixed table position at bottom * fixed image node deletion logic's regression issue * added compatible styles * enabled slash commands * disabled slash command and bubble menu's node selector for table cells * added dropcursor support to type below the table/image * blocked image uploads for handledrop and paste actions * style: kanban view * style: tiptap table (#2033) * style: theming added * chore: issue reactions and votes --------- Co-authored-by: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> Co-authored-by: NarayanBavisetti <narayan3119@gmail.com> Co-authored-by: Bavisetti Narayan <narayan@Bavisettis-MacBook-Pro.local> Co-authored-by: M. Palanikannan <73993394+Palanikannan1437@users.noreply.github.com>	2023-08-31 23:24:03 +05:30
sriram veeraghanta	1cd1f6e8c9	fix: revalidating using swr	2023-08-31 18:43:37 +05:30
sriram veeraghanta	66bee2a094	fix:key fixes	2023-08-31 16:37:25 +05:30
sriram veeraghanta	240acc6cd0	fix: mobx changes	2023-08-31 16:35:26 +05:30
sriramveeraghanta	6246a740d5	fix: peek over data fetching fixes	2023-08-31 00:12:45 +05:30
sriram veeraghanta	a27edad810	fix: type fixes	2023-08-30 20:35:10 +05:30
sriram veeraghanta	579347c991	fix:mobx fixes	2023-08-30 20:33:21 +05:30
sriram veeraghanta	0deed77f1d	fix: repeatative api calls removed	2023-08-30 18:33:18 +05:30
sriram veeraghanta	d7c27b75fa	fix: mobx changes	2023-08-30 17:39:11 +05:30
sriram veeraghanta	91910d106c	fix: seo fixes	2023-08-30 16:51:13 +05:30
sriram veeraghanta	061717f0af	yarn lock file updated	2023-08-30 14:02:51 +05:30
sriram veeraghanta	93f01ec6d1	seo fixes	2023-08-30 13:56:41 +05:30
sriram veeraghanta	8cadced1aa	fix: moving to pages dir and downgrading next to 12	2023-08-30 13:41:25 +05:30
Dakshesh JainandGitHub	96399c7112	feat: public board (#2017 ) * feat: filters in plane deploy implemented multi-level dropdown for plane deploy * style: spacing and fonts * feat: plane deploy implemented authentication/theming, created/modified all the required store & services * devL reactions, voting, comments and theme	2023-08-30 12:49:15 +05:30