Merge branch 'develop' of github.com:makeplane/plane into chore/workspace_invite

* chore: create draft issue option added in draft issue layout and permission validation added

* chore: create draft issue option added in draft issue list layout and permission validation added

.github/workflows/build-branch.yml

@@ -15,7 +15,7 @@ env:
   TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
 
 jobs:
-  branch_build_and_push:
+  branch_build_setup:
     if: ${{ (github.event_name == 'pull_request' && github.event.action =='closed' && github.event.pull_request.merged == true) }}
     name: Build-Push Web/Space/API/Proxy Docker Image
     runs-on: ubuntu-20.04
@@ -59,18 +59,18 @@ jobs:
 
   branch_build_push_frontend:
     runs-on: ubuntu-20.04
-    needs: [branch_build_and_push]
+    needs: [branch_build_setup]
     env:
-      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Frontend Docker Tag 
         run: |
-          if [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:latest"
-          elif [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "release" ] || [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "preview" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:preview"
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:latest
+          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "release" ] || [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "preview" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:preview
           else
-            TAG=${{ env.FRONTEND_TAG }}"
+            TAG=${{ env.FRONTEND_TAG }}
           fi
           echo "FRONTEND_TAG=${TAG}" >> $GITHUB_ENV
       - name: Set up Docker Buildx
@@ -101,18 +101,18 @@ jobs:
 
   branch_build_push_space:
     runs-on: ubuntu-20.04
-    needs: [branch_build_and_push]
+    needs: [branch_build_setup]
     env:
-      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Space Docker Tag 
         run: |
-          if [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest"
-          elif [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "release" ] || [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "preview" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:preview"
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest
+          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "release" ] || [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "preview" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:preview
           else
-            TAG=${{ env.SPACE_TAG }}"
+            TAG=${{ env.SPACE_TAG }}
           fi
           echo "SPACE_TAG=${TAG}" >> $GITHUB_ENV
       - name: Set up Docker Buildx
@@ -143,16 +143,16 @@ jobs:
 
   branch_build_push_backend:
     runs-on: ubuntu-20.04
-    needs: [branch_build_and_push]
+    needs: [branch_build_setup]
     env:
-      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Backend Docker Tag 
         run: |
-          if [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:latest"
-          elif [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "release" ] || [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "preview" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:preview",${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:preview"
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:latest
+          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "release" ] || [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "preview" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:preview
           else
             TAG=${{ env.BACKEND_TAG }}
           fi
@@ -185,16 +185,16 @@ jobs:
 
   branch_build_push_proxy:
     runs-on: ubuntu-20.04
-    needs: [branch_build_and_push]
+    needs: [branch_build_setup]
     env:
-      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Proxy Docker Tag 
         run: |
-          if [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:latest"
-          elif [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "release" ] || [ "${{ needs.branch_build_and_push.outputs.gh_branch_name }}" = "preview" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:preview"
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:latest
+          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "release" ] || [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "preview" ]; then
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:preview,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:preview
           else
             TAG=${{ env.PROXY_TAG }}
           fi

apiserver/.env.example

@@ -14,6 +14,11 @@ PGHOST="plane-db"
 PGDATABASE="plane"
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
 
+# Oauth variables
+GOOGLE_CLIENT_ID=""
+GITHUB_CLIENT_ID=""
+GITHUB_CLIENT_SECRET=""
+
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
@@ -50,7 +55,6 @@ NGINX_PORT=80
 # SignUps
 ENABLE_SIGNUP="1"
 
-
 # Enable Email/Password Signup
 ENABLE_EMAIL_PASSWORD="1"
 

apiserver/plane/api/serializers/cycle.py

@@ -30,6 +30,11 @@ class CycleSerializer(BaseSerializer):
         model = Cycle
         fields = "__all__"
         read_only_fields = [
+            "id",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
             "workspace",
             "project",
             "owned_by",

apiserver/plane/api/serializers/issue.py

@@ -1,3 +1,6 @@
+from lxml import html
+
+
 # Django imports
 from django.utils import timezone
 
@@ -21,7 +24,8 @@ from plane.db.models import (
 from .base import BaseSerializer
 from .cycle import CycleSerializer, CycleLiteSerializer
 from .module import ModuleSerializer, ModuleLiteSerializer
-
+from .user import UserLiteSerializer
+from .state import StateLiteSerializer
 
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
@@ -42,7 +46,6 @@ class IssueSerializer(BaseSerializer):
 
     class Meta:
         model = Issue
-        fields = "__all__"
         read_only_fields = [
             "id",
             "workspace",
@@ -52,6 +55,10 @@ class IssueSerializer(BaseSerializer):
             "created_at",
             "updated_at",
         ]
+        exclude = [
+            "description",
+            "description_stripped",
+        ]
 
     def validate(self, data):
         if (
@@ -60,6 +67,15 @@ class IssueSerializer(BaseSerializer):
             and data.get("start_date", None) > data.get("target_date", None)
         ):
             raise serializers.ValidationError("Start date cannot exceed target date")
+        
+        try:
+            if(data.get("description_html", None) is not None):
+                parsed = html.fromstring(data["description_html"])
+                parsed_str = html.tostring(parsed, encoding='unicode')
+                data["description_html"] = parsed_str
+            
+        except Exception as e:
+            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")
 
         # Validate assignees are from project
         if data.get("assignees", []):
@@ -291,7 +307,6 @@ class IssueCommentSerializer(BaseSerializer):
 
     class Meta:
         model = IssueComment
-        fields = "__all__"
         read_only_fields = [
             "id",
             "workspace",
@@ -302,6 +317,21 @@ class IssueCommentSerializer(BaseSerializer):
             "created_at",
             "updated_at",
         ]
+        exclude = [
+            "comment_stripped",
+            "comment_json",
+        ]
+
+    def validate(self, data):
+        try:
+            if(data.get("comment_html", None) is not None):
+                parsed = html.fromstring(data["comment_html"])
+                parsed_str = html.tostring(parsed, encoding='unicode')
+                data["comment_html"] = parsed_str
+            
+        except Exception as e:
+            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")
+        return data
 
 
 class IssueActivitySerializer(BaseSerializer):
@@ -331,12 +361,23 @@ class ModuleIssueSerializer(BaseSerializer):
         ]
 
 
-class IssueExpandSerializer(BaseSerializer):
-    # Serialize the related cycle. It's a OneToOne relation.
-    cycle = CycleLiteSerializer(source="issue_cycle.cycle", read_only=True)
+class LabelLiteSerializer(BaseSerializer):
 
-    # Serialize the related module. It's a OneToOne relation.
+    class Meta:
+        model = Label
+        fields = [
+            "id",
+            "name",
+            "color",
+        ]
+
+
+class IssueExpandSerializer(BaseSerializer):
+    cycle = CycleLiteSerializer(source="issue_cycle.cycle", read_only=True)
     module = ModuleLiteSerializer(source="issue_module.module", read_only=True)
+    labels = LabelLiteSerializer(read_only=True, many=True)
+    assignees = UserLiteSerializer(read_only=True, many=True)
+    state = StateLiteSerializer(read_only=True)
 
     class Meta:
         model = Issue
@@ -349,4 +390,4 @@ class IssueExpandSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-        ]
+        ]

apiserver/plane/api/serializers/project.py

@@ -21,6 +21,7 @@ class ProjectSerializer(BaseSerializer):
         fields = "__all__"
         read_only_fields = [
             "id",
+            'emoji',
             "workspace",
             "created_at",
             "updated_at",

apiserver/plane/api/serializers/state.py

@@ -16,6 +16,11 @@ class StateSerializer(BaseSerializer):
         model = State
         fields = "__all__"
         read_only_fields = [
+            "id",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
             "workspace",
             "project",
         ]

apiserver/plane/api/serializers/user.py

@@ -11,10 +11,6 @@ class UserLiteSerializer(BaseSerializer):
             "first_name",
             "last_name",
             "avatar",
-            "is_bot",
             "display_name",
         ]
-        read_only_fields = [
-            "id",
-            "is_bot",
-        ]
+        read_only_fields = fields

apiserver/plane/api/views/state.py

@@ -64,7 +64,7 @@ class StateAPIEndpoint(BaseAPIView):
         )
 
         if state.default:
-            return Response({"error": "Default state cannot be deleted"}, status=False)
+            return Response({"error": "Default state cannot be deleted"}, status=status.HTTP_400_BAD_REQUEST)
 
         # Check for any issues in the state
         issue_exist = Issue.issue_objects.filter(state=state_id).exists()

apiserver/plane/app/serializers/user.py

@@ -169,8 +169,8 @@ class ChangePasswordSerializer(serializers.Serializer):
     Serializer for password change endpoint.
     """
     old_password = serializers.CharField(required=True)
-    new_password = serializers.CharField(required=True)
-    confirm_password = serializers.CharField(required=True)
+    new_password = serializers.CharField(required=True, min_length=8)
+    confirm_password = serializers.CharField(required=True, min_length=8)
 
     def validate(self, data):
         if data.get("old_password") == data.get("new_password"):
@@ -187,9 +187,7 @@ class ChangePasswordSerializer(serializers.Serializer):
 
 
 class ResetPasswordSerializer(serializers.Serializer):
-    model = User
-
     """
     Serializer for password change endpoint.
     """
-    new_password = serializers.CharField(required=True)
+    new_password = serializers.CharField(required=True, min_length=8)

apiserver/plane/app/views/auth_extended.py

@@ -105,17 +105,21 @@ class ForgotPasswordEndpoint(BaseAPIView):
     def post(self, request):
         email = request.data.get("email")
 
-        if User.objects.filter(email=email).exists():
-            user = User.objects.get(email=email)
-            uidb64 = urlsafe_base64_encode(smart_bytes(user.id))
-            token = PasswordResetTokenGenerator().make_token(user)
+        try:
+            validate_email(email)
+        except ValidationError:
+            return Response({"error": "Please enter a valid email"}, status=status.HTTP_400_BAD_REQUEST)
 
+        # Get the user
+        user = User.objects.filter(email=email).first()
+        if user:
+            # Get the reset token for user
+            uidb64, token = get_tokens_for_user(user=user)
             current_site = request.META.get("HTTP_ORIGIN")
-
+            # send the forgot password email
             forgot_password.delay(
                 user.first_name, user.email, uidb64, token, current_site
             )
-
             return Response(
                 {"message": "Check your email to reset your password"},
                 status=status.HTTP_200_OK,
@@ -130,14 +134,18 @@ class ResetPasswordEndpoint(BaseAPIView):
 
     def post(self, request, uidb64, token):
         try:
+            # Decode the id from the uidb64
             id = smart_str(urlsafe_base64_decode(uidb64))
             user = User.objects.get(id=id)
+
+            # check if the token is valid for the user
             if not PasswordResetTokenGenerator().check_token(user, token):
                 return Response(
                     {"error": "Token is invalid"},
                     status=status.HTTP_401_UNAUTHORIZED,
                 )
 
+            # Reset the password
             serializer = ResetPasswordSerializer(data=request.data)
             if serializer.is_valid():
                 # set_password also hashes the password that the user will get
@@ -145,9 +153,9 @@ class ResetPasswordEndpoint(BaseAPIView):
                 user.is_password_autoset = False
                 user.save()
 
+                # Log the user in
                 # Generate access token for the user
                 access_token, refresh_token = get_tokens_for_user(user)
-
                 data = {
                     "access_token": access_token,
                     "refresh_token": refresh_token,
@@ -166,7 +174,6 @@ class ResetPasswordEndpoint(BaseAPIView):
 class ChangePasswordEndpoint(BaseAPIView):
     def post(self, request):
         serializer = ChangePasswordSerializer(data=request.data)
-
         user = User.objects.get(pk=request.user.id)
         if serializer.is_valid():
             if not user.check_password(serializer.data.get("old_password")):
@@ -218,16 +225,15 @@ class EmailCheckEndpoint(BaseAPIView):
     ]
 
     def post(self, request):
-        # get the email
-
         # Check the instance registration
         instance = Instance.objects.first()
-        if instance is None:
+        if instance is None or not instance.is_setup_done:
             return Response(
                 {"error": "Instance is not configured"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        # Get the configurations
         instance_configuration = InstanceConfiguration.objects.values("key", "value")
 
         email = request.data.get("email", False)
@@ -267,7 +273,7 @@ class EmailCheckEndpoint(BaseAPIView):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-
+            # Create the user with default values
             user = User.objects.create(
                 email=email,
                 username=uuid.uuid4().hex,
@@ -325,7 +331,7 @@ class EmailCheckEndpoint(BaseAPIView):
                         first_time=True,
                     )
                 # Automatically send the email
-                return Response({"is_password_autoset": user.is_password_autoset}, status=status.HTTP_400_BAD_REQUEST)
+                return Response({"is_password_autoset": user.is_password_autoset}, status=status.HTTP_200_OK)
         # Existing user
         else:
             if type == "magic_code":

apiserver/plane/app/views/authentication.py

@@ -10,14 +10,12 @@ from django.utils import timezone
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from django.conf import settings
-from django.contrib.auth.hashers import make_password
 
 # Third party imports
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
 from rest_framework import status
 from rest_framework_simplejwt.tokens import RefreshToken
-
 from sentry_sdk import capture_message
 
 # Module imports
@@ -33,7 +31,6 @@ from plane.settings.redis import redis_instance
 from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_configuration_value
 from plane.bgtasks.event_tracking_task import auth_events
-from plane.bgtasks.magic_link_code_task import magic_link
 from plane.bgtasks.user_count_task import update_user_instance_user_count
 
 
@@ -49,6 +46,14 @@ class SignUpEndpoint(BaseAPIView):
     permission_classes = (AllowAny,)
 
     def post(self, request):
+        # Check if the instance configuration is done
+        instance = Instance.objects.first()
+        if instance is None or not instance.is_setup_done:
+            return Response(
+                {"error": "Instance is not configured"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         instance_configuration = InstanceConfiguration.objects.values("key", "value")
 
         email = request.data.get("email", False)
@@ -71,6 +76,7 @@ class SignUpEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        # If the sign up is not enabled and the user does not have invite disallow him from creating the account
         if (
             get_configuration_value(
                 instance_configuration,
@@ -124,6 +130,14 @@ class SignInEndpoint(BaseAPIView):
     permission_classes = (AllowAny,)
 
     def post(self, request):
+        # Check if the instance configuration is done
+        instance = Instance.objects.first()
+        if instance is None or not instance.is_setup_done:
+            return Response(
+                {"error": "Instance is not configured"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         email = request.data.get("email", False)
         password = request.data.get("password", False)
 
@@ -144,14 +158,6 @@ class SignInEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Check if the instance setup is done or not
-        instance = Instance.objects.first()
-        if instance is None or not instance.is_setup_done:
-            return Response(
-                {"error": "Instance is not configured"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         # Get the user
         user = User.objects.filter(email=email).first()
 
@@ -288,6 +294,7 @@ class MagicSignInEndpoint(BaseAPIView):
     ]
 
     def post(self, request):
+        # Check if the instance configuration is done
         instance = Instance.objects.first()
         if instance is None or not instance.is_setup_done:
             return Response(

apiserver/plane/app/views/oauth.py

@@ -303,14 +303,6 @@ class OauthEndpoint(BaseAPIView):
             instance_configuration = InstanceConfiguration.objects.values(
                 "key", "value"
             )
-            # Check if instance is registered or not
-            instance = Instance.objects.first()
-            if instance is None and not instance.is_setup_done:
-                return Response(
-                    {"error": "Instance is not configured"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             if (
                 get_configuration_value(
                     instance_configuration,

apiserver/plane/app/views/state.py

@@ -77,7 +77,7 @@ class StateViewSet(BaseViewSet):
         )
 
         if state.default:
-            return Response({"error": "Default state cannot be deleted"}, status=False)
+            return Response({"error": "Default state cannot be deleted"}, status=status.HTTP_400_BAD_REQUEST)
 
         # Check for any issues in the state
         issue_exist = Issue.issue_objects.filter(state=pk).exists()

apiserver/plane/app/views/workspace.py

@@ -73,8 +73,7 @@ from plane.app.permissions import (
 )
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.utils.issue_filters import issue_filters
-from plane.utils.grouper import group_results
-
+from plane.bgtasks.event_tracking_task import auth_events
 
 class WorkSpaceViewSet(BaseViewSet):
     model = Workspace
@@ -408,6 +407,18 @@ class WorkspaceJoinEndpoint(BaseAPIView):
                     # Delete the invitation
                     workspace_invite.delete()
 
+                # Send event
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id if user is not None else None,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="WORKSPACE_INVITE",
+                        medium="EMAIL",
+                        first_time=True if user is not None else False,
+                    )
+
                 return Response(
                     {"message": "Workspace Invitation Accepted"},
                     status=status.HTTP_200_OK,

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -1,7 +1,8 @@
 # Python imports
 import csv
 import io
-import os
+import requests
+import json
 
 # Django imports
 from django.core.mail import EmailMultiAlternatives, get_connection
@@ -17,8 +18,8 @@ from sentry_sdk import capture_exception
 from plane.db.models import Issue
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
-from plane.license.models import InstanceConfiguration
-from plane.license.utils.instance_value import get_configuration_value
+from plane.license.models import InstanceConfiguration, Instance
+from plane.license.utils.instance_value import get_email_configuration
 
 row_mapping = {
     "state__name": "State",
@@ -43,7 +44,7 @@ CYCLE_ID = "issue_cycle__cycle_id"
 MODULE_ID = "issue_module__module_id"
 
 
-def send_export_email(email, slug, csv_buffer):
+def send_export_email(email, slug, csv_buffer, rows):
     """Helper function to send export email."""
     subject = "Your Export is ready"
     html_content = render_to_string("emails/exports/analytics.html", {})
@@ -55,47 +56,58 @@ def send_export_email(email, slug, csv_buffer):
     instance_configuration = InstanceConfiguration.objects.filter(
         key__startswith="EMAIL_"
     ).values("key", "value")
+
+    (
+        EMAIL_HOST,
+        EMAIL_HOST_USER,
+        EMAIL_HOST_PASSWORD,
+        EMAIL_PORT,
+        EMAIL_USE_TLS,
+        EMAIL_FROM,
+    ) = get_email_configuration(instance_configuration=instance_configuration)
+
+    # Send the email if the users don't have smtp configured
+    if EMAIL_HOST and EMAIL_HOST_USER and EMAIL_HOST_PASSWORD:
+        # Check the instance registration
+        instance = Instance.objects.first()
+
+        headers = {
+            "Content-Type": "application/json",
+            "x-instance-id": instance.instance_id,
+            "x-api-key": instance.api_key,
+        }
+
+        payload = {
+            "email": email,
+            "slug": slug,
+            "rows": rows,
+        }
+
+        _ = requests.post(
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/analytics/",
+            headers=headers,
+            json=payload,
+        )
+        return
+
     connection = get_connection(
-        host=get_configuration_value(
-            instance_configuration, "EMAIL_HOST", os.environ.get("EMAIL_HOST")
-        ),
-        port=int(
-            get_configuration_value(
-                instance_configuration, "EMAIL_PORT", os.environ.get("EMAIL_PORT")
-            )
-        ),
-        username=get_configuration_value(
-            instance_configuration,
-            "EMAIL_HOST_USER",
-            os.environ.get("EMAIL_HOST_USER"),
-        ),
-        password=get_configuration_value(
-            instance_configuration,
-            "EMAIL_HOST_PASSWORD",
-            os.environ.get("EMAIL_HOST_PASSWORD"),
-        ),
-        use_tls=bool(
-            get_configuration_value(
-                instance_configuration,
-                "EMAIL_USE_TLS",
-                os.environ.get("EMAIL_USE_TLS", "1"),
-            )
-        ),
+        host=EMAIL_HOST,
+        port=int(EMAIL_PORT),
+        username=EMAIL_HOST_USER,
+        password=EMAIL_HOST_PASSWORD,
+        use_tls=bool(EMAIL_USE_TLS),
     )
 
     msg = EmailMultiAlternatives(
         subject=subject,
         body=text_content,
-        from_email=get_configuration_value(
-            instance_configuration,
-            "EMAIL_FROM",
-            os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>"),
-        ),
+        from_email=EMAIL_FROM,
         to=[email],
         connection=connection,
     )
     msg.attach(f"{slug}-analytics.csv", csv_buffer.getvalue())
     msg.send(fail_silently=False)
+    return
 
 
 def get_assignee_details(slug, filters):
@@ -463,8 +475,11 @@ def analytic_export_task(email, data, slug):
             )
 
         csv_buffer = generate_csv_from_rows(rows)
-        send_export_email(email, slug, csv_buffer)
+        send_export_email(email, slug, csv_buffer, rows)
+        return
     except Exception as e:
+        print(e)
         if settings.DEBUG:
             print(e)
         capture_exception(e)
+        return

apiserver/plane/bgtasks/forgot_password_task.py

@@ -40,13 +40,10 @@ def forgot_password(first_name, email, uidb64, token, current_site):
         ) = get_email_configuration(instance_configuration=instance_configuration)
 
         # Send the email if the users don't have smtp configured
-        if not EMAIL_HOST or not EMAIL_HOST_USER or not EMAIL_HOST_PASSWORD:
+        if not (EMAIL_HOST and EMAIL_HOST_USER and EMAIL_HOST_PASSWORD):
             # Check the instance registration
             instance = Instance.objects.first()
 
-            # send the emails through control center
-            license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL", False)
-
             # headers
             headers = {
                 "Content-Type": "application/json",
@@ -61,7 +58,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             }
 
             _ = requests.post(
-                f"{license_engine_base_url}/api/instances/users/forgot-password/",
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/forgot-password/",
                 headers=headers,
                 data=json.dumps(payload),
             )

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -21,7 +21,6 @@ from plane.license.utils.instance_value import get_email_configuration
 @shared_task
 def magic_link(email, key, token, current_site):
     try:
-
         instance_configuration = InstanceConfiguration.objects.filter(
             key__startswith="EMAIL_"
         ).values("key", "value")
@@ -36,13 +35,10 @@ def magic_link(email, key, token, current_site):
         ) = get_email_configuration(instance_configuration=instance_configuration)
 
         # Send the email if the users don't have smtp configured
-        if not EMAIL_HOST or not EMAIL_HOST_USER or not EMAIL_HOST_PASSWORD:
+        if not (EMAIL_HOST and EMAIL_HOST_USER and EMAIL_HOST_PASSWORD):
             # Check the instance registration
             instance = Instance.objects.first()
 
-            # send the emails through control center
-            license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL", False)
-
             headers = {
                 "Content-Type": "application/json",
                 "x-instance-id": instance.instance_id,
@@ -55,7 +51,7 @@ def magic_link(email, key, token, current_site):
             }
 
             _ = requests.post(
-                f"{license_engine_base_url}/api/instances/users/magic-code/",
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/magic-code/",
                 headers=headers,
                 data=json.dumps(payload),
             )

apiserver/plane/bgtasks/user_count_task.py

@@ -32,13 +32,9 @@ def update_user_instance_user_count():
             "x-api-key": instance.api_key,
         }
 
-        license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL")
-        if not license_engine_base_url:
-            raise Exception("License Engine base url is required")
-        
         # Update the license engine
         _ = requests.post(
-            f"{license_engine_base_url}/api/instances/",
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
             headers=headers,
             data=json.dumps(payload),
         )

apiserver/plane/bgtasks/webhook_task.py

@@ -109,7 +109,7 @@ def webhook_task(self, webhook, slug, event, event_data, action):
         if webhook.secret_key:
             hmac_signature = hmac.new(
                 webhook.secret_key.encode("utf-8"),
-                json.dumps(payload, sort_keys=True).encode("utf-8"),
+                json.dumps(payload).encode("utf-8"),
                 hashlib.sha256,
             )
             signature = hmac_signature.hexdigest()

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -51,15 +51,10 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
         ) = get_email_configuration(instance_configuration=instance_configuration)
 
         # Send the email if the users don't have smtp configured
-        if not EMAIL_HOST or not EMAIL_HOST_USER or not EMAIL_HOST_PASSWORD:
+        if not (EMAIL_HOST and EMAIL_HOST_USER and EMAIL_HOST_PASSWORD):
             # Check the instance registration
             instance = Instance.objects.first()
 
-            # send the emails through control center
-            license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL", False)
-            if not license_engine_base_url:
-                raise Exception("License engine base url is required")
-
             headers = {
                 "Content-Type": "application/json",
                 "x-instance-id": instance.instance_id,
@@ -73,7 +68,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
                 "email": email,
             }
             _ = requests.post(
-                f"{license_engine_base_url}/api/instances/users/workspace-invitation/",
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/workspace-invitation/",
                 headers=headers,
                 data=json.dumps(payload),
             )

apiserver/plane/license/api/views/instance.py

@@ -11,6 +11,7 @@ from django.utils import timezone
 from django.contrib.auth.hashers import make_password
 from django.core.validators import validate_email
 from django.core.exceptions import ValidationError
+from django.conf import settings
 
 # Third party imports
 from rest_framework import status
@@ -34,7 +35,6 @@ from plane.db.models import User
 from plane.license.utils.encryption import encrypt_data
 from plane.settings.redis import redis_instance
 from plane.bgtasks.magic_link_code_task import magic_link
-from plane.license.utils.instance_value import get_configuration_value
 
 
 class InstanceEndpoint(BaseAPIView):
@@ -57,25 +57,17 @@ class InstanceEndpoint(BaseAPIView):
                 # Load JSON content from the file
                 data = json.load(file)
 
-            license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL")
-
-            if not license_engine_base_url:
-                raise Response(
-                    {"error": "LICENSE_ENGINE_BASE_URL is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             headers = {"Content-Type": "application/json"}
 
             payload = {
-                "instance_key": os.environ.get("INSTANCE_KEY"),
+                "instance_key":settings.INSTANCE_KEY,
                 "version": data.get("version", 0.1),
                 "machine_signature": os.environ.get("MACHINE_SIGNATURE"),
                 "user_count": User.objects.filter(is_bot=False).count(),
             }
 
             response = requests.post(
-                f"{license_engine_base_url}/api/instances/",
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
                 headers=headers,
                 data=json.dumps(payload),
             )
@@ -130,6 +122,24 @@ class InstanceEndpoint(BaseAPIView):
         serializer = InstanceSerializer(instance, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
+            # Save the user in control center
+            headers = {
+                "Content-Type": "application/json",
+                "x-instance-id": instance.instance_id,
+                "x-api-key": instance.api_key,
+            }
+            # Update instance settings in the license engine
+            _ = requests.patch(
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+                headers=headers,
+                data=json.dumps(
+                    {
+                        "is_support_required": serializer.data["is_support_required"],
+                        "is_telemetry_enabled": serializer.data["is_telemetry_enabled"],
+                        "version": serializer.data["version"],
+                    }
+                ),
+            )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -251,7 +261,6 @@ class AdminMagicSignInGenerateEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-
         if not email:
             return Response(
                 {"error": "Please provide a valid email address"},
@@ -409,13 +418,6 @@ class AdminSetUserPasswordEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL", False)
-        if not license_engine_base_url:
-            return Response(
-                {"error": "License engine base url is required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         # Save the user in control center
         headers = {
             "Content-Type": "application/json",
@@ -423,14 +425,14 @@ class AdminSetUserPasswordEndpoint(BaseAPIView):
             "x-api-key": instance.api_key,
         }
         _ = requests.patch(
-            f"{license_engine_base_url}/api/instances/",
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
             headers=headers,
             data=json.dumps({"is_setup_done": True}),
         )
 
         # Also register the user as admin
         _ = requests.post(
-            f"{license_engine_base_url}/api/instances/users/register/",
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/register/",
             headers=headers,
             data=json.dumps(
                 {
@@ -472,24 +474,20 @@ class SignUpScreenVisitedEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL", False)
-
-        if not license_engine_base_url:
-            return Response(
-                {"error": "License engine base url is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+        if not instance.is_signup_screen_visited:
+            instance.is_signup_screen_visited = True
+            instance.save()
+            # set the headers
+            headers = {
+                "Content-Type": "application/json",
+                "x-instance-id": instance.instance_id,
+                "x-api-key": instance.api_key,
+            }
+            # create the payload
+            payload = {"is_signup_screen_visited": True}
+            _ = requests.patch(
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+                headers=headers,
+                data=json.dumps(payload),
             )
-
-        headers = {
-            "Content-Type": "application/json",
-            "x-instance-id": instance.instance_id,
-            "x-api-key": instance.api_key,
-        }
-
-        payload = {"is_signup_screen_visited": True}
-        response = requests.patch(
-            f"{license_engine_base_url}/api/instances/",
-            headers=headers,
-            data=json.dumps(payload),
-        )
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/license/management/commands/register_instance.py

@@ -6,6 +6,7 @@ import requests
 # Django imports
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import timezone
+from django.conf import settings
 
 # Module imports
 from plane.license.models import Instance
@@ -30,31 +31,22 @@ class Command(BaseCommand):
                 data = json.load(file)
 
             machine_signature = options.get("machine_signature", False)
-            instance_key = os.environ.get("INSTANCE_KEY", False)
-
-            # Raise an exception if the admin email is not provided
-            if not instance_key:
-                raise CommandError("INSTANCE_KEY is required")
+            
 
             if not machine_signature:
                 raise CommandError("Machine signature is required")
 
-            license_engine_base_url = os.environ.get("LICENSE_ENGINE_BASE_URL")
-
-            if not license_engine_base_url:
-                raise CommandError("LICENSE_ENGINE_BASE_URL is required")
-
             headers = {"Content-Type": "application/json"}
 
             payload = {
-                "instance_key": instance_key,
+                "instance_key": settings.INSTANCE_KEY,
                 "version": data.get("version", 0.1),
                 "machine_signature": machine_signature,
                 "user_count": User.objects.filter(is_bot=False).count(),
             }
 
             response = requests.post(
-                f"{license_engine_base_url}/api/instances/",
+                f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
                 headers=headers,
                 data=json.dumps(payload),
             )

apiserver/plane/settings/common.py

@@ -290,7 +290,7 @@ CELERY_IMPORTS = (
 
 # Sentry Settings
 # Enable Sentry Settings
-if bool(os.environ.get("SENTRY_DSN", False)):
+if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get("SENTRY_DSN").startswith("https://"):
     sentry_sdk.init(
         dsn=os.environ.get("SENTRY_DSN", ""),
         integrations=[
@@ -324,4 +324,10 @@ USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
 
 # Posthog settings
 POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
-POSTHOG_HOST = os.environ.get("POSTHOG_HOST", False)
+POSTHOG_HOST = os.environ.get("POSTHOG_HOST", False)
+
+# License engine base url
+LICENSE_ENGINE_BASE_URL = os.environ.get("LICENSE_ENGINE_BASE_URL", "https://control-center.plane.so")
+
+# instance key
+INSTANCE_KEY = os.environ.get("INSTANCE_KEY", "ae6517d563dfc13d8270bd45cf17b08f70b37d989128a9dab46ff687603333c3")

apiserver/plane/utils/issue_filters.py

@@ -63,7 +63,7 @@ def date_filter(filter, date_term, queries):
                         duration=int(digit),
                         subsequent=date_query[1],
                         term=term,
-                        date_filter="created_at__date",
+                        date_filter=date_term,
                         offset=date_query[2],
                     )
             else:

apiserver/requirements/base.txt

@@ -38,3 +38,4 @@ beautifulsoup4==4.12.2
 dj-database-url==2.1.0
 posthog==3.0.2
 cryptography==41.0.5
+lxml==4.9.3

apiserver/templates/emails/auth/magic_signin.html

@@ -149,20 +149,20 @@
           padding-top: 10px !important;
         }
         .r13-o {
-          border-bottom-color: #efefef !important;
+          border-bottom-color: #d9e4ff !important;
           border-bottom-width: 1px !important;
-          border-left-color: #efefef !important;
+          border-left-color: #d9e4ff !important;
           border-left-width: 1px !important;
-          border-right-color: #efefef !important;
+          border-right-color: #d9e4ff !important;
           border-right-width: 1px !important;
           border-style: solid !important;
-          border-top-color: #efefef !important;
+          border-top-color: #d9e4ff !important;
           border-top-width: 1px !important;
           margin: 0 auto 0 0 !important;
           width: 100% !important;
         }
         .r14-i {
-          background-color: #e3e6f1 !important;
+          background-color: #ecf1ff !important;
           padding-bottom: 10px !important;
           padding-left: 10px !important;
           padding-right: 10px !important;
@@ -225,16 +225,11 @@
           padding-top: 5px !important;
         }
         .r24-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r25-o {
           border-style: solid !important;
           margin-right: 0px !important;
           width: 32px !important;
         }
-        .r26-i {
+        .r25-i {
           padding-bottom: 0px !important;
           padding-top: 5px !important;
           text-align: center !important;
@@ -664,17 +659,17 @@
                                           width="100%"
                                           class="r13-o"
                                           style="
-                                            background-color: #e3e6f1;
-                                            border-bottom-color: #efefef;
+                                            background-color: #ecf1ff;
+                                            border-bottom-color: #d9e4ff;
                                             border-bottom-width: 1px;
                                             border-collapse: separate;
-                                            border-left-color: #efefef;
+                                            border-left-color: #d9e4ff;
                                             border-left-width: 1px;
                                             border-radius: 5px;
-                                            border-right-color: #efefef;
+                                            border-right-color: #d9e4ff;
                                             border-right-width: 1px;
                                             border-style: solid;
-                                            border-top-color: #efefef;
+                                            border-top-color: #d9e4ff;
                                             border-top-width: 1px;
                                             table-layout: fixed;
                                             width: 100%;
@@ -690,7 +685,7 @@
                                                 font-family: georgia, serif;
                                                 font-size: 16px;
                                                 word-break: break-word;
-                                                background-color: #e3e6f1;
+                                                background-color: #ecf1ff;
                                                 border-radius: 4px;
                                                 line-height: 3;
                                                 padding-bottom: 10px;
@@ -714,10 +709,10 @@
                                                 <p style="margin: 0">
                                                   <span
                                                     style="
-                                                      color: #716c6c;
+                                                      color: #5f5e5e;
                                                       font-family: Arial,
                                                         helvetica, sans-serif;
-                                                      font-size: 15px;
+                                                      font-size: 14px;
                                                     "
                                                     >Please copy and paste this
                                                     on the screen where you
@@ -1251,13 +1246,14 @@
                                                                   role="presentation"
                                                                   width="100%"
                                                                   class="r22-o"
-                                                                  class="r24-o"
                                                                   style="
+                                                                    table-layout: fixed;
+                                                                    width: 100%;
+                                                                  "
                                                                 >
                                                                   <tr>
                                                                     <td
                                                                       class="r23-i"
-                                                                      class="r17-i"
                                                                       style="
                                                                         font-size: 0px;
                                                                         line-height: 0px;
@@ -1309,7 +1305,7 @@
                                                                   border="0"
                                                                   role="presentation"
                                                                   width="100%"
-                                                                  class="r25-o"
+                                                                  class="r24-o"
                                                                   style="
                                                                     table-layout: fixed;
                                                                     width: 100%;
@@ -1441,7 +1437,7 @@
                                             <td
                                               align="center"
                                               valign="top"
-                                              class="r26-i nl2go-default-textstyle"
+                                              class="r25-i nl2go-default-textstyle"
                                               style="
                                                 color: #3b3f44;
                                                 font-family: georgia, serif;

apiserver/templates/emails/exports/issues.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-    Dear {{username}},<br/>
-    Your requested Issue's data has been successfully exported from Plane. The export includes all relevant information about issues you requested from your selected projects.</br>
-    Please find the attachment and download the CSV file. If you have any questions or need further assistance, please don't hesitate to contact our support team at <a href = "mailto: engineering@plane.com">engineering@plane.so</a>. We're here to help!</br>
-    Thank you for using Plane. We hope this export will aid you in effectively managing your projects.</br>
-    Regards,
-    Team Plane
-</html>

deploy/coolify/coolify-docker-compose.yml

@@ -71,7 +71,6 @@ services:
       - ENABLE_MAGIC_LINK_LOGIN=${ENABLE_MAGIC_LINK_LOGIN:-0}
       - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
       - WEB_URL=$SERVICE_FQDN_PLANE_8082
-      - LICENSE_ENGINE_BASE_URL=${LICENSE_ENGINE_BASE_URL:-"https://control-center.plane.so"}
     depends_on:
       - plane-db
       - plane-redis
@@ -117,7 +116,6 @@ services:
       - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
       - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
       - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
-      - LICENSE_ENGINE_BASE_URL=${LICENSE_ENGINE_BASE_URL:-"https://control-center.plane.so"}
     depends_on:
       - api
       - plane-db
@@ -164,7 +162,6 @@ services:
       - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
       - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
       - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
-      - LICENSE_ENGINE_BASE_URL=${LICENSE_ENGINE_BASE_URL:-"https://control-center.plane.so"}
     depends_on:
       - api
       - plane-db

deploy/selfhost/docker-compose.yml

@@ -5,15 +5,16 @@ x-app-env : &app-env
     - NGINX_PORT=${NGINX_PORT:-80}
     - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
-    - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
-    - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces}
+    - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.production} # deprecated
+    - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0} # deprecated
+    - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces} # deprecated
     - SENTRY_DSN=${SENTRY_DSN:-""}
+    - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}
+    - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID:-""}
+    - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID:-""}
     - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
     - DOCKERIZED=${DOCKERIZED:-1}  # deprecated
     - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-""}
-    - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}
-    - ADMIN_EMAIL=${ADMIN_EMAIL:-""}
-    - LICENSE_ENGINE_BASE_URL=${LICENSE_ENGINE_BASE_URL:-""}
     # Gunicorn Workers
     - GUNICORN_WORKERS=${GUNICORN_WORKERS:-2}
     #DB SETTINGS
@@ -28,12 +29,12 @@ x-app-env : &app-env
     - REDIS_HOST=${REDIS_HOST:-plane-redis}
     - REDIS_PORT=${REDIS_PORT:-6379}
     - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
-    # EMAIL SETTINGS
+    # EMAIL SETTINGS - Deprecated can be configured through admin panel
     - EMAIL_HOST=${EMAIL_HOST:-""}
     - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
     - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
     - EMAIL_PORT=${EMAIL_PORT:-587}
-    - EMAIL_FROM=${EMAIL_FROM:-"Team Plane <team@mailer.plane.so>"}
+    - EMAIL_FROM=${EMAIL_FROM:-"Team Plane <team@mailer.plane.so>"}
     - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
     - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
     - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
@@ -42,10 +43,11 @@ x-app-env : &app-env
     - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
     - OPENAI_API_KEY=${OPENAI_API_KEY:-"sk-"}
     - GPT_ENGINE=${GPT_ENGINE:-"gpt-3.5-turbo"}
-    # LOGIN/SIGNUP SETTINGS
+    # LOGIN/SIGNUP SETTINGS - Deprecated can be configured through admin panel
     - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
     - ENABLE_EMAIL_PASSWORD=${ENABLE_EMAIL_PASSWORD:-1}
     - ENABLE_MAGIC_LINK_LOGIN=${ENABLE_MAGIC_LINK_LOGIN:-0}
+    # Application secret
     - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
     # DATA STORE SETTINGS
     - USE_MINIO=${USE_MINIO:-1}

deploy/selfhost/variables.env

@@ -10,10 +10,12 @@ DEBUG=0
 NEXT_PUBLIC_ENABLE_OAUTH=0
 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
 SENTRY_DSN=""
+SENTRY_ENVIRONMENT="production"
+GOOGLE_CLIENT_ID=""
+GITHUB_CLIENT_ID=""
 GITHUB_CLIENT_SECRET=""
 DOCKERIZED=1 # deprecated
 CORS_ALLOWED_ORIGINS="http://localhost"
-SENTRY_ENVIRONMENT="production"
 
 #DB SETTINGS
 PGHOST=plane-db
@@ -34,7 +36,7 @@ EMAIL_HOST=""
 EMAIL_HOST_USER=""
 EMAIL_HOST_PASSWORD=""
 EMAIL_PORT=587
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
 EMAIL_USE_TLS=1
 EMAIL_USE_SSL=0
 
@@ -63,9 +65,3 @@ FILE_SIZE_LIMIT=5242880
 
 # Gunicorn Workers
 GUNICORN_WORKERS=2
-
-# Admin Email
-ADMIN_EMAIL=""
-
-# License Engine url
-LICENSE_ENGINE_BASE_URL=""

space/components/accounts/email-reset-password-form.tsx

@@ -1,11 +1,5 @@
 import React from "react";
-
-// react hook form
 import { useForm } from "react-hook-form";
-// services
-import userService from "services/user.service";
-// hooks
-// import useToast from "hooks/use-toast";
 // ui
 import { Input } from "components/ui";
 import { Button } from "@plane/ui";
@@ -30,10 +24,9 @@ export const EmailResetPasswordForm: React.FC<Props> = ({ setIsResettingPassword
   });
 
   const forgotPassword = async (formData: any) => {
-    const payload = {
-      email: formData.email,
-    };
-
+    // const payload = {
+    //   email: formData.email,
+    // };
     // await userService
     //   .forgotPassword(payload)
     //   .then(() =>
@@ -60,7 +53,7 @@ export const EmailResetPasswordForm: React.FC<Props> = ({ setIsResettingPassword
   };
 
   return (
-    <form className="space-y-4 mt-10 w-full sm:w-[360px] mx-auto" onSubmit={handleSubmit(forgotPassword)}>
+    <form className="mx-auto mt-10 w-full space-y-4 sm:w-[360px]" onSubmit={handleSubmit(forgotPassword)}>
       <div className="space-y-1">
         <Input
           id="email"
@@ -73,11 +66,11 @@ export const EmailResetPasswordForm: React.FC<Props> = ({ setIsResettingPassword
               ) || "Email address is not valid",
           })}
           placeholder="Enter registered email address.."
-          className="border-custom-border-300 h-[46px]"
+          className="h-[46px] border-custom-border-300"
         />
         {errors.email && <div className="text-sm text-red-500">{errors.email.message}</div>}
       </div>
-      <div className="mt-5 flex flex-col-reverse sm:flex-row items-center gap-2">
+      <div className="mt-5 flex flex-col-reverse items-center gap-2 sm:flex-row">
         <Button variant="neutral-primary" className="w-full" onClick={() => setIsResettingPassword(false)}>
           Go Back
         </Button>

space/components/issues/filters-render/state/filter-state-block.tsx

@@ -1,19 +1,10 @@
-import { useRouter } from "next/router";
-// mobx react lite
 import { observer } from "mobx-react-lite";
-// mobx hook
-import { useMobxStore } from "lib/mobx/store-provider";
 // interfaces
 import { IIssueState } from "types/issue";
 // constants
 import { issueGroupFilter } from "constants/data";
 
 export const RenderIssueState = observer(({ state }: { state: IIssueState }) => {
-  const store = useMobxStore();
-
-  const router = useRouter();
-  const { workspace_slug, project_slug } = router.query as { workspace_slug: string; project_slug: string };
-
   const stateGroup = issueGroupFilter(state.group);
 
   const removeStateFromFilter = () => {
@@ -28,12 +19,12 @@ export const RenderIssueState = observer(({ state }: { state: IIssueState }) =>
   if (stateGroup === null) return <></>;
   return (
     <div className={`inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 ${stateGroup.className || ``}`}>
-      <div className="flex-shrink-0 w-3 h-3 flex justify-center items-center overflow-hidden rounded-full">
+      <div className="flex h-3 w-3 flex-shrink-0 items-center justify-center overflow-hidden rounded-full">
         {/* <stateGroup.icon /> */}
       </div>
-      <div className="text-xs font-medium whitespace-nowrap">{state?.name}</div>
+      <div className="whitespace-nowrap text-xs font-medium">{state?.name}</div>
       <div
-        className="flex-shrink-0 w-3 h-3 cursor-pointer flex justify-center items-center overflow-hidden rounded-full"
+        className="flex h-3 w-3 flex-shrink-0 cursor-pointer items-center justify-center overflow-hidden rounded-full"
         onClick={removeStateFromFilter}
       >
         <span className="material-symbols-rounded text-xs">close</span>

space/components/issues/navbar/index.tsx

@@ -7,7 +7,7 @@ import { useRouter } from "next/router";
 // mobx
 import { observer } from "mobx-react-lite";
 // components
-import { NavbarSearch } from "./search";
+// import { NavbarSearch } from "./search";
 import { NavbarIssueBoardView } from "./issue-board-view";
 import { NavbarTheme } from "./theme";
 // ui
@@ -83,45 +83,43 @@ const IssueNavbar = observer(() => {
   }, [board, workspace_slug, project_slug, router, projectStore, projectStore?.deploySettings]);
 
   return (
-    <div className="px-5 relative w-full flex items-center gap-4">
+    <div className="relative flex w-full items-center gap-4 px-5">
       {/* project detail */}
-      <div className="flex-shrink-0 flex items-center gap-2">
-        <div className="w-4 h-4 flex justify-center items-center">
+      <div className="flex flex-shrink-0 items-center gap-2">
+        <div className="flex h-4 w-4 items-center justify-center">
           {projectStore?.project && projectStore?.project?.emoji ? (
             renderEmoji(projectStore?.project?.emoji)
           ) : (
-            <Image src="/plane-logo.webp" alt="plane logo" className="w-[24px] h-[24px]" height="24" width="24" />
+            <Image src="/plane-logo.webp" alt="plane logo" className="h-[24px] w-[24px]" height="24" width="24" />
           )}
         </div>
-        <div className="font-medium text-lg max-w-[300px] line-clamp-1 overflow-hidden">
+        <div className="line-clamp-1 max-w-[300px] overflow-hidden text-lg font-medium">
           {projectStore?.project?.name || `...`}
         </div>
       </div>
 
       {/* issue search bar */}
-      <div className="w-full">
-        <NavbarSearch />
-      </div>
+      <div className="w-full">{/* <NavbarSearch /> */}</div>
 
       {/* issue views */}
-      <div className="flex-shrink-0 relative flex items-center gap-1 transition-all ease-in-out delay-150">
+      <div className="relative flex flex-shrink-0 items-center gap-1 transition-all delay-150 ease-in-out">
         <NavbarIssueBoardView />
       </div>
 
       {/* theming */}
-      <div className="flex-shrink-0 relative">
+      <div className="relative flex-shrink-0">
         <NavbarTheme />
       </div>
 
       {user ? (
-        <div className="border border-custom-border-200 rounded flex items-center gap-2 p-2">
+        <div className="flex items-center gap-2 rounded border border-custom-border-200 p-2">
           {user.avatar && user.avatar !== "" ? (
             <div className="h-5 w-5 rounded-full">
               {/* eslint-disable-next-line @next/next/no-img-element */}
               <img src={user.avatar} alt={user.display_name ?? ""} className="rounded-full" />
             </div>
           ) : (
-            <div className="bg-custom-background-80 h-5 w-5 rounded-full grid place-items-center text-[10px] capitalize">
+            <div className="grid h-5 w-5 place-items-center rounded-full bg-custom-background-80 text-[10px] capitalize">
               {(user.display_name ?? "A")[0]}
             </div>
           )}

space/components/issues/navbar/issue-board-view.tsx

@@ -7,28 +7,30 @@ import { useMobxStore } from "lib/mobx/store-provider";
 import { RootStore } from "store/root";
 
 export const NavbarIssueBoardView = observer(() => {
-  const { project: projectStore, issue: issueStore }: RootStore = useMobxStore();
-
+  const {
+    project: { viewOptions, setActiveBoard, activeBoard },
+  }: RootStore = useMobxStore();
+  // router
   const router = useRouter();
   const { workspace_slug, project_slug } = router.query as { workspace_slug: string; project_slug: string };
 
   const handleCurrentBoardView = (boardView: string) => {
-    projectStore.setActiveBoard(boardView);
+    setActiveBoard(boardView);
     router.push(`/${workspace_slug}/${project_slug}?board=${boardView}`);
   };
 
   return (
     <>
-      {projectStore?.viewOptions &&
-        Object.keys(projectStore?.viewOptions).map((viewKey: string) => {
-          if (projectStore?.viewOptions[viewKey]) {
+      {viewOptions &&
+        Object.keys(viewOptions).map((viewKey: string) => {
+          if (viewOptions[viewKey]) {
             return (
               <div
                 key={viewKey}
-                className={`w-[28px] h-[28px] flex justify-center items-center rounded-sm cursor-pointer ${
-                  viewKey === projectStore?.activeBoard
+                className={`flex h-[28px] w-[28px] cursor-pointer items-center justify-center rounded-sm ${
+                  viewKey === activeBoard
                     ? `bg-custom-background-80 text-custom-text-200`
-                    : `hover:bg-custom-background-80 text-custom-text-300`
+                    : `text-custom-text-300 hover:bg-custom-background-80`
                 }`}
                 onClick={() => handleCurrentBoardView(viewKey)}
                 title={viewKey}

space/components/issues/navbar/issue-view.tsx

@@ -1,13 +0,0 @@
-"use client";
-
-// mobx react lite
-import { observer } from "mobx-react-lite";
-// mobx
-import { useMobxStore } from "lib/mobx/store-provider";
-import { RootStore } from "store/root";
-
-export const NavbarIssueView = observer(() => {
-  const store: RootStore = useMobxStore();
-
-  return <div>View</div>;
-});

space/components/issues/navbar/search.tsx

@@ -1,13 +0,0 @@
-"use client";
-
-// mobx react lite
-import { observer } from "mobx-react-lite";
-// mobx
-import { useMobxStore } from "lib/mobx/store-provider";
-import { RootStore } from "store/root";
-
-export const NavbarSearch = observer(() => {
-  const store: RootStore = useMobxStore();
-
-  return <div> </div>;
-});

space/components/issues/peek-overview/full-screen-peek-view.tsx

@@ -1,7 +1,4 @@
-import { useEffect } from "react";
 import { observer } from "mobx-react-lite";
-// lib
-import { useMobxStore } from "lib/mobx/store-provider";
 // components
 import {
   PeekOverviewHeader,
@@ -22,19 +19,19 @@ export const FullScreenPeekView: React.FC<Props> = observer((props) => {
   const { handleClose, issueDetails } = props;
 
   return (
-    <div className="h-full w-full grid grid-cols-10 divide-x divide-custom-border-200 overflow-hidden">
-      <div className="h-full w-full flex flex-col col-span-7 overflow-hidden">
+    <div className="grid h-full w-full grid-cols-10 divide-x divide-custom-border-200 overflow-hidden">
+      <div className="col-span-7 flex h-full w-full flex-col overflow-hidden">
         <div className="w-full p-5">
           <PeekOverviewHeader handleClose={handleClose} issueDetails={issueDetails} />
         </div>
         {issueDetails ? (
-          <div className="h-full w-full px-6 overflow-y-auto">
+          <div className="h-full w-full overflow-y-auto px-6">
             {/* issue title and description */}
             <div className="w-full">
               <PeekOverviewIssueDetails issueDetails={issueDetails} />
             </div>
             {/* divider */}
-            <div className="h-[1] w-full border-t border-custom-border-200 my-5" />
+            <div className="my-5 h-[1] w-full border-t border-custom-border-200" />
             {/* issue activity/comments */}
             <div className="w-full pb-5">
               <PeekOverviewIssueActivity issueDetails={issueDetails} />
@@ -43,7 +40,7 @@ export const FullScreenPeekView: React.FC<Props> = observer((props) => {
         ) : (
           <Loader className="px-6">
             <Loader.Item height="30px" />
-            <div className="space-y-2 mt-3">
+            <div className="mt-3 space-y-2">
               <Loader.Item height="20px" width="70%" />
               <Loader.Item height="20px" width="60%" />
               <Loader.Item height="20px" width="60%" />

space/components/issues/peek-overview/issue-activity.tsx

@@ -18,16 +18,18 @@ type Props = {
   issueDetails: IIssue;
 };
 
-export const PeekOverviewIssueActivity: React.FC<Props> = observer((props) => {
+export const PeekOverviewIssueActivity: React.FC<Props> = observer(() => {
+  // router
   const router = useRouter();
   const { workspace_slug } = router.query;
-
-  const { issueDetails: issueDetailStore, project: projectStore, user: userStore } = useMobxStore();
-
+  // store
+  const {
+    issueDetails: issueDetailStore,
+    project: projectStore,
+    user: { currentUser },
+  } = useMobxStore();
   const comments = issueDetailStore.details[issueDetailStore.peekId || ""]?.comments || [];
 
-  const user = userStore?.currentUser;
-
   return (
     <div className="pb-10">
       <h4 className="font-medium">Activity</h4>
@@ -38,17 +40,17 @@ export const PeekOverviewIssueActivity: React.FC<Props> = observer((props) => {
               <CommentCard key={comment.id} comment={comment} workspaceSlug={workspace_slug?.toString()} />
             ))}
           </div>
-          {user ? (
+          {currentUser ? (
             <>
               {projectStore.deploySettings?.comments && (
                 <div className="mt-4">
-                  <AddComment disabled={!userStore.currentUser} />
+                  <AddComment disabled={!currentUser} />
                 </div>
               )}
             </>
           ) : (
-            <div className="bg-custom-background-80 px-2 py-2.5 flex items-center justify-between gap-2 border border-custom-border-300 rounded mt-4">
-              <p className="flex gap-2 text-sm text-custom-text-200 break-words overflow-hidden">
+            <div className="mt-4 flex items-center justify-between gap-2 rounded border border-custom-border-300 bg-custom-background-80 px-2 py-2.5">
+              <p className="flex gap-2 overflow-hidden break-words text-sm text-custom-text-200">
                 <Icon iconName="lock" className="!text-sm" />
                 Sign in to add your comment
               </p>

space/components/issues/peek-overview/layout.tsx

@@ -13,16 +13,15 @@ import { useMobxStore } from "lib/mobx/store-provider";
 
 type Props = {};
 
-export const IssuePeekOverview: React.FC<Props> = observer((props) => {
+export const IssuePeekOverview: React.FC<Props> = observer(() => {
+  // states
   const [isSidePeekOpen, setIsSidePeekOpen] = useState(false);
   const [isModalPeekOpen, setIsModalPeekOpen] = useState(false);
-
   // router
   const router = useRouter();
   const { workspace_slug, project_slug, peekId, board } = router.query;
   // store
   const { issueDetails: issueDetailStore, issue: issueStore } = useMobxStore();
-
   const issueDetails = issueDetailStore.peekId && peekId ? issueDetailStore.details[peekId.toString()] : undefined;
 
   useEffect(() => {
@@ -75,7 +74,7 @@ export const IssuePeekOverview: React.FC<Props> = observer((props) => {
             leaveFrom="translate-x-0"
             leaveTo="translate-x-full"
           >
-            <Dialog.Panel className="fixed z-20 bg-custom-background-100 top-0 right-0 h-full w-1/2 shadow-custom-shadow-sm">
+            <Dialog.Panel className="fixed right-0 top-0 z-20 h-full w-1/2 bg-custom-background-100 shadow-custom-shadow-sm">
               <SidePeekView handleClose={handleClose} issueDetails={issueDetails} />
             </Dialog.Panel>
           </Transition.Child>
@@ -105,7 +104,7 @@ export const IssuePeekOverview: React.FC<Props> = observer((props) => {
           >
             <Dialog.Panel>
               <div
-                className={`fixed z-20 bg-custom-background-100 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 rounded-lg shadow-custom-shadow-xl transition-all duration-300 ${
+                className={`fixed left-1/2 top-1/2 z-20 -translate-x-1/2 -translate-y-1/2 rounded-lg bg-custom-background-100 shadow-custom-shadow-xl transition-all duration-300 ${
                   issueDetailStore.peekMode === "modal" ? "h-[70%] w-3/5" : "h-[95%] w-[95%]"
                 }`}
               >

space/components/ui/tooltip.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-
 // next-themes
 import { useTheme } from "next-themes";
 // tooltip2
@@ -50,9 +49,9 @@ export const Tooltip: React.FC<Props> = ({
       hoverCloseDelay={closeDelay}
       content={
         <div
-          className={`relative z-50 max-w-xs gap-1 rounded-md p-2 text-xs shadow-md border border-custom-border-200 ${
+          className={`relative z-50 max-w-xs gap-1 rounded-md border border-custom-border-200 p-2 text-xs shadow-md ${
             theme === "custom" ? "bg-custom-background-100 text-custom-text-200" : "bg-black text-gray-400"
-          } break-words overflow-hidden ${className}`}
+          } overflow-hidden break-words ${className}`}
         >
           {tooltipHeading && (
             <h5 className={`font-medium ${theme === "custom" ? "text-custom-text-100" : "text-white"}`}>

space/components/views/login.tsx

@@ -10,7 +10,7 @@ export const LoginView = observer(() => {
   return (
     <>
       {userStore?.loader ? (
-        <div className="relative w-screen h-screen flex justify-center items-center">Loading</div>
+        <div className="relative flex h-screen w-screen items-center justify-center">Loading</div> // TODO: Add spinner instead
       ) : (
         <>{userStore.currentUser ? <UserLoggedIn /> : <SignInView />}</>
       )}

space/components/views/project-details.tsx

@@ -1,9 +1,6 @@
 import { useEffect } from "react";
-
 import Image from "next/image";
 import { useRouter } from "next/router";
-
-// mobx
 import { observer } from "mobx-react-lite";
 // components
 import { IssueListView } from "components/issues/board-views/list";
@@ -20,7 +17,7 @@ import SomethingWentWrongImage from "public/something-went-wrong.svg";
 
 export const ProjectDetailsView = observer(() => {
   const router = useRouter();
-  const { workspace_slug, project_slug, states, labels, priorities, board, peekId } = router.query;
+  const { workspace_slug, project_slug, states, labels, priorities, peekId } = router.query;
 
   const {
     issue: issueStore,
@@ -53,22 +50,22 @@ export const ProjectDetailsView = observer(() => {
   }, [peekId, issueDetailStore, project_slug, workspace_slug]);
 
   return (
-    <div className="relative w-full h-full overflow-hidden">
+    <div className="relative h-full w-full overflow-hidden">
       {workspace_slug && <IssuePeekOverview />}
 
       {issueStore?.loader && !issueStore.issues ? (
-        <div className="text-sm text-center py-10 text-custom-text-100">Loading...</div>
+        <div className="py-10 text-center text-sm text-custom-text-100">Loading...</div>
       ) : (
         <>
           {issueStore?.error ? (
-            <div className="h-full w-full grid place-items-center p-6">
+            <div className="grid h-full w-full place-items-center p-6">
               <div className="text-center">
-                <div className="h-52 w-52 bg-custom-background-80 rounded-full grid place-items-center mx-auto">
-                  <div className="h-32 w-32 grid place-items-center">
+                <div className="mx-auto grid h-52 w-52 place-items-center rounded-full bg-custom-background-80">
+                  <div className="grid h-32 w-32 place-items-center">
                     <Image src={SomethingWentWrongImage} alt="Oops! Something went wrong" />
                   </div>
                 </div>
-                <h1 className="text-3xl font-semibold mt-12">Oops! Something went wrong.</h1>
+                <h1 className="mt-12 text-3xl font-semibold">Oops! Something went wrong.</h1>
                 <p className="mt-4 text-custom-text-300">The public board does not exist. Please check the URL.</p>
               </div>
             </div>
@@ -76,12 +73,12 @@ export const ProjectDetailsView = observer(() => {
             projectStore?.activeBoard && (
               <>
                 {projectStore?.activeBoard === "list" && (
-                  <div className="relative w-full h-full overflow-y-auto">
+                  <div className="relative h-full w-full overflow-y-auto">
                     <IssueListView />
                   </div>
                 )}
                 {projectStore?.activeBoard === "kanban" && (
-                  <div className="relative w-full h-full mx-auto p-5">
+                  <div className="relative mx-auto h-full w-full p-5">
                     <IssueKanbanView />
                   </div>
                 )}

space/lib/mobx/store-init.tsx

@@ -1,5 +1,3 @@
-"use client";
-
 import { useEffect } from "react";
 // next imports
 import { useRouter } from "next/router";
@@ -15,12 +13,6 @@ const MobxStoreInit = () => {
   const router = useRouter();
   const { states, labels, priorities } = router.query as { states: string[]; labels: string[]; priorities: string[] };
 
-  // useEffect(() => {
-  //   store.issue.userSelectedLabels = labels || [];
-  //   store.issue.userSelectedPriorities = priorities || [];
-  //   store.issue.userSelectedStates = states || [];
-  // }, [store.issue]);
-
   useEffect(() => {
     const authToken = Cookie.get("accessToken") || null;
     if (authToken) userStore.fetchCurrentUser();

space/package.json

@@ -17,10 +17,10 @@
     "@emotion/styled": "^11.11.0",
     "@headlessui/react": "^1.7.13",
     "@mui/material": "^5.14.1",
+    "@plane/document-editor": "*",
     "@plane/lite-text-editor": "*",
     "@plane/rich-text-editor": "*",
     "@plane/ui": "*",
-    "@plane/document-editor": "*",
     "axios": "^1.3.4",
     "clsx": "^2.0.0",
     "js-cookie": "^3.0.1",
@@ -28,7 +28,7 @@
     "lucide-react": "^0.293.0",
     "mobx": "^6.10.0",
     "mobx-react-lite": "^4.0.3",
-    "next": "12.3.2",
+    "next": "^14.0.3",
     "next-images": "^1.8.5",
     "next-themes": "^0.2.1",
     "nprogress": "^0.2.0",

space/pages/_app.tsx

@@ -5,7 +5,6 @@ import { ThemeProvider } from "next-themes";
 import "styles/globals.css";
 import "styles/editor.css";
 import "styles/table.css";
-
 // contexts
 import { ToastContextProvider } from "contexts/toast.context";
 // mobx store provider

space/pages/_document.tsx

@@ -5,7 +5,7 @@ class MyDocument extends Document {
     return (
       <Html>
         <Head />
-        <body className="antialiased bg-custom-background-100 w-100">
+        <body className="w-100 bg-custom-background-100 antialiased">
           <Main />
           <NextScript />
         </body>

web/components/account/sign-in-forms/create-password.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import Link from "next/link";
 import { Controller, useForm } from "react-hook-form";
 // services
 import { AuthService } from "services/auth.service";
@@ -74,7 +75,7 @@ export const CreatePasswordForm: React.FC<Props> = (props) => {
 
   return (
     <>
-      <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
         Let{"'"}s get a new password
       </h1>
 
@@ -117,16 +118,23 @@ export const CreatePasswordForm: React.FC<Props> = (props) => {
                 hasError={Boolean(errors.password)}
                 placeholder="Create password"
                 className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
+                minLength={8}
               />
             )}
           />
-          <p className="text-xs text-onboarding-text-200 mt-3">
+          <p className="text-xs text-onboarding-text-200 mt-3 pb-2">
             Whatever you choose now will be your account{"'"}s password until you change it.
           </p>
         </div>
         <Button type="submit" variant="primary" className="w-full" size="xl" disabled={!isValid} loading={isSubmitting}>
           {isSubmitting ? "Submitting..." : "Go to workspace"}
         </Button>
+        <p className="text-xs text-onboarding-text-200">
+          When you click the button above, you agree with our{" "}
+          <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+            <span className="font-semibold underline">terms and conditions of service.</span>
+          </Link>
+        </p>
       </form>
     </>
   );

web/components/account/sign-in-forms/email-form.tsx

@@ -83,10 +83,10 @@ export const EmailForm: React.FC<Props> = (props) => {
 
   return (
     <>
-      <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
-        Get on your flight deck!
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
+        Get on your flight deck
       </h1>
-      <p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
+      <p className="text-center text-sm text-onboarding-text-200 mt-3">
         Sign in with the email you used to sign up for Plane
       </p>
 

web/components/account/sign-in-forms/optional-set-password.tsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import Link from "next/link";
 import { Controller, useForm } from "react-hook-form";
 // ui
 import { Button, Input } from "@plane/ui";
@@ -37,12 +38,12 @@ export const OptionalSetPasswordForm: React.FC<Props> = (props) => {
 
   return (
     <>
-      <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">Set a password</h1>
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">Set a password</h1>
       <p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
-        If you{"'"}d to do away with codes, set a password here.
+        If you{"'"}d to do away with codes, set a password here
       </p>
 
-      <form className="mt-5 sm:w-96 mx-auto">
+      <form className="mt-5 sm:w-96 mx-auto space-y-4">
         <Controller
           control={control}
           name="email"
@@ -65,7 +66,7 @@ export const OptionalSetPasswordForm: React.FC<Props> = (props) => {
             />
           )}
         />
-        <div className="grid grid-cols-2 gap-2.5 mt-4">
+        <div className="grid grid-cols-2 gap-2.5">
           <Button
             type="button"
             variant="primary"
@@ -88,6 +89,12 @@ export const OptionalSetPasswordForm: React.FC<Props> = (props) => {
             {isGoingToWorkspace ? "Going to app..." : "Go to workspace"}
           </Button>
         </div>
+        <p className="text-xs text-onboarding-text-200">
+          When you click <span className="text-custom-primary-100">Go to workspace</span> above, you agree with our{" "}
+          <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+            <span className="font-semibold underline">terms and conditions of service.</span>
+          </Link>
+        </p>
       </form>
     </>
   );

web/components/account/sign-in-forms/password.tsx

@@ -1,4 +1,5 @@
-import React from "react";
+import React, { useState } from "react";
+import Link from "next/link";
 import { Controller, useForm } from "react-hook-form";
 import { XCircle } from "lucide-react";
 // services
@@ -35,6 +36,8 @@ const authService = new AuthService();
 
 export const PasswordForm: React.FC<Props> = (props) => {
   const { email, updateEmail, handleStepChange, handleSignInRedirection } = props;
+  // states
+  const [isSendingResetPasswordLink, setIsSendingResetPasswordLink] = useState(false);
   // toast alert
   const { setToastAlert } = useToast();
   // form info
@@ -112,6 +115,8 @@ export const PasswordForm: React.FC<Props> = (props) => {
       return;
     }
 
+    setIsSendingResetPasswordLink(true);
+
     authService
       .sendResetPasswordLink({ email: emailFormValue })
       .then(() => handleStepChange(ESignInSteps.SET_PASSWORD_LINK))
@@ -121,7 +126,8 @@ export const PasswordForm: React.FC<Props> = (props) => {
           title: "Error!",
           message: err?.error ?? "Something went wrong. Please try again.",
         })
-      );
+      )
+      .finally(() => setIsSendingResetPasswordLink(false));
   };
 
   return (
@@ -184,17 +190,28 @@ export const PasswordForm: React.FC<Props> = (props) => {
               />
             )}
           />
-          <button
-            type="button"
-            onClick={handleForgotPassword}
-            className="text-xs font-medium text-right w-full text-custom-primary-100"
-          >
-            Forgot your password?
-          </button>
+          <div className="w-full text-right">
+            <button
+              type="button"
+              onClick={handleForgotPassword}
+              className={`text-xs font-medium ${
+                isSendingResetPasswordLink ? "text-onboarding-text-300" : "text-custom-primary-100"
+              }`}
+              disabled={isSendingResetPasswordLink}
+            >
+              {isSendingResetPasswordLink ? "Sending link..." : "Forgot your password?"}
+            </button>
+          </div>
         </div>
         <Button type="submit" variant="primary" className="w-full" size="xl" disabled={!isValid} loading={isSubmitting}>
           {isSubmitting ? "Signing in..." : "Go to workspace"}
         </Button>
+        <p className="text-xs text-onboarding-text-200">
+          When you click the button above, you agree with our{" "}
+          <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+            <span className="font-semibold underline">terms and conditions of service.</span>
+          </Link>
+        </p>
       </form>
     </>
   );

web/components/account/sign-in-forms/root.tsx

@@ -1,4 +1,6 @@
 import React, { useState } from "react";
+// hooks
+import useSignInRedirection from "hooks/use-sign-in-redirection";
 // components
 import {
   EmailForm,
@@ -19,31 +21,27 @@ export enum ESignInSteps {
   CREATE_PASSWORD = "CREATE_PASSWORD",
 }
 
-type Props = {
-  handleSignInRedirection: () => Promise<void>;
-};
+const OAUTH_HIDDEN_STEPS = [ESignInSteps.OPTIONAL_SET_PASSWORD, ESignInSteps.CREATE_PASSWORD];
 
-export const SignInRoot: React.FC<Props> = (props) => {
-  const { handleSignInRedirection } = props;
+export const SignInRoot = () => {
   // states
   const [signInStep, setSignInStep] = useState<ESignInSteps>(ESignInSteps.EMAIL);
   const [email, setEmail] = useState("");
+  // sign in redirection hook
+  const { handleRedirection } = useSignInRedirection();
 
   return (
     <>
       <div className="mx-auto flex flex-col">
         {signInStep === ESignInSteps.EMAIL && (
-          <EmailForm
-            handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-            updateEmail={(newEmail) => setEmail(newEmail)}
-          />
+          <EmailForm handleStepChange={(step) => setSignInStep(step)} updateEmail={(newEmail) => setEmail(newEmail)} />
         )}
         {signInStep === ESignInSteps.PASSWORD && (
           <PasswordForm
             email={email}
             updateEmail={(newEmail) => setEmail(newEmail)}
-            handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-            handleSignInRedirection={handleSignInRedirection}
+            handleStepChange={(step) => setSignInStep(step)}
+            handleSignInRedirection={handleRedirection}
           />
         )}
         {signInStep === ESignInSteps.SET_PASSWORD_LINK && (
@@ -53,30 +51,30 @@ export const SignInRoot: React.FC<Props> = (props) => {
           <UniqueCodeForm
             email={email}
             updateEmail={(newEmail) => setEmail(newEmail)}
-            handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-            handleSignInRedirection={handleSignInRedirection}
+            handleStepChange={(step) => setSignInStep(step)}
+            handleSignInRedirection={handleRedirection}
           />
         )}
         {signInStep === ESignInSteps.OPTIONAL_SET_PASSWORD && (
           <OptionalSetPasswordForm
             email={email}
-            handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-            handleSignInRedirection={handleSignInRedirection}
+            handleStepChange={(step) => setSignInStep(step)}
+            handleSignInRedirection={handleRedirection}
           />
         )}
         {signInStep === ESignInSteps.CREATE_PASSWORD && (
           <CreatePasswordForm
             email={email}
-            handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-            handleSignInRedirection={handleSignInRedirection}
+            handleStepChange={(step) => setSignInStep(step)}
+            handleSignInRedirection={handleRedirection}
           />
         )}
       </div>
-      {signInStep !== ESignInSteps.OPTIONAL_SET_PASSWORD && (
+      {!OAUTH_HIDDEN_STEPS.includes(signInStep) && (
         <OAuthOptions
           updateEmail={(newEmail) => setEmail(newEmail)}
-          handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
-          handleSignInRedirection={handleSignInRedirection}
+          handleStepChange={(step) => setSignInStep(step)}
+          handleSignInRedirection={handleRedirection}
         />
       )}
     </>

web/components/account/sign-in-forms/set-password-link.tsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import Link from "next/link";
 import { Controller, useForm } from "react-hook-form";
 import { XCircle } from "lucide-react";
 // services
@@ -29,7 +30,7 @@ export const SetPasswordLink: React.FC<Props> = (props) => {
   const {
     control,
     formState: { errors, isValid },
-    watch,
+    handleSubmit,
   } = useForm({
     defaultValues: {
       email,
@@ -38,16 +39,25 @@ export const SetPasswordLink: React.FC<Props> = (props) => {
     reValidateMode: "onChange",
   });
 
-  const handleSendNewLink = async () => {
+  const handleSendNewLink = async (formData: { email: string }) => {
     setIsSendingNewLink(true);
 
+    updateEmail(formData.email);
+
     const payload: IEmailCheckData = {
-      email: watch("email"),
+      email: formData.email,
       type: "password",
     };
 
     await authService
       .emailCheck(payload)
+      .then(() =>
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "We have sent a new link to your email.",
+        })
+      )
       .catch((err) =>
         setToastAlert({
           type: "error",
@@ -60,15 +70,15 @@ export const SetPasswordLink: React.FC<Props> = (props) => {
 
   return (
     <>
-      <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
-        Get on your flight deck!
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
+        Get on your flight deck
       </h1>
       <p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
-        We have sent a link to <span className="font-medium text-custom-primary-100">{email},</span> so you can set a
+        We have sent a link to <span className="font-semibold text-custom-primary-100">{email},</span> so you can set a
         password
       </p>
 
-      <form className="mt-5 sm:w-96 mx-auto">
+      <form onSubmit={handleSubmit(handleSendNewLink)} className="mt-5 sm:w-96 mx-auto space-y-4">
         <div className="space-y-1">
           <Controller
             control={control}
@@ -84,10 +94,7 @@ export const SetPasswordLink: React.FC<Props> = (props) => {
                   name="email"
                   type="email"
                   value={value}
-                  onChange={(e) => {
-                    updateEmail(e.target.value);
-                    onChange(e.target.value);
-                  }}
+                  onChange={onChange}
                   ref={ref}
                   hasError={Boolean(errors.email)}
                   placeholder="orville.wright@firstflight.com"
@@ -103,19 +110,22 @@ export const SetPasswordLink: React.FC<Props> = (props) => {
             )}
           />
         </div>
-        <div className="mt-4">
-          <Button
-            type="button"
-            variant="primary"
-            className="w-full"
-            size="xl"
-            onClick={handleSendNewLink}
-            disabled={!isValid}
-            loading={isSendingNewLink}
-          >
-            {isSendingNewLink ? "Sending new link..." : "Get link again"}
-          </Button>
-        </div>
+        <Button
+          type="submit"
+          variant="primary"
+          className="w-full"
+          size="xl"
+          disabled={!isValid}
+          loading={isSendingNewLink}
+        >
+          {isSendingNewLink ? "Sending new link..." : "Get link again"}
+        </Button>
+        <p className="text-xs text-onboarding-text-200">
+          When you click the button above, you agree with our{" "}
+          <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+            <span className="font-semibold underline">terms and conditions of service.</span>
+          </Link>
+        </p>
       </form>
     </>
   );

web/components/account/sign-in-forms/unique-code.tsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import Link from "next/link";
 import { Controller, useForm } from "react-hook-form";
 import { CornerDownLeft, XCircle } from "lucide-react";
 // services
@@ -44,7 +45,7 @@ export const UniqueCodeForm: React.FC<Props> = (props) => {
   // toast alert
   const { setToastAlert } = useToast();
   // timer
-  const { timer: resendTimerCode, setTimer: setResendCodeTimer } = useTimer();
+  const { timer: resendTimerCode, setTimer: setResendCodeTimer } = useTimer(30);
   // form info
   const {
     control,
@@ -131,11 +132,9 @@ export const UniqueCodeForm: React.FC<Props> = (props) => {
 
   return (
     <>
-      <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
-        Moving to the runway
-      </h1>
-      <p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
-        Paste the code you got at <span className="font-medium text-custom-primary-100">{email}</span> below.
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">Moving to the runway</h1>
+      <p className="text-center text-sm text-onboarding-text-200 mt-3">
+        Paste the code you got at <span className="font-semibold text-custom-primary-100">{email}</span> below
       </p>
 
       <form onSubmit={handleSubmit(handleFormSubmit)} className="mt-5 sm:w-96 mx-auto space-y-4">
@@ -196,25 +195,29 @@ export const UniqueCodeForm: React.FC<Props> = (props) => {
                 value={value}
                 onChange={onChange}
                 hasError={Boolean(errors.token)}
-                placeholder="gets-sets-fays"
+                placeholder="gets-sets-flys"
                 className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
               />
             )}
           />
-          <button
-            type="button"
-            onClick={handleRequestNewCode}
-            className={`text-xs text-right w-full text-onboarding-text-200 ${
-              isRequestNewCodeDisabled ? "" : "hover:text-custom-primary-100"
-            }`}
-            disabled={isRequestNewCodeDisabled}
-          >
-            {resendTimerCode > 0
-              ? `Request new code in ${resendTimerCode}s`
-              : isRequestingNewCode
-              ? "Requesting new code..."
-              : "Request new code"}
-          </button>
+          <div className="w-full text-right">
+            <button
+              type="button"
+              onClick={handleRequestNewCode}
+              className={`text-xs ${
+                isRequestNewCodeDisabled
+                  ? "text-onboarding-text-300"
+                  : "text-onboarding-text-200 hover:text-custom-primary-100"
+              }`}
+              disabled={isRequestNewCodeDisabled}
+            >
+              {resendTimerCode > 0
+                ? `Request new code in ${resendTimerCode}s`
+                : isRequestingNewCode
+                ? "Requesting new code..."
+                : "Request new code"}
+            </button>
+          </div>
         </div>
         <Button
           type="submit"
@@ -226,6 +229,12 @@ export const UniqueCodeForm: React.FC<Props> = (props) => {
         >
           {isSubmitting ? "Signing in..." : "Confirm"}
         </Button>
+        <p className="text-xs text-onboarding-text-200">
+          When you click Confirm above, you agree with our{" "}
+          <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+            <span className="font-semibold underline">terms and conditions of service.</span>
+          </Link>
+        </p>
       </form>
     </>
   );

web/components/automation/auto-archive-automation.tsx

@@ -11,6 +11,7 @@ import { ArchiveRestore } from "lucide-react";
 import { PROJECT_AUTOMATION_MONTHS } from "constants/project";
 // types
 import { IProject } from "types";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 type Props = {
   handleChange: (formData: Partial<IProject>) => Promise<void>;
@@ -28,6 +29,8 @@ export const AutoArchiveAutomation: React.FC<Props> = observer((props) => {
   const projectDetails = projectStore.currentProjectDetails;
   const userRole = userStore.currentProjectRole;
 
+  const isAdmin = userRole === EUserWorkspaceRoles.ADMIN;
+
   return (
     <>
       <SelectMonthModal
@@ -56,7 +59,7 @@ export const AutoArchiveAutomation: React.FC<Props> = observer((props) => {
               projectDetails?.archive_in === 0 ? handleChange({ archive_in: 1 }) : handleChange({ archive_in: 0 })
             }
             size="sm"
-            disabled={userRole !== 20}
+            disabled={!isAdmin}
           />
         </div>
 
@@ -74,7 +77,7 @@ export const AutoArchiveAutomation: React.FC<Props> = observer((props) => {
                     }}
                     input
                     width="w-full"
-                    disabled={userRole !== 20}
+                    disabled={!isAdmin}
                   >
                     <>
                       {PROJECT_AUTOMATION_MONTHS.map((month) => (

web/components/automation/auto-close-automation.tsx

@@ -11,6 +11,7 @@ import { ArchiveX } from "lucide-react";
 import { IProject } from "types";
 // fetch keys
 import { PROJECT_AUTOMATION_MONTHS } from "constants/project";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 type Props = {
   handleChange: (formData: Partial<IProject>) => Promise<void>;
@@ -53,6 +54,8 @@ export const AutoCloseAutomation: React.FC<Props> = observer((props) => {
     default_state: defaultState,
   };
 
+  const isAdmin = userRole === EUserWorkspaceRoles.ADMIN;
+
   return (
     <>
       <SelectMonthModal
@@ -83,7 +86,7 @@ export const AutoCloseAutomation: React.FC<Props> = observer((props) => {
                 : handleChange({ close_in: 0, default_state: null })
             }
             size="sm"
-            disabled={userRole !== 20}
+            disabled={!isAdmin}
           />
         </div>
 
@@ -102,7 +105,7 @@ export const AutoCloseAutomation: React.FC<Props> = observer((props) => {
                       }}
                       input
                       width="w-full"
-                      disabled={userRole !== 20}
+                      disabled={!isAdmin}
                     >
                       <>
                         {PROJECT_AUTOMATION_MONTHS.map((month) => (

web/components/command-palette/command-pallette.tsx

@@ -55,22 +55,10 @@ export const CommandPalette: FC = observer(() => {
     toggleBulkDeleteIssueModal,
     isDeleteIssueModalOpen,
     toggleDeleteIssueModal,
-
+    isAnyModalOpen,
     createIssueStoreType,
   } = commandPalette;
 
-  const isAnyModalOpen = Boolean(
-    isCreateIssueModalOpen ||
-      isCreateCycleModalOpen ||
-      isCreatePageModalOpen ||
-      isCreateProjectModalOpen ||
-      isCreateModuleModalOpen ||
-      isCreateViewModalOpen ||
-      isShortcutModalOpen ||
-      isBulkDeleteIssueModalOpen ||
-      isDeleteIssueModalOpen
-  );
-
   const { setToastAlert } = useToast();
 
   const { data: issueDetails } = useSWR(

web/components/common/latest-feature-block.tsx

@@ -1,34 +1,35 @@
 import Image from "next/image";
+import Link from "next/link";
 import { useTheme } from "next-themes";
 // icons
 import { Lightbulb } from "lucide-react";
 // images
-import signInIssues from "public/onboarding/onboarding-issues.svg";
+import latestFeatures from "public/onboarding/onboarding-pages.svg";
 
 export const LatestFeatureBlock = () => {
   const { resolvedTheme } = useTheme();
 
   return (
     <>
-      <div
-        className={`flex py-2 bg-onboarding-background-100 border border-onboarding-border-200 mx-auto rounded-[3.5px] sm:w-96 mt-16`}
-      >
+      <div className="flex py-2 bg-onboarding-background-100 border border-onboarding-border-200 mx-auto rounded-[3.5px] sm:w-96 mt-16">
         <Lightbulb className="h-7 w-7 mr-2 mx-3" />
-        <p className={`text-sm text-left text-onboarding-text-100`}>
-          Try the latest features, like Tiptap editor, to write compelling responses.{" "}
-          <span className="font-medium text-sm underline hover:cursor-pointer" onClick={() => {}}>
-            See new features
-          </span>
+        <p className="text-sm text-left text-onboarding-text-100">
+          Pages gets a facelift! Write anything and use Galileo to help you start.{" "}
+          <Link href="https://plane.so/changelog" target="_blank" rel="noopener noreferrer">
+            <span className="font-medium text-sm underline hover:cursor-pointer">Learn more</span>
+          </Link>
         </p>
       </div>
-      <div className="flex justify-center border border-onboarding-border-200 sm:w-96 sm:h-52 object-cover mt-8 mx-auto rounded-md bg-onboarding-background-100 ">
-        <Image
-          src={signInIssues}
-          alt="Plane Issues"
-          className={`flex object-cover rounded-md ${
-            resolvedTheme === "dark" ? "bg-onboarding-background-100" : "bg-custom-primary-70"
-          } `}
-        />
+      <div className="border border-onboarding-border-200 sm:w-96 sm:h-52 object-cover mt-8 mx-auto rounded-md bg-onboarding-background-100 overflow-hidden">
+        <div className="h-[90%]">
+          <Image
+            src={latestFeatures}
+            alt="Plane Issues"
+            className={`rounded-md h-full ml-8 -mt-2 ${
+              resolvedTheme === "dark" ? "bg-onboarding-background-100" : "bg-custom-primary-70"
+            } `}
+          />
+        </div>
       </div>
     </>
   );

web/components/common/new-empty-state.tsx

@@ -46,7 +46,7 @@ export const NewEmptyState: React.FC<Props> = ({
         <h3 className="font-semibold text-2xl">{title}</h3>
         {description && <p className=" text-lg">{description}</p>}
         <div className="relative w-full max-w-6xl">
-          <Image src={image} className="w-52 sm:w-60" alt={primaryButton?.text || "button image"} />
+          <Image src={image} className="w-full" alt={primaryButton?.text || "button image"} />
         </div>
 
         <div className="flex justify-center items-start relative">

web/components/cycles/cycles-board-card.tsx

@@ -33,7 +33,10 @@ export interface ICyclesBoardCard {
 export const CyclesBoardCard: FC<ICyclesBoardCard> = (props) => {
   const { cycle, workspaceSlug, projectId } = props;
   // store
-  const { cycle: cycleStore, trackEvent: { setTrackElement } } = useMobxStore();
+  const {
+    cycle: cycleStore,
+    trackEvent: { setTrackElement },
+  } = useMobxStore();
   // toast
   const { setToastAlert } = useToast();
   // states
@@ -152,7 +155,7 @@ export const CyclesBoardCard: FC<ICyclesBoardCard> = (props) => {
       />
 
       <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle.id}`}>
-        <span className="flex flex-col justify-between p-4 h-44 w-full min-w-[250px]  text-sm rounded bg-custom-background-100 border border-custom-border-100 hover:shadow-md">
+        <div className="flex flex-col justify-between p-4 h-44 w-full min-w-[250px]  text-sm rounded bg-custom-background-100 border border-custom-border-100 hover:shadow-md">
           <div className="flex items-center justify-between gap-2">
             <div className="flex items-center gap-3 truncate">
               <span className="flex-shrink-0">
@@ -268,7 +271,7 @@ export const CyclesBoardCard: FC<ICyclesBoardCard> = (props) => {
               </div>
             </div>
           </div>
-        </span>
+        </div>
       </Link>
     </div>
   );

web/components/cycles/cycles-list-item.tsx

@@ -153,7 +153,7 @@ export const CyclesListItem: FC<TCyclesListItem> = (props) => {
         projectId={projectId}
       />
       <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle.id}`}>
-        <span className="group flex items-center justify-between gap-5 px-5 py-6 h-16 w-full text-sm bg-custom-background-100 border-b border-custom-border-100 hover:bg-custom-background-90">
+        <div className="group flex items-center justify-between gap-5 px-5 py-6 h-16 w-full text-sm bg-custom-background-100 border-b border-custom-border-100 hover:bg-custom-background-90">
           <div className="flex items-center gap-3 w-full truncate">
             <div className="flex items-center gap-4 truncate">
               <span className="flex-shrink-0">
@@ -262,7 +262,7 @@ export const CyclesListItem: FC<TCyclesListItem> = (props) => {
               </CustomMenu.MenuItem>
             </CustomMenu>
           </div>
-        </span>
+        </div>
       </Link>
     </>
   );

web/components/cycles/sidebar.tsx

@@ -52,7 +52,10 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
   const router = useRouter();
   const { workspaceSlug, projectId, peekCycle } = router.query;
 
-  const { cycle: cycleDetailsStore, trackEvent: { setTrackElement, postHogEventTracker } } = useMobxStore();
+  const {
+    cycle: cycleDetailsStore,
+    trackEvent: { setTrackElement, postHogEventTracker },
+  } = useMobxStore();
 
   const cycleDetails = cycleDetailsStore.cycle_details[cycleId] ?? undefined;
 
@@ -70,31 +73,7 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
   const submitChanges = (data: Partial<ICycle>) => {
     if (!workspaceSlug || !projectId || !cycleId) return;
 
-    mutate<ICycle>(CYCLE_DETAILS(cycleId as string), (prevData) => ({ ...(prevData as ICycle), ...data }), false);
-
-    cycleService
-      .patchCycle(workspaceSlug as string, projectId as string, cycleId as string, data)
-      .then((res) => {
-        mutate(CYCLE_DETAILS(cycleId as string));
-        postHogEventTracker(
-          "CYCLE_UPDATE",
-          {
-            ...res,
-            state: "SUCCESS"
-          }
-        );
-      }
-      )
-      .catch((e) => {
-        console.log(e);
-        postHogEventTracker(
-          "CYCLE_UPDATE",
-          {
-            state: "FAILED"
-          }
-        );
-      }
-      );
+    cycleDetailsStore.patchCycle(workspaceSlug.toString(), projectId.toString(), cycleId.toString(), data);
   };
 
   const handleCopyText = () => {
@@ -304,10 +283,10 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
     cycleDetails.total_issues === 0
       ? "0 Issue"
       : cycleDetails.total_issues === cycleDetails.completed_issues
-        ? cycleDetails.total_issues > 1
-          ? `${cycleDetails.total_issues}`
-          : `${cycleDetails.total_issues}`
-        : `${cycleDetails.completed_issues}/${cycleDetails.total_issues}`;
+      ? cycleDetails.total_issues > 1
+        ? `${cycleDetails.total_issues}`
+        : `${cycleDetails.total_issues}`
+      : `${cycleDetails.completed_issues}/${cycleDetails.total_issues}`;
 
   return (
     <>
@@ -337,11 +316,12 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
             </button>
             {!isCompleted && (
               <CustomMenu width="lg" placement="bottom-end" ellipsis>
-                <CustomMenu.MenuItem onClick={() => {
-                  setTrackElement("CYCLE_PAGE_SIDEBAR");
-                  setCycleDeleteModal(true)
-                }
-                }>
+                <CustomMenu.MenuItem
+                  onClick={() => {
+                    setTrackElement("CYCLE_PAGE_SIDEBAR");
+                    setCycleDeleteModal(true);
+                  }}
+                >
                   <span className="flex items-center justify-start gap-2">
                     <Trash2 className="h-3 w-3" />
                     <span>Delete cycle</span>

web/components/cycles/transfer-issues-modal.tsx

@@ -2,10 +2,12 @@ import React, { useState } from "react";
 import { useRouter } from "next/router";
 import useSWR from "swr";
 import { Dialog, Transition } from "@headlessui/react";
+import { observer } from "mobx-react-lite";
 // services
 import { CycleService } from "services/cycle.service";
 // hooks
 import useToast from "hooks/use-toast";
+import { useMobxStore } from "lib/mobx/store-provider";
 //icons
 import { ContrastIcon, TransferIcon } from "@plane/ui";
 import { AlertCircle, Search, X } from "lucide-react";
@@ -23,17 +25,19 @@ type Props = {
 
 const cycleService = new CycleService();
 
-export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) => {
+export const TransferIssuesModal: React.FC<Props> = observer(({ isOpen, handleClose }) => {
   const [query, setQuery] = useState("");
 
+  const { cycleIssues: cycleIssueStore } = useMobxStore();
+
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId } = router.query;
 
   const { setToastAlert } = useToast();
 
   const transferIssue = async (payload: any) => {
-    await cycleService
-      .transferIssues(workspaceSlug as string, projectId as string, cycleId as string, payload)
+    await cycleIssueStore
+      .transferIssuesFromCycle(workspaceSlug as string, projectId as string, cycleId as string, payload)
       .then(() => {
         setToastAlert({
           type: "success",
@@ -159,4 +163,4 @@ export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) =>
       </Dialog>
     </Transition.Root>
   );
-};
+});

web/components/headers/global-issues.tsx

@@ -2,8 +2,6 @@ import { useCallback, useState } from "react";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { observer } from "mobx-react-lite";
-import useSWR from "swr";
-
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
 // components
@@ -17,6 +15,7 @@ import { List, PlusIcon, Sheet } from "lucide-react";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TStaticViewTypes } from "types";
 // constants
 import { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "constants/issue";
+import { EFilterType } from "store/issues/types";
 
 const GLOBAL_VIEW_LAYOUTS = [
   { key: "list", title: "List", link: "/workspace-views", icon: List },
@@ -27,73 +26,55 @@ type Props = {
   activeLayout: "list" | "spreadsheet";
 };
 
-const STATIC_VIEW_TYPES: TStaticViewTypes[] = ["all-issues", "assigned", "created", "subscribed"];
-
 export const GlobalIssuesHeader: React.FC<Props> = observer((props) => {
   const { activeLayout } = props;
 
   const [createViewModal, setCreateViewModal] = useState(false);
 
   const router = useRouter();
-  const { workspaceSlug, globalViewId } = router.query;
+  const { workspaceSlug } = router.query as { workspaceSlug: string };
 
   const {
-    globalViewFilters: globalViewFiltersStore,
-    workspaceFilter: workspaceFilterStore,
-    workspace: workspaceStore,
+    workspace: { workspaceLabels },
     workspaceMember: { workspaceMembers },
-    project: projectStore,
-  } = useMobxStore();
+    project: { workspaceProjects },
 
-  const storedFilters = globalViewId ? globalViewFiltersStore.storedFilters[globalViewId.toString()] : undefined;
+    workspaceGlobalIssuesFilter: { issueFilters, updateFilters },
+  } = useMobxStore();
 
   const handleFiltersUpdate = useCallback(
     (key: keyof IIssueFilterOptions, value: string | string[]) => {
-      if (!workspaceSlug || !globalViewId) return;
-
-      const newValues = storedFilters?.[key] ?? [];
+      if (!workspaceSlug) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
 
       if (Array.isArray(value)) {
         value.forEach((val) => {
           if (!newValues.includes(val)) newValues.push(val);
         });
       } else {
-        if (storedFilters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
         else newValues.push(value);
       }
 
-      globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), {
-        [key]: newValues,
-      });
+      updateFilters(workspaceSlug, EFilterType.FILTERS, { [key]: newValues });
     },
-    [globalViewId, globalViewFiltersStore, storedFilters, workspaceSlug]
+    [workspaceSlug, issueFilters, updateFilters]
   );
 
-  const handleDisplayFiltersUpdate = useCallback(
+  const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug) return;
-
-      workspaceFilterStore.updateWorkspaceFilters(workspaceSlug.toString(), {
-        display_filters: updatedDisplayFilter,
-      });
+      updateFilters(workspaceSlug, EFilterType.DISPLAY_FILTERS, updatedDisplayFilter);
     },
-    [workspaceFilterStore, workspaceSlug]
+    [workspaceSlug, updateFilters]
   );
 
-  const handleDisplayPropertiesUpdate = useCallback(
+  const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug) return;
-
-      workspaceFilterStore.updateWorkspaceFilters(workspaceSlug.toString(), {
-        display_properties: property,
-      });
+      updateFilters(workspaceSlug, EFilterType.DISPLAY_PROPERTIES, property);
     },
-    [workspaceFilterStore, workspaceSlug]
-  );
-
-  useSWR(
-    workspaceSlug ? "USER_WORKSPACE_DISPLAY_FILTERS" : null,
-    workspaceSlug ? () => workspaceFilterStore.fetchUserWorkspaceFilters(workspaceSlug.toString()) : null
+    [workspaceSlug, updateFilters]
   );
 
   return (
@@ -137,32 +118,31 @@ export const GlobalIssuesHeader: React.FC<Props> = observer((props) => {
               </Link>
             ))}
           </div>
+
           {activeLayout === "spreadsheet" && (
             <>
-              {!STATIC_VIEW_TYPES.some((word) => router.pathname.includes(word)) && (
-                <FiltersDropdown title="Filters" placement="bottom-end">
-                  <FilterSelection
-                    filters={storedFilters ?? {}}
-                    handleFiltersUpdate={handleFiltersUpdate}
-                    layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
-                    labels={workspaceStore.workspaceLabels ?? undefined}
-                    members={workspaceMembers?.map((m) => m.member) ?? undefined}
-                    projects={workspaceSlug ? projectStore.projects[workspaceSlug.toString()] : undefined}
-                  />
-                </FiltersDropdown>
-              )}
-
+              <FiltersDropdown title="Filters" placement="bottom-end">
+                <FilterSelection
+                  layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
+                  filters={issueFilters?.filters ?? {}}
+                  handleFiltersUpdate={handleFiltersUpdate}
+                  labels={workspaceLabels ?? undefined}
+                  members={workspaceMembers?.map((m) => m.member)}
+                  projects={workspaceProjects ?? undefined}
+                />
+              </FiltersDropdown>
               <FiltersDropdown title="Display" placement="bottom-end">
                 <DisplayFiltersSelection
-                  displayFilters={workspaceFilterStore.workspaceDisplayFilters}
-                  displayProperties={workspaceFilterStore.workspaceDisplayProperties}
-                  handleDisplayFiltersUpdate={handleDisplayFiltersUpdate}
-                  handleDisplayPropertiesUpdate={handleDisplayPropertiesUpdate}
                   layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
+                  displayFilters={issueFilters?.displayFilters ?? {}}
+                  handleDisplayFiltersUpdate={handleDisplayFilters}
+                  displayProperties={issueFilters?.displayProperties ?? {}}
+                  handleDisplayPropertiesUpdate={handleDisplayProperties}
                 />
               </FiltersDropdown>
             </>
           )}
+
           <Button variant="primary" size="sm" prependIcon={<PlusIcon />} onClick={() => setCreateViewModal(true)}>
             New View
           </Button>

web/components/headers/project-views.tsx

@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { useRouter } from "next/router";
 import { observer } from "mobx-react-lite";
 import { Plus } from "lucide-react";
@@ -15,18 +14,16 @@ export const ProjectViewsHeader: React.FC = observer(() => {
   // router
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
-  // states
-  const [createViewModal, setCreateViewModal] = useState(false);
 
-  const { project: projectStore } = useMobxStore();
+  const { project: projectStore, commandPalette } = useMobxStore();
   const { currentProjectDetails } = projectStore;
 
   return (
     <>
       {workspaceSlug && projectId && (
         <CreateUpdateProjectViewModal
-          isOpen={createViewModal}
-          onClose={() => setCreateViewModal(false)}
+          isOpen={commandPalette.isCreateViewModalOpen}
+          onClose={() => commandPalette.toggleCreateViewModal(false)}
           workspaceSlug={workspaceSlug.toString()}
           projectId={projectId.toString()}
         />
@@ -69,7 +66,7 @@ export const ProjectViewsHeader: React.FC = observer(() => {
               variant="primary"
               size="sm"
               prependIcon={<Plus className="h-3.5 w-3.5 stroke-2" />}
-              onClick={() => setCreateViewModal(true)}
+              onClick={() => commandPalette.toggleCreateViewModal(true)}
             >
               Create View
             </Button>

web/components/inbox/actions-header.tsx

@@ -22,6 +22,7 @@ import { Button } from "@plane/ui";
 import { CheckCircle2, ChevronDown, ChevronUp, Clock, FileStack, Inbox, Trash2, XCircle } from "lucide-react";
 // types
 import type { TInboxStatus } from "types";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 export const InboxActionsHeader = observer(() => {
   const [date, setDate] = useState(new Date());
@@ -71,7 +72,7 @@ export const InboxActionsHeader = observer(() => {
   }, [issue]);
 
   const issueStatus = issue?.issue_inbox[0].status;
-  const isAllowed = userRole === 15 || userRole === 20;
+  const isAllowed = !!userRole && userRole >= EUserWorkspaceRoles.MEMBER;
 
   const today = new Date();
   const tomorrow = new Date(today);

web/components/inbox/issue-card.tsx

@@ -27,71 +27,69 @@ export const InboxIssueCard: React.FC<Props> = (props) => {
 
   return (
     <Link href={`/${workspaceSlug}/projects/${projectId}/inbox/${inboxId}?inboxIssueId=${issue.issue_inbox[0].id}`}>
-      <span>
-        <div
-          id={issue.id}
-          className={`relative min-h-[5rem] cursor-pointer select-none space-y-3 py-2 px-4 border-b border-custom-border-200 hover:bg-custom-primary/5 ${
-            active ? "bg-custom-primary/5" : " "
-          } ${issue.issue_inbox[0].status !== -2 ? "opacity-60" : ""}`}
-        >
-          <div className="flex items-center gap-x-2">
-            <p className="flex-shrink-0 text-custom-text-200 text-xs">
-              {issue.project_detail?.identifier}-{issue.sequence_id}
-            </p>
-            <h5 className="truncate text-sm">{issue.name}</h5>
-          </div>
-          <div className="flex items-center gap-2 flex-wrap">
-            <Tooltip tooltipHeading="Priority" tooltipContent={`${issue.priority ?? "None"}`}>
-                <PriorityIcon priority={issue.priority ?? null} className="h-3.5 w-3.5" />
-            </Tooltip>
-            <Tooltip
-              tooltipHeading="Created on"
-              tooltipContent={`${renderShortDateWithYearFormat(issue.created_at ?? "")}`}
-            >
-              <div className="flex items-center gap-1 rounded border border-custom-border-200 shadow-sm text-xs px-2 py-[0.19rem] text-custom-text-200">
-                <CalendarDays size={12} strokeWidth={1.5} />
-                <span>{renderShortDateWithYearFormat(issue.created_at ?? "")}</span>
-              </div>
-            </Tooltip>
-          </div>
-          <div
-            className={`text-xs flex items-center justify-end gap-1 w-full ${
-              issueStatus === 0 && new Date(issue.issue_inbox[0].snoozed_till ?? "") < new Date()
-                ? "text-red-500"
-                : INBOX_STATUS.find((s) => s.value === issueStatus)?.textColor
-            }`}
-          >
-            {issueStatus === -2 ? (
-              <>
-                <AlertTriangle size={14} strokeWidth={2} />
-                <span>Pending</span>
-              </>
-            ) : issueStatus === -1 ? (
-              <>
-                <XCircle size={14} strokeWidth={2} />
-                <span>Declined</span>
-              </>
-            ) : issueStatus === 0 ? (
-              <>
-                <Clock size={14} strokeWidth={2} />
-                <span>
-                  {new Date(issue.issue_inbox[0].snoozed_till ?? "") < new Date() ? "Snoozed date passed" : "Snoozed"}
-                </span>
-              </>
-            ) : issueStatus === 1 ? (
-              <>
-                <CheckCircle2 size={14} strokeWidth={2} />
-                <span>Accepted</span>
-              </>
-            ) : (
-              <>
-                <Copy size={14} strokeWidth={2} />
-                <span>Duplicate</span>
-              </>
-            )}
-          </div>
+      <div
+        id={issue.id}
+        className={`relative min-h-[5rem] cursor-pointer select-none space-y-3 py-2 px-4 border-b border-custom-border-200 hover:bg-custom-primary/5 ${
+          active ? "bg-custom-primary/5" : " "
+        } ${issue.issue_inbox[0].status !== -2 ? "opacity-60" : ""}`}
+      >
+        <div className="flex items-center gap-x-2">
+          <p className="flex-shrink-0 text-custom-text-200 text-xs">
+            {issue.project_detail?.identifier}-{issue.sequence_id}
+          </p>
+          <h5 className="truncate text-sm">{issue.name}</h5>
         </div>
-      </span>
+        <div className="flex items-center gap-2 flex-wrap">
+          <Tooltip tooltipHeading="Priority" tooltipContent={`${issue.priority ?? "None"}`}>
+            <PriorityIcon priority={issue.priority ?? null} className="h-3.5 w-3.5" />
+          </Tooltip>
+          <Tooltip
+            tooltipHeading="Created on"
+            tooltipContent={`${renderShortDateWithYearFormat(issue.created_at ?? "")}`}
+          >
+            <div className="flex items-center gap-1 rounded border border-custom-border-200 shadow-sm text-xs px-2 py-[0.19rem] text-custom-text-200">
+              <CalendarDays size={12} strokeWidth={1.5} />
+              <span>{renderShortDateWithYearFormat(issue.created_at ?? "")}</span>
+            </div>
+          </Tooltip>
+        </div>
+        <div
+          className={`text-xs flex items-center justify-end gap-1 w-full ${
+            issueStatus === 0 && new Date(issue.issue_inbox[0].snoozed_till ?? "") < new Date()
+              ? "text-red-500"
+              : INBOX_STATUS.find((s) => s.value === issueStatus)?.textColor
+          }`}
+        >
+          {issueStatus === -2 ? (
+            <>
+              <AlertTriangle size={14} strokeWidth={2} />
+              <span>Pending</span>
+            </>
+          ) : issueStatus === -1 ? (
+            <>
+              <XCircle size={14} strokeWidth={2} />
+              <span>Declined</span>
+            </>
+          ) : issueStatus === 0 ? (
+            <>
+              <Clock size={14} strokeWidth={2} />
+              <span>
+                {new Date(issue.issue_inbox[0].snoozed_till ?? "") < new Date() ? "Snoozed date passed" : "Snoozed"}
+              </span>
+            </>
+          ) : issueStatus === 1 ? (
+            <>
+              <CheckCircle2 size={14} strokeWidth={2} />
+              <span>Accepted</span>
+            </>
+          ) : (
+            <>
+              <Copy size={14} strokeWidth={2} />
+              <span>Duplicate</span>
+            </>
+          )}
+        </div>
+      </div>
     </Link>
   );
 };

web/components/inbox/main-content.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from "react";
+import { useCallback, useEffect, useState } from "react";
 import Router, { useRouter } from "next/router";
 import { observer } from "mobx-react-lite";
 import useSWR from "swr";
@@ -8,14 +8,15 @@ import { AlertTriangle, CheckCircle2, Clock, Copy, ExternalLink, Inbox, XCircle
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
 // components
-import { IssueDescriptionForm, IssueDetailsSidebar, IssueReaction } from "components/issues";
+import { IssueDescriptionForm, IssueDetailsSidebar, IssueReaction, IssueUpdateStatus } from "components/issues";
 import { InboxIssueActivity } from "components/inbox";
 // ui
-import { Loader } from "@plane/ui";
+import { Loader, StateGroupIcon } from "@plane/ui";
 // helpers
 import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
 // types
 import { IInboxIssue, IIssue } from "types";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 const defaultValues: Partial<IInboxIssue> = {
   name: "",
@@ -30,7 +31,15 @@ export const InboxMainContent: React.FC = observer(() => {
   const router = useRouter();
   const { workspaceSlug, projectId, inboxId, inboxIssueId } = router.query;
 
-  const { inboxIssues: inboxIssuesStore, inboxIssueDetails: inboxIssueDetailsStore, user: userStore } = useMobxStore();
+  // states
+  const [isSubmitting, setIsSubmitting] = useState<"submitting" | "submitted" | "saved">("saved");
+
+  const {
+    inboxIssues: inboxIssuesStore,
+    inboxIssueDetails: inboxIssueDetailsStore,
+    user: userStore,
+    projectState: { states },
+  } = useMobxStore();
 
   const user = userStore.currentUser;
   const userRole = userStore.currentProjectRole;
@@ -54,6 +63,9 @@ export const InboxMainContent: React.FC = observer(() => {
 
   const issuesList = inboxId ? inboxIssuesStore.inboxIssues[inboxId.toString()] : undefined;
   const issueDetails = inboxIssueId ? inboxIssueDetailsStore.issueDetails[inboxIssueId.toString()] : undefined;
+  const currentIssueState = projectId
+    ? states[projectId.toString()]?.find((s) => s.id === issueDetails?.state)
+    : undefined;
 
   const submitChanges = useCallback(
     async (formData: Partial<IInboxIssue>) => {
@@ -144,6 +156,8 @@ export const InboxMainContent: React.FC = observer(() => {
       </div>
     );
 
+  const isAllowed = !!userRole && userRole >= EUserWorkspaceRoles.MEMBER;
+
   return (
     <>
       {issueDetails ? (
@@ -214,15 +228,27 @@ export const InboxMainContent: React.FC = observer(() => {
                 </>
               ) : null}
             </div>
+            <div className="flex items-center mb-5">
+              {currentIssueState && (
+                <StateGroupIcon
+                  className="h-4 w-4 mr-3"
+                  stateGroup={currentIssueState.group}
+                  color={currentIssueState.color}
+                />
+              )}
+              <IssueUpdateStatus isSubmitting={isSubmitting} issueDetail={issueDetails} />
+            </div>
             <div>
               <IssueDescriptionForm
+                setIsSubmitting={(value) => setIsSubmitting(value)}
+                isSubmitting={isSubmitting}
                 workspaceSlug={workspaceSlug as string}
                 issue={{
                   name: issueDetails.name,
                   description_html: issueDetails.description_html,
                 }}
                 handleFormSubmit={submitChanges}
-                isAllowed={userRole === 15 || userRole === 20 || user?.id === issueDetails.created_by}
+                isAllowed={isAllowed || user?.id === issueDetails.created_by}
               />
             </div>
 

web/components/instance/help-section.tsx

@@ -98,12 +98,12 @@ export const InstanceHelpSection: FC = () => {
                 if (href)
                   return (
                     <Link href={href} key={name} target="_blank">
-                      <span className="flex items-center gap-x-2 rounded px-2 py-1 text-xs hover:bg-custom-background-80">
+                      <div className="flex items-center gap-x-2 rounded px-2 py-1 text-xs hover:bg-custom-background-80">
                         <div className="grid place-items-center flex-shrink-0">
                           <Icon className="text-custom-text-200 h-3.5 w-3.5" size={14} />
                         </div>
                         <span className="text-xs">{name}</span>
-                      </span>
+                      </div>
                     </Link>
                   );
                 else

web/components/instance/instance-admin-restriction.tsx

@@ -67,12 +67,10 @@ export const InstanceAdminRestriction: FC<InstanceAdminRestrictionProps> = ({ re
     </div>
     <div className="flex items-center justify-center gap-2">
       <Link href={`/${redirectWorkspaceSlug}`}>
-        <span>
-          <Button variant="primary" size="sm">
-            <LayoutGrid width={16} height={16} />
-            To the workspace
-          </Button>
-        </span>
+        <Button variant="primary" size="sm">
+          <LayoutGrid width={16} height={16} />
+          To the workspace
+        </Button>
       </Link>
     </div>
   </div>

web/components/instance/not-ready-view.tsx

@@ -1,29 +1,29 @@
 import React from "react";
 import Image from "next/image";
 import { useTheme } from "next-themes";
-// image
+// images
 import instanceNotReady from "public/instance/plane-instance-not-ready.webp";
 import PlaneWhiteLogo from "public/plane-logos/white-horizontal-with-blue-logo.svg";
-import PlaneDarkLogo from "public/plane-logos/black-horizontal-with-blue-logo.svg";
+import PlaneBlackLogo from "public/plane-logos/black-horizontal-with-blue-logo.svg";
 
 export const InstanceNotReady = () => {
   const { resolvedTheme } = useTheme();
 
-  const planeLogo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneDarkLogo;
+  const planeLogo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneBlackLogo;
 
   return (
     <div className="h-screen w-full overflow-y-auto bg-onboarding-gradient-100">
-      <div className={`h-screen w-full pt-24`}>
-        <div className="h-auto bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 p-4 rounded-md mx-auto shadow-sm border border-custom-border-100 ">
-          <div className={`relative px-7 sm:px-0 bg-onboarding-gradient-200 h-full rounded-md`}>
+      <div className="h-full w-full pt-24">
+        <div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-100">
+          <div className="relative px-7 sm:px-0 bg-onboarding-gradient-200 h-full rounded-t-md">
             <div className="flex items-center py-10 justify-center">
-              <Image src={planeLogo} className="h-44 w-full" alt="image" />
+              <Image src={planeLogo} className="h-44 w-full" alt="Plane logo" />
             </div>
             <div className="mt-20">
-              <Image src={instanceNotReady} className="h-46 w-full" alt="image" />
+              <Image src={instanceNotReady} className="h-56 w-full" alt="Instance not ready" />
             </div>
             <div className="flex flex-col gap-5 items-center py-12 pb-20 w-full">
-              <h3 className="text-2xl font-medium">Your Plane instance isn’t ready yet</h3>
+              <h3 className="text-2xl font-medium">Your Plane instance isn{"'"}t ready yet</h3>
               <p className="text-sm">Ask your Instance Admin to complete set-up first.</p>
             </div>
           </div>

web/components/instance/setup-done-view.tsx

@@ -1,43 +1,66 @@
-import React from "react";
+import React, { useState } from "react";
 import Image from "next/image";
-
+import { useTheme } from "next-themes";
 // ui
 import { Button } from "@plane/ui";
 import { UserCog2 } from "lucide-react";
-// image
+// images
 import instanceSetupDone from "public/instance-setup-done.svg";
-import PlaneLogo from "public/plane-logos/blue-without-text.png";
+import PlaneBlackLogo from "public/plane-logos/black-horizontal-with-blue-logo.svg";
+import PlaneWhiteLogo from "public/plane-logos/white-horizontal-with-blue-logo.svg";
+import { useMobxStore } from "lib/mobx/store-provider";
 
-export const InstanceSetupDone = () => (
-  <div className="h-screen w-full overflow-hidden">
-    <div className={`bg-onboarding-gradient-100 h-screen w-full pt-12`}>
-      <div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-200 ">
-        <div
-          className={`flex flex-col items-center relative px-7 sm:px-0 bg-onboarding-gradient-200 h-full rounded-t-md overflow-auto`}
-        >
-          <div className="flex items-center gap-5 py-10 justify-center">
-            <Image src={PlaneLogo} height={44} width={44} alt="image" />
-            <span className="text-4xl font-semibold">To the stratosphere now!</span>
-          </div>
+export const InstanceSetupDone = () => {
+  // states
+  const [isRedirecting, setIsRedirecting] = useState(false);
+  // next-themes
+  const { resolvedTheme } = useTheme();
+  // mobx store
+  const {
+    instance: { fetchInstanceInfo },
+  } = useMobxStore();
 
-          <div className="flex items-center justify-center">
-            <Image src={instanceSetupDone} height={360} width={444} alt="image" />
-          </div>
+  const planeLogo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneBlackLogo;
 
-          <div className="flex flex-col gap-8 items-center py-12 w-full">
-            <span className="text-xl font-medium">
-              Your instance is now ready for more security, more controls, and more intelligence.
-            </span>
-            <Button size="lg" prependIcon={<UserCog2 />}>
-              Go to God Mode
-            </Button>
+  const redirectToGodMode = async () => {
+    setIsRedirecting(true);
 
-            <div className="flex p-2.5 text-custom-primary-100 bg-custom-primary-10 border border-custom-primary-100 text-sm text-left mx-auto rounded">
-              Use this wisely. Remember, with great power comes great responsibility.🕷️
+    await fetchInstanceInfo().finally(() => setIsRedirecting(false));
+  };
+
+  return (
+    <div className="h-full w-full overflow-hidden">
+      <div className="bg-onboarding-gradient-100 h-full w-full pt-12 overflow-hidden">
+        <div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-200 overflow-hidden">
+          <div className="flex flex-col items-center relative px-7 sm:px-0 bg-onboarding-gradient-200 h-full rounded-t-md overflow-y-auto pb-8">
+            <div className="flex py-10 justify-center">
+              <div className="h-[30px]">
+                <Image src={planeLogo} className="h-full w-full" alt="Plane logo" />
+              </div>
+            </div>
+
+            <div className="grid place-items-center my-8">
+              <div className="w-[444px]">
+                <Image src={instanceSetupDone} className="h-full w-full" alt="image" />
+              </div>
+            </div>
+
+            <div className="flex flex-col gap-8 items-center w-full sm:px-4">
+              <div className="bg-purple-500/20 border border-purple-500 py-2.5 px-3 rounded text-center space-y-3">
+                <h6 className="text-base font-semibold">
+                  Your instance is now ready for more security, more controls, and more intelligence.
+                </h6>
+                <p className="text-xs font-medium">
+                  Use this wisely. Remember, with great power comes great responsibility.
+                </p>
+              </div>
+              <Button size="lg" prependIcon={<UserCog2 />} onClick={redirectToGodMode} loading={isRedirecting}>
+                {isRedirecting ? "Redirecting..." : "Go to God Mode"}
+              </Button>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
-);
+  );
+};

web/components/instance/setup-form/email-code-form.tsx

@@ -1,4 +1,4 @@
-import { FC } from "react";
+import { FC, useState } from "react";
 import { useForm, Controller } from "react-hook-form";
 // ui
 import { Input, Button } from "@plane/ui";
@@ -24,6 +24,8 @@ export interface IInstanceSetupEmailCodeForm {
 
 export const InstanceSetupEmailCodeForm: FC<IInstanceSetupEmailCodeForm> = (props) => {
   const { handleNextStep, email, moveBack } = props;
+  // states
+  const [isResendingCode, setIsResendingCode] = useState(false);
   // form info
   const {
     control,
@@ -40,10 +42,10 @@ export const InstanceSetupEmailCodeForm: FC<IInstanceSetupEmailCodeForm> = (prop
   const { setToastAlert } = useToast();
   const { timer, setTimer } = useTimer(30);
   // computed
-  const isResendDisabled = timer > 0 || isSubmitting;
+  const isResendDisabled = timer > 0 || isResendingCode;
 
-  const handleEmailCodeFormSubmit = (formValues: InstanceSetupEmailCodeFormValues) =>
-    authService
+  const handleEmailCodeFormSubmit = async (formValues: InstanceSetupEmailCodeFormValues) =>
+    await authService
       .instanceMagicSignIn({ key: `magic_${formValues.email}`, token: formValues.token })
       .then(() => {
         reset();
@@ -51,42 +53,40 @@ export const InstanceSetupEmailCodeForm: FC<IInstanceSetupEmailCodeForm> = (prop
       })
       .catch((err) => {
         setToastAlert({
-          title: "Oops!",
           type: "error",
-          message: err?.error,
+          title: "Error!",
+          message: err?.error ?? "Something went wrong. Please try again.",
         });
       });
 
-  const resendMagicCode = () => {
-    setTimer(30);
-    authService
+  const resendMagicCode = async () => {
+    setIsResendingCode(true);
+
+    await authService
       .instanceAdminEmailCode({ email })
-      .then(() => {
-        // setCodeResending(false);
-        setTimer(30);
-      })
+      .then(() => setTimer(30))
       .catch((err) => {
         setToastAlert({
-          title: "Oops!",
           type: "error",
-          message: err?.error,
+          title: "Error!",
+          message: err?.error ?? "Something went wrong. Please try again.",
         });
-      });
+      })
+      .finally(() => setIsResendingCode(false));
   };
 
   return (
     <form onSubmit={handleSubmit(handleEmailCodeFormSubmit)}>
-      <div className="pb-2">
-        <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
-          Let’s secure your instance
-        </h1>
-        <div className="text-center text-sm text-onboarding-text-200 mt-3">
-          <p>Paste the code you got at </p>
-          <span className="text-center text-sm text-custom-primary-80 mt-1 font-semibold ">{email}</span>
-          <span className="text-onboarding-text-200">below.</span>
-        </div>
-
-        <div className="relative mt-10 w-full sm:w-[360px] mx-auto">
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
+        Let{"'"}s secure your instance
+      </h1>
+      <p className="text-center text-sm text-onboarding-text-200 mt-3">
+        Paste the code you got at
+        <br />
+        <span className="text-custom-primary-100 font-semibold">{email}</span> below.
+      </p>
+      <div className="relative mt-5 w-full sm:w-96 mx-auto space-y-4">
+        <div>
           <Controller
             name="email"
             control={control}
@@ -98,7 +98,7 @@ export const InstanceSetupEmailCodeForm: FC<IInstanceSetupEmailCodeForm> = (prop
                 ) || "Email address is not valid",
             }}
             render={({ field: { value, onChange } }) => (
-              <div className={`flex items-center relative rounded-md bg-onboarding-background-200 mb-4`}>
+              <div className="flex items-center relative rounded-md bg-onboarding-background-200">
                 <Input
                   id="email"
                   name="email"
@@ -116,51 +116,44 @@ export const InstanceSetupEmailCodeForm: FC<IInstanceSetupEmailCodeForm> = (prop
               </div>
             )}
           />
-          <div
-            className={`flex w-full justify-end text-xs outline-none ${
-              isResendDisabled ? "cursor-default text-custom-text-200" : "cursor-pointer text-custom-primary-100"
-            } `}
-          >
-            {timer > 0 ? (
-              <span className="text-right">Request new code in {timer}s</span>
-            ) : isSubmitting ? (
-              "Sending new code..."
-            ) : (
-              <div className="flex justify-end w-full">
-                <button
-                  type="button"
-                  className="w-fit pb-2 text-xs outline-none cursor-pointer text-custom-primary-100"
-                  onClick={resendMagicCode}
-                  disabled={isResendDisabled}
-                >
-                  <span className="font-medium">Resend</span>
-                </button>
-              </div>
-            )}
+          <div className="w-full text-right">
+            <button
+              type="button"
+              onClick={resendMagicCode}
+              className={`text-xs ${
+                isResendDisabled ? "text-onboarding-text-300" : "text-onboarding-text-200 hover:text-custom-primary-100"
+              }`}
+              disabled={isResendDisabled}
+            >
+              {timer > 0
+                ? `Request new code in ${timer}s`
+                : isSubmitting
+                ? "Requesting new code..."
+                : "Request new code"}
+            </button>
           </div>
-          <Controller
-            name="token"
-            control={control}
-            rules={{ required: true }}
-            render={({ field: { value, onChange } }) => (
-              <div className={`flex items-center relative rounded-md bg-onboarding-background-200 mb-4`}>
-                <Input
-                  id="token"
-                  name="token"
-                  type="text"
-                  value={value}
-                  onChange={onChange}
-                  placeholder="gets-sets-flys"
-                  className="border-onboarding-border-100 h-[46px] w-full "
-                />
-              </div>
-            )}
-          />
-
-          <Button variant="primary" className="w-full mt-4" size="xl" type="submit" loading={isSubmitting}>
-            {isSubmitting ? "Verifying..." : "Next step"}
-          </Button>
         </div>
+        <Controller
+          name="token"
+          control={control}
+          rules={{ required: true }}
+          render={({ field: { value, onChange } }) => (
+            <div className={`flex items-center relative rounded-md bg-onboarding-background-200 mb-4`}>
+              <Input
+                id="token"
+                name="token"
+                type="text"
+                value={value}
+                onChange={onChange}
+                placeholder="gets-sets-fays"
+                className="border-onboarding-border-100 h-[46px] w-full "
+              />
+            </div>
+          )}
+        />
+        <Button variant="primary" className="w-full" size="xl" type="submit" loading={isSubmitting}>
+          {isSubmitting ? "Verifying..." : "Next step"}
+        </Button>
       </div>
     </form>
   );

web/components/instance/setup-form/email-form.tsx

@@ -44,61 +44,59 @@ export const InstanceSetupEmailForm: FC<IInstanceSetupEmailForm> = (props) => {
       })
       .catch((err) => {
         setToastAlert({
-          title: "Oops!",
           type: "error",
-          message: err?.error,
+          title: "Error!",
+          message: err?.error ?? "Something went wrong. Please try again.",
         });
       });
 
   return (
     <form onSubmit={handleSubmit(handleEmailFormSubmit)}>
-      <div className="pb-2">
-        <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
-          Let’s secure your instance
-        </h1>
-        <p className="text-center text-sm text-onboarding-text-200 mt-3">
-          Explore privacy options. Get AI features. Secure access. <br /> Takes 2 minutes.
-        </p>
-
-        <div className="relative mt-10 w-full sm:w-[360px] mx-auto">
-          <Controller
-            name="email"
-            control={control}
-            rules={{
-              required: "Email address is required",
-              validate: (value) =>
-                /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(
-                  value
-                ) || "Email address is not valid",
-            }}
-            render={({ field: { value, onChange } }) => (
-              <div className={`flex items-center relative rounded-md bg-onboarding-background-200`}>
-                <Input
-                  id="email"
-                  name="email"
-                  type="email"
-                  value={value}
-                  onChange={onChange}
-                  placeholder="orville.wright@firstflight.com"
-                  className={`w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12`}
+      <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
+        Let{"'"}s secure your instance
+      </h1>
+      <p className="text-center text-sm text-onboarding-text-200 mt-3">
+        Explore privacy options. Get AI features. Secure access.
+        <br />
+        Takes 2 minutes.
+      </p>
+      <div className="relative mt-5 w-full sm:w-96 mx-auto space-y-4">
+        <Controller
+          name="email"
+          control={control}
+          rules={{
+            required: "Email address is required",
+            validate: (value) =>
+              /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(
+                value
+              ) || "Email address is not valid",
+          }}
+          render={({ field: { value, onChange } }) => (
+            <div className={`flex items-center relative rounded-md bg-onboarding-background-200`}>
+              <Input
+                id="email"
+                name="email"
+                type="email"
+                value={value}
+                onChange={onChange}
+                placeholder="orville.wright@firstflight.com"
+                className={`w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12`}
+              />
+              {value.length > 0 && (
+                <XCircle
+                  className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
+                  onClick={() => setValue("email", "")}
                 />
-                {value.length > 0 && (
-                  <XCircle
-                    className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
-                    onClick={() => setValue("email", "")}
-                  />
-                )}
-              </div>
-            )}
-          />
-          <p className="text-xs text-custom-text-400 mt-0 py-2">
-            Use your email address if you are the instance admin. <br /> Use your admin’s e-mail if you are not.
-          </p>
-
-          <Button variant="primary" className="w-full mt-4" size="xl" type="submit" loading={isSubmitting}>
-            {isSubmitting ? "Sending code..." : "Send unique code"}
-          </Button>
-        </div>
+              )}
+            </div>
+          )}
+        />
+        <p className="text-xs text-custom-text-200 pb-2">
+          Use your email address if you are the instance admin. <br /> Use your admin’s e-mail if you are not.
+        </p>
+        <Button variant="primary" className="w-full" size="xl" type="submit" loading={isSubmitting}>
+          {isSubmitting ? "Sending code..." : "Send unique code"}
+        </Button>
       </div>
     </form>
   );

web/components/instance/setup-form/password-form.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import Link from "next/link";
 import { useForm, Controller } from "react-hook-form";
 // ui
 import { Input, Button } from "@plane/ui";
@@ -43,14 +44,14 @@ export const InstanceSetupPasswordForm: React.FC<IInstanceSetupPasswordForm> = (
   return (
     <form onSubmit={handleSubmit(handlePasswordSubmit)}>
       <div className="pb-2">
-        <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
+        <h1 className="text-center text-2xl sm:text-2.5xl font-medium text-onboarding-text-100">
           Moving to the runway
         </h1>
         <p className="text-center text-sm text-onboarding-text-200 mt-3">
-          {"Let's set a password so you can do away with codes."}
+          Let{"'"}s set a password so you can do away with codes.
         </p>
 
-        <div className="relative mt-10 w-full sm:w-[360px] mx-auto">
+        <div className="relative mt-5 w-full sm:w-96 mx-auto space-y-4">
           <Controller
             control={control}
             name="email"
@@ -79,8 +80,7 @@ export const InstanceSetupPasswordForm: React.FC<IInstanceSetupPasswordForm> = (
               </div>
             )}
           />
-
-          <div className="mt-4">
+          <div>
             <Controller
               control={control}
               name="password"
@@ -106,13 +106,19 @@ export const InstanceSetupPasswordForm: React.FC<IInstanceSetupPasswordForm> = (
                 </div>
               )}
             />
+            <p className="text-xs mt-3 text-onboarding-text-200 pb-2">
+              Whatever you choose now will be your account{"'"}s password
+            </p>
           </div>
-          <p className="text-xs mt-2 text-onboarding-text-200">
-            {"Whatever you choose now will be your account's password"}
-          </p>
           <Button variant="primary" className="w-full mt-4" size="xl" type="submit" loading={isSubmitting}>
-            {isSubmitting ? "Submitting..." : "Next Step"}
+            {isSubmitting ? "Submitting..." : "Next step"}
           </Button>
+          <p className="text-xs text-onboarding-text-200">
+            When you click the button above, you agree with our{" "}
+            <Link href="https://plane.so/terms-and-conditions" target="_blank" rel="noopener noreferrer">
+              <span className="font-semibold underline">terms and conditions of service.</span>
+            </Link>
+          </p>
         </div>
       </div>
     </form>

web/components/instance/setup-form/root.tsx

@@ -21,13 +21,11 @@ export const InstanceSetupFormRoot = () => {
   return (
     <>
       {setupStep === EInstanceSetupSteps.DONE ? (
-        <div>
-          <InstanceSetupDone />
-        </div>
+        <InstanceSetupDone />
       ) : (
-        <div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-200 ">
-          <div className={`px-7 sm:px-0 bg-onboarding-gradient-200 h-full pt-24 pb-56 rounded-t-md overflow-auto`}>
-            <div className="sm:w-96 mx-auto flex flex-col divide-y divide-custom-border-200">
+        <div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-200">
+          <div className="bg-onboarding-gradient-200 h-full pt-24 pb-56 rounded-t-md overflow-auto">
+            <div className="mx-auto flex flex-col">
               {setupStep === EInstanceSetupSteps.EMAIL && (
                 <InstanceSetupEmailForm
                   handleNextStep={(email) => {

web/components/instance/setup-view.tsx

@@ -24,7 +24,7 @@ export const InstanceSetupView = observer(() => {
 
   return (
     <>
-      <div className={`bg-onboarding-gradient-100 h-full w-full`}>
+      <div className="bg-onboarding-gradient-100 h-full w-full flex flex-col">
         <div className="flex items-center justify-between sm:py-5 px-8 pb-4 sm:px-16 lg:px-28 ">
           <div className="flex gap-x-2 py-10 items-center">
             <Image src={BluePlaneLogoWithoutText} height={30} width={30} alt="Plane Logo" className="mr-2" />

web/components/instance/sidebar-menu.tsx

@@ -54,7 +54,7 @@ export const InstanceAdminSidebarMenu = () => {
 
         return (
           <Link key={index} href={item.href}>
-            <span className="block w-full">
+            <div>
               <Tooltip tooltipContent={item.name} position="right" className="ml-2" disabled={!sidebarCollapsed}>
                 <div
                   className={`group flex w-full items-center gap-3 rounded-md px-3 py-2 outline-none ${
@@ -84,7 +84,7 @@ export const InstanceAdminSidebarMenu = () => {
                   )}
                 </div>
               </Tooltip>
-            </span>
+            </div>
           </Link>
         );
       })}

web/components/issues/attachment/attachments.tsx

@@ -59,33 +59,31 @@ export const IssueAttachments = () => {
             key={file.id}
             className="flex h-[60px] items-center justify-between gap-1 rounded-md border-[2px] border-custom-border-200 bg-custom-background-100 px-4 py-2 text-sm"
           >
-            <Link href={file.asset} target="_blank">
-              <span>
-                <div className="flex items-center gap-3">
-                  <div className="h-7 w-7">{getFileIcon(getFileExtension(file.asset))}</div>
-                  <div className="flex flex-col gap-1">
-                    <div className="flex items-center gap-2">
-                      <Tooltip tooltipContent={getFileName(file.attributes.name)}>
-                        <span className="text-sm">{truncateText(`${getFileName(file.attributes.name)}`, 10)}</span>
-                      </Tooltip>
-                      <Tooltip
-                        tooltipContent={`${
-                          people?.find((person) => person.member.id === file.updated_by)?.member.display_name ?? ""
-                        } uploaded on ${renderLongDateFormat(file.updated_at)}`}
-                      >
-                        <span>
-                          <AlertCircle className="h-3 w-3" />
-                        </span>
-                      </Tooltip>
-                    </div>
+            <Link href={file.asset} target="_blank" rel="noopener noreferrer">
+              <div className="flex items-center gap-3">
+                <div className="h-7 w-7">{getFileIcon(getFileExtension(file.asset))}</div>
+                <div className="flex flex-col gap-1">
+                  <div className="flex items-center gap-2">
+                    <Tooltip tooltipContent={getFileName(file.attributes.name)}>
+                      <span className="text-sm">{truncateText(`${getFileName(file.attributes.name)}`, 10)}</span>
+                    </Tooltip>
+                    <Tooltip
+                      tooltipContent={`${
+                        people?.find((person) => person.member.id === file.updated_by)?.member.display_name ?? ""
+                      } uploaded on ${renderLongDateFormat(file.updated_at)}`}
+                    >
+                      <span>
+                        <AlertCircle className="h-3 w-3" />
+                      </span>
+                    </Tooltip>
+                  </div>
 
-                    <div className="flex items-center gap-3 text-xs text-custom-text-200">
-                      <span>{getFileExtension(file.asset).toUpperCase()}</span>
-                      <span>{convertBytesToSize(file.attributes.size)}</span>
-                    </div>
+                  <div className="flex items-center gap-3 text-xs text-custom-text-200">
+                    <span>{getFileExtension(file.asset).toUpperCase()}</span>
+                    <span>{convertBytesToSize(file.attributes.size)}</span>
                   </div>
                 </div>
-              </span>
+              </div>
             </Link>
 
             <button

web/components/issues/description-form.tsx

@@ -26,14 +26,15 @@ export interface IssueDetailsProps {
   workspaceSlug: string;
   handleFormSubmit: (value: IssueDescriptionFormValues) => Promise<void>;
   isAllowed: boolean;
+  isSubmitting: "submitting" | "submitted" | "saved";
+  setIsSubmitting: (value: "submitting" | "submitted" | "saved") => void;
 }
 
 const fileService = new FileService();
 
 export const IssueDescriptionForm: FC<IssueDetailsProps> = (props) => {
-  const { issue, handleFormSubmit, workspaceSlug, isAllowed } = props;
+  const { issue, handleFormSubmit, workspaceSlug, isAllowed, isSubmitting, setIsSubmitting } = props;
   // states
-  const [isSubmitting, setIsSubmitting] = useState<"submitting" | "submitted" | "saved">("saved");
   const [characterLimit, setCharacterLimit] = useState(false);
 
   const { setShowAlert } = useReloadConfirmations();
@@ -166,13 +167,6 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = (props) => {
             />
           )}
         />
-        <div
-          className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${
-            isSubmitting === "saved" ? "fadeOut" : "fadeIn"
-          }`}
-        >
-          {isSubmitting === "submitting" ? "Saving..." : "Saved"}
-        </div>
       </div>
     </div>
   );

web/components/issues/form.tsx

@@ -226,9 +226,10 @@ export const IssueForm: FC<IssueFormProps> = observer((props) => {
 
     reset({
       ...defaultValues,
+      project: projectId,
       ...initialData,
     });
-  }, [setFocus, reset]);
+  }, [setFocus, initialData, reset]);
 
   // update projectId in form when projectId changes
   useEffect(() => {

web/components/issues/index.ts

@@ -15,6 +15,7 @@ export * from "./sidebar";
 export * from "./label";
 export * from "./issue-reaction";
 export * from "./confirm-issue-discard";
+export * from "./issue-update-status";
 
 // draft issue
 export * from "./draft-issue-form";

web/components/issues/issue-layouts/filters/applied-filters/roots/draft-issue.tsx

@@ -25,9 +25,7 @@ export const DraftIssueAppliedFiltersRoot: React.FC = observer(() => {
   const appliedFilters: IIssueFilterOptions = {};
   Object.entries(userFilters ?? {}).forEach(([key, value]) => {
     if (!value) return;
-
     if (Array.isArray(value) && value.length === 0) return;
-
     appliedFilters[key as keyof IIssueFilterOptions] = value;
   });
 

web/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx

@@ -12,85 +12,73 @@ import { Button } from "@plane/ui";
 import { areFiltersDifferent } from "helpers/filter.helper";
 // types
 import { IIssueFilterOptions } from "types";
+import { EFilterType } from "store/issues/types";
 
 export const GlobalViewsAppliedFiltersRoot = observer(() => {
   const router = useRouter();
-  const { workspaceSlug, globalViewId } = router.query;
+  const { workspaceSlug, globalViewId } = router.query as { workspaceSlug: string; globalViewId: string };
 
   const {
     globalViews: globalViewsStore,
     globalViewFilters: globalViewFiltersStore,
-    project: projectStore,
-    workspace: workspaceStore,
+    project: { workspaceProjects },
+    workspace: { workspaceLabels },
     workspaceMember: { workspaceMembers },
+    workspaceGlobalIssuesFilter: { issueFilters, updateFilters },
   } = useMobxStore();
 
   const viewDetails = globalViewId ? globalViewsStore.globalViewDetails[globalViewId.toString()] : undefined;
-  const storedFilters = globalViewId ? globalViewFiltersStore.storedFilters[globalViewId.toString()] : undefined;
+
+  const userFilters = issueFilters?.filters;
 
   // filters whose value not null or empty array
   const appliedFilters: IIssueFilterOptions = {};
-  Object.entries(storedFilters ?? {}).forEach(([key, value]) => {
+  Object.entries(userFilters ?? {}).forEach(([key, value]) => {
     if (!value) return;
-
     if (Array.isArray(value) && value.length === 0) return;
-
     appliedFilters[key as keyof IIssueFilterOptions] = value;
   });
 
   const handleRemoveFilter = (key: keyof IIssueFilterOptions, value: string | null) => {
-    if (!globalViewId) return;
-
-    // remove all values of the key if value is null
     if (!value) {
-      globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), {
-        [key]: null,
-      });
+      updateFilters(workspaceSlug, EFilterType.FILTERS, { [key]: null });
       return;
     }
 
-    // remove the passed value from the key
-    let newValues = globalViewFiltersStore.storedFilters?.[globalViewId.toString()]?.[key] ?? [];
+    let newValues = userFilters?.[key] ?? [];
     newValues = newValues.filter((val) => val !== value);
-
-    globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), {
-      [key]: newValues,
-    });
+    updateFilters(workspaceSlug, EFilterType.FILTERS, { [key]: newValues });
   };
 
   const handleClearAllFilters = () => {
-    if (!globalViewId || !storedFilters) return;
-
+    if (!workspaceSlug) return;
     const newFilters: IIssueFilterOptions = {};
-    Object.keys(storedFilters).forEach((key) => {
+    Object.keys(userFilters ?? {}).forEach((key) => {
       newFilters[key as keyof IIssueFilterOptions] = null;
     });
-
-    globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), {
-      ...newFilters,
-    });
+    updateFilters(workspaceSlug, EFilterType.FILTERS, { ...newFilters });
   };
 
-  const handleUpdateView = () => {
-    if (!workspaceSlug || !globalViewId || !viewDetails) return;
+  // const handleUpdateView = () => {
+  //   if (!workspaceSlug || !globalViewId || !viewDetails) return;
 
-    globalViewsStore.updateGlobalView(workspaceSlug.toString(), globalViewId.toString(), {
-      query_data: {
-        ...viewDetails.query_data,
-        filters: {
-          ...(storedFilters ?? {}),
-        },
-      },
-    });
-  };
+  //   globalViewsStore.updateGlobalView(workspaceSlug.toString(), globalViewId.toString(), {
+  //     query_data: {
+  //       ...viewDetails.query_data,
+  //       filters: {
+  //         ...(storedFilters ?? {}),
+  //       },
+  //     },
+  //   });
+  // };
 
   // update stored filters when view details are fetched
-  useEffect(() => {
-    if (!globalViewId || !viewDetails) return;
+  // useEffect(() => {
+  //   if (!globalViewId || !viewDetails) return;
 
-    if (!globalViewFiltersStore.storedFilters[globalViewId.toString()])
-      globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), viewDetails?.query_data?.filters ?? {});
-  }, [globalViewId, globalViewFiltersStore, viewDetails]);
+  //   if (!globalViewFiltersStore.storedFilters[globalViewId.toString()])
+  //     globalViewFiltersStore.updateStoredFilters(globalViewId.toString(), viewDetails?.query_data?.filters ?? {});
+  // }, [globalViewId, globalViewFiltersStore, viewDetails]);
 
   // return if no filters are applied
   if (Object.keys(appliedFilters).length === 0) return null;
@@ -98,18 +86,19 @@ export const GlobalViewsAppliedFiltersRoot = observer(() => {
   return (
     <div className="flex items-start justify-between gap-4 p-4">
       <AppliedFiltersList
-        appliedFilters={storedFilters ?? {}}
+        labels={workspaceLabels ?? undefined}
+        members={workspaceMembers?.map((m) => m.member)}
+        projects={workspaceProjects ?? undefined}
+        appliedFilters={appliedFilters ?? {}}
         handleClearAllFilters={handleClearAllFilters}
         handleRemoveFilter={handleRemoveFilter}
-        labels={workspaceStore.workspaceLabels ?? undefined}
-        members={workspaceMembers?.map((m) => m.member)}
-        projects={workspaceSlug ? projectStore.projects[workspaceSlug.toString()] : undefined}
       />
-      {storedFilters && viewDetails && areFiltersDifferent(storedFilters, viewDetails.query_data.filters ?? {}) && (
+
+      {/* {storedFilters && viewDetails && areFiltersDifferent(storedFilters, viewDetails.query_data.filters ?? {}) && (
         <Button variant="primary" onClick={handleUpdateView}>
           Update view
         </Button>
-      )}
+      )} */}
     </div>
   );
 });

web/components/issues/issue-layouts/gantt/base-gantt-root.tsx

@@ -25,6 +25,7 @@ import {
   IViewIssuesStore,
 } from "store/issues";
 import { TUnGroupedIssues } from "store/issues/types";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 interface IBaseGanttRoot {
   issueFiltersStore:
@@ -69,7 +70,7 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGan
     );
   };
 
-  const isAllowed = currentProjectRole && currentProjectRole >= 15;
+  const isAllowed = !!currentProjectRole && currentProjectRole >= EUserWorkspaceRoles.MEMBER;
 
   return (
     <>

web/components/issues/issue-layouts/index.ts

@@ -3,6 +3,9 @@ export * from "./filters";
 export * from "./empty-states";
 export * from "./quick-action-dropdowns";
 
+// roots
+export * from "./roots";
+
 // layouts
 export * from "./list";
 export * from "./calendar";
@@ -10,6 +13,5 @@ export * from "./gantt";
 export * from "./kanban";
 export * from "./spreadsheet";
 
+// properties
 export * from "./properties";
-
-export * from "./roots";

web/components/issues/issue-layouts/kanban/base-kanban-root.tsx

@@ -31,6 +31,7 @@ import { KanBan } from "./default";
 import { KanBanSwimLanes } from "./swimlanes";
 import { EProjectStore } from "store/command-palette.store";
 import { IssuePeekOverview } from "components/issues";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 export interface IBaseKanBanLayout {
   issueStore:
@@ -93,7 +94,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
   } = useMobxStore();
 
   const { currentProjectRole } = userStore;
-  const isEditingAllowed = [15, 20].includes(currentProjectRole || 0);
+  const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserWorkspaceRoles.MEMBER;
 
   const issues = issueStore?.getIssues || {};
   const issueIds = issueStore?.getIssuesIds || [];
@@ -223,7 +224,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
               isDragStarted={isDragStarted}
               quickAddCallback={issueStore?.quickAddIssue}
               viewId={viewId}
-              disableIssueCreation={!enableIssueCreation}
+              disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
               isReadOnly={!enableInlineEditing || !isEditingAllowed}
               currentStore={currentStore}
               addIssuesToView={addIssuesToView}
@@ -267,6 +268,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
               enableQuickIssueCreate={enableQuickAdd}
               isReadOnly={!enableInlineEditing || !isEditingAllowed}
               currentStore={currentStore}
+              quickAddCallback={issueStore?.quickAddIssue}
               addIssuesToView={(issues) => {
                 console.log("kanban existingIds", issues);
 

web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx

@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 // components
 import { CustomMenu } from "@plane/ui";
 import { CreateUpdateIssueModal } from "components/issues/modal";
+import { CreateUpdateDraftIssueModal } from "components/issues/draft-issue-modal";
 import { ExistingIssuesListModal } from "components/core";
 // lucide icons
 import { Minimize2, Maximize2, Circle, Plus } from "lucide-react";
@@ -51,6 +52,8 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {
   const router = useRouter();
   const { workspaceSlug, projectId, moduleId, cycleId } = router.query;
 
+  const isDraftIssue = router.pathname.includes("draft-issue");
+
   const { setToastAlert } = useToast();
 
   const renderExistingIssueModal = moduleId || cycleId;
@@ -73,12 +76,21 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {
 
   return (
     <>
-      <CreateUpdateIssueModal
-        isOpen={isOpen}
-        handleClose={() => setIsOpen(false)}
-        prePopulateData={issuePayload}
-        currentStore={currentStore}
-      />
+      {isDraftIssue ? (
+        <CreateUpdateDraftIssueModal
+          isOpen={isOpen}
+          handleClose={() => setIsOpen(false)}
+          prePopulateData={issuePayload}
+          fieldsToShow={["all"]}
+        />
+      ) : (
+        <CreateUpdateIssueModal
+          isOpen={isOpen}
+          handleClose={() => setIsOpen(false)}
+          prePopulateData={issuePayload}
+          currentStore={currentStore}
+        />
+      )}
       {renderExistingIssueModal && (
         <ExistingIssuesListModal
           isOpen={openExistingIssueListModal}

web/components/issues/issue-layouts/kanban/properties.tsx

@@ -89,6 +89,7 @@ export const KanBanProperties: React.FC<IKanBanProperties> = observer((props) =>
         <IssuePropertyState
           projectId={issue?.project_detail?.id || null}
           value={issue?.state || null}
+          defaultOptions={issue?.state_detail ? [issue.state_detail] : []}
           onChange={handleState}
           disabled={isReadOnly}
           hideDropdownArrow
@@ -110,6 +111,7 @@ export const KanBanProperties: React.FC<IKanBanProperties> = observer((props) =>
         <IssuePropertyLabels
           projectId={issue?.project_detail?.id || null}
           value={issue?.labels || null}
+          defaultOptions={issue?.label_details ? issue.label_details : []}
           onChange={handleLabel}
           disabled={isReadOnly}
           hideDropdownArrow
@@ -141,6 +143,7 @@ export const KanBanProperties: React.FC<IKanBanProperties> = observer((props) =>
         <IssuePropertyAssignee
           projectId={issue?.project_detail?.id || null}
           value={issue?.assignees || null}
+          defaultOptions={issue?.assignee_details ? issue.assignee_details : []}
           hideDropdownArrow
           onChange={handleAssignee}
           disabled={isReadOnly}

web/components/issues/issue-layouts/kanban/swimlanes.tsx

@@ -91,6 +91,12 @@ interface ISubGroupSwimlane extends ISubGroupSwimlaneHeader {
   currentStore?: EProjectStore;
   enableQuickIssueCreate: boolean;
   isReadOnly: boolean;
+  quickAddCallback?: (
+    workspaceSlug: string,
+    projectId: string,
+    data: IIssue,
+    viewId?: string
+  ) => Promise<IIssue | undefined>;
 }
 const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
   const {
@@ -118,6 +124,7 @@ const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
     enableQuickIssueCreate,
     isReadOnly,
     addIssuesToView,
+    quickAddCallback,
   } = props;
 
   const calculateIssueCount = (column_id: string) => {
@@ -176,6 +183,7 @@ const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
                   isDragStarted={isDragStarted}
                   isReadOnly={isReadOnly}
                   addIssuesToView={addIssuesToView}
+                  quickAddCallback={quickAddCallback}
                 />
               </div>
             )}
@@ -208,6 +216,12 @@ export interface IKanBanSwimLanes {
   currentStore?: EProjectStore;
   addIssuesToView?: (issueIds: string[]) => Promise<IIssue>;
   enableQuickIssueCreate: boolean;
+  quickAddCallback?: (
+    workspaceSlug: string,
+    projectId: string,
+    data: IIssue,
+    viewId?: string
+  ) => Promise<IIssue | undefined>;
   isReadOnly: boolean;
 }
 
@@ -236,6 +250,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
     isReadOnly,
     currentStore,
     addIssuesToView,
+    quickAddCallback,
   } = props;
 
   return (
@@ -378,6 +393,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -406,6 +422,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -434,6 +451,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -462,6 +480,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -490,6 +509,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -518,6 +538,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -546,6 +567,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
 
@@ -574,6 +596,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           disableIssueCreation={disableIssueCreation}
           enableQuickIssueCreate={enableQuickIssueCreate}
           isReadOnly={isReadOnly}
+          quickAddCallback={quickAddCallback}
         />
       )}
     </div>

web/components/issues/issue-layouts/list/base-list-root.tsx

@@ -25,6 +25,7 @@ import { IIssueResponse } from "store/issues/types";
 import { EProjectStore } from "store/command-palette.store";
 import { IssuePeekOverview } from "components/issues";
 import { useRouter } from "next/router";
+import { EUserWorkspaceRoles } from "constants/workspace";
 
 enum EIssueActions {
   UPDATE = "update",
@@ -83,7 +84,7 @@ export const BaseListRoot = observer((props: IBaseListRoot) => {
   } = useMobxStore();
 
   const { currentProjectRole } = userStore;
-  const isEditingAllowed = [15, 20].includes(currentProjectRole || 0);
+  const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserWorkspaceRoles.MEMBER;
 
   const issueIds = issueStore?.getIssuesIds || [];
   const issues = issueStore?.getIssues;
@@ -147,7 +148,7 @@ export const BaseListRoot = observer((props: IBaseListRoot) => {
             quickAddCallback={issueStore?.quickAddIssue}
             enableIssueQuickAdd={!!enableQuickAdd}
             isReadonly={!enableInlineEditing || !isEditingAllowed}
-            disableIssueCreation={!enableIssueCreation}
+            disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
             currentStore={currentStore}
             addIssuesToView={addIssuesToView}
           />

web/components/issues/issue-layouts/list/headers/group-by-card.tsx

@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 // lucide icons
 import { CircleDashed, Plus } from "lucide-react";
 // components
+import { CreateUpdateDraftIssueModal } from "components/issues/draft-issue-modal";
 import { CreateUpdateIssueModal } from "components/issues/modal";
 import { ExistingIssuesListModal } from "components/core";
 import { CustomMenu } from "@plane/ui";
@@ -32,6 +33,8 @@ export const HeaderGroupByCard = observer(
 
     const [openExistingIssueListModal, setOpenExistingIssueListModal] = React.useState(false);
 
+    const isDraftIssue = router.pathname.includes("draft-issue");
+
     const { setToastAlert } = useToast();
 
     const renderExistingIssueModal = moduleId || cycleId;
@@ -90,12 +93,21 @@ export const HeaderGroupByCard = observer(
               </div>
             ))}
 
-          <CreateUpdateIssueModal
-            isOpen={isOpen}
-            handleClose={() => setIsOpen(false)}
-            currentStore={currentStore}
-            prePopulateData={issuePayload}
-          />
+          {isDraftIssue ? (
+            <CreateUpdateDraftIssueModal
+              isOpen={isOpen}
+              handleClose={() => setIsOpen(false)}
+              prePopulateData={issuePayload}
+              fieldsToShow={["all"]}
+            />
+          ) : (
+            <CreateUpdateIssueModal
+              isOpen={isOpen}
+              handleClose={() => setIsOpen(false)}
+              currentStore={currentStore}
+              prePopulateData={issuePayload}
+            />
+          )}
 
           {renderExistingIssueModal && (
             <ExistingIssuesListModal

web/components/issues/issue-layouts/list/properties.tsx

@@ -60,6 +60,7 @@ export const ListProperties: FC<IListProperties> = observer((props) => {
         <IssuePropertyState
           projectId={issue?.project_detail?.id || null}
           value={issue?.state || null}
+          defaultOptions={issue?.state_detail ? [issue.state_detail] : []}
           hideDropdownArrow
           onChange={handleState}
           disabled={isReadonly}
@@ -81,6 +82,7 @@ export const ListProperties: FC<IListProperties> = observer((props) => {
         <IssuePropertyLabels
           projectId={issue?.project_detail?.id || null}
           value={issue?.labels || null}
+          defaultOptions={issue?.label_details ? issue.label_details : []}
           onChange={handleLabel}
           disabled={isReadonly}
           hideDropdownArrow
@@ -92,6 +94,7 @@ export const ListProperties: FC<IListProperties> = observer((props) => {
         <IssuePropertyAssignee
           projectId={issue?.project_detail?.id || null}
           value={issue?.assignees || null}
+          defaultOptions={issue?.assignee_details ? issue.assignee_details : []}
           hideDropdownArrow
           onChange={handleAssignee}
           disabled={isReadonly}

web/components/issues/issue-layouts/properties/assignee.tsx

@@ -8,10 +8,12 @@ import { Check, ChevronDown, Search, User2 } from "lucide-react";
 import { Avatar, AvatarGroup, Tooltip } from "@plane/ui";
 // types
 import { Placement } from "@popperjs/core";
+import { IProjectMember } from "types";
 
 export interface IIssuePropertyAssignee {
   projectId: string | null;
   value: string[] | string;
+  defaultOptions?: any;
   onChange: (data: string[]) => void;
   disabled?: boolean;
   hideDropdownArrow?: boolean;
@@ -27,6 +29,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
   const {
     projectId,
     value,
+    defaultOptions = [],
     onChange,
     disabled = false,
     hideDropdownArrow = false,
@@ -40,8 +43,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
   // store
   const {
     workspace: workspaceStore,
-    project: projectStore,
-    workspaceMember: { workspaceMembers, fetchWorkspaceMembers },
+    projectMember: { projectMembers: _projectMembers, fetchProjectMembers },
   } = useMobxStore();
   const workspaceSlug = workspaceStore?.workspaceSlug;
   // states
@@ -50,20 +52,16 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
   const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
   const [isLoading, setIsLoading] = useState<Boolean>(false);
 
-  // const fetchProjectMembers = () => {
-  //   setIsLoading(true);
-  //   if (workspaceSlug && projectId)
-  //     workspaceSlug &&
-  //       projectId &&
-  //       projectStore.fetchProjectMembers(workspaceSlug, projectId).then(() => setIsLoading(false));
-  // };
-
   const getWorkspaceMembers = () => {
     setIsLoading(true);
-    if (workspaceSlug) workspaceSlug && fetchWorkspaceMembers(workspaceSlug).then(() => setIsLoading(false));
+    if (workspaceSlug && projectId) fetchProjectMembers(workspaceSlug, projectId).then(() => setIsLoading(false));
   };
 
-  const options = (workspaceMembers ?? [])?.map((member) => ({
+  const updatedDefaultOptions: IProjectMember[] =
+    defaultOptions.map((member: any) => ({ member: { ...member } })) ?? [];
+  const projectMembers = _projectMembers ?? updatedDefaultOptions;
+
+  const options = projectMembers?.map((member) => ({
     value: member.member.id,
     query: member.member.display_name,
     content: (
@@ -82,7 +80,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
 
     // if multiple assignees
     if (Array.isArray(value)) {
-      const assignees = workspaceMembers?.filter((m) => value.includes(m.member.id));
+      const assignees = projectMembers?.filter((m) => value.includes(m.member.id));
 
       if (!assignees || assignees.length === 0) return "No Assignee";
 
@@ -93,7 +91,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
     }
 
     // if single assignee
-    const assignee = workspaceMembers?.find((m) => m.member.id === value)?.member;
+    const assignee = projectMembers?.find((m) => m.member.id === value)?.member;
 
     if (!assignee) return "No Assignee";
 
@@ -107,7 +105,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
         {value && value.length > 0 && Array.isArray(value) ? (
           <AvatarGroup showTooltip={false}>
             {value.map((assigneeId) => {
-              const member = workspaceMembers?.find((m) => m.member.id === assigneeId)?.member;
+              const member = projectMembers?.find((m) => m.member.id === assigneeId)?.member;
               if (!member) return null;
               return <Avatar key={member.id} name={member.display_name} src={member.avatar} />;
             })}
@@ -149,7 +147,7 @@ export const IssuePropertyAssignee: React.FC<IIssuePropertyAssignee> = observer(
           className={`flex items-center justify-between gap-1 w-full text-xs ${
             disabled ? "cursor-not-allowed text-custom-text-200" : "cursor-pointer hover:bg-custom-background-80"
           } ${buttonClassName}`}
-          onClick={() => !workspaceMembers && getWorkspaceMembers()}
+          onClick={() => !projectMembers && getWorkspaceMembers()}
         >
           {label}
           {!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />}

web/components/issues/issue-layouts/properties/labels.tsx

@@ -10,10 +10,12 @@ import { Check, ChevronDown, Search } from "lucide-react";
 // types
 import { Placement } from "@popperjs/core";
 import { RootStore } from "store/root";
+import { IIssueLabel } from "types";
 
 export interface IIssuePropertyLabels {
   projectId: string | null;
   value: string[];
+  defaultOptions?: any;
   onChange: (data: string[]) => void;
   disabled?: boolean;
   hideDropdownArrow?: boolean;
@@ -29,6 +31,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
   const {
     projectId,
     value,
+    defaultOptions = [],
     onChange,
     disabled,
     hideDropdownArrow = false,
@@ -42,7 +45,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
 
   const {
     workspace: workspaceStore,
-    projectLabel: { fetchProjectLabels, projectLabels },
+    projectLabel: { fetchProjectLabels, labels },
   }: RootStore = useMobxStore();
   const workspaceSlug = workspaceStore?.workspaceSlug;
 
@@ -59,7 +62,11 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
 
   if (!value) return null;
 
-  const options = (projectLabels ? projectLabels : []).map((label) => ({
+  let projectLabels: IIssueLabel[] = defaultOptions;
+  const storeLabels = projectId && labels ? labels[projectId] : [];
+  if (storeLabels && storeLabels.length > 0) projectLabels = storeLabels;
+
+  const options = projectLabels.map((label) => ({
     value: label.id,
     query: label.name,
     content: (
@@ -95,7 +102,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
       {value.length > 0 ? (
         value.length <= maxRender ? (
           <>
-            {(projectLabels ? projectLabels : [])
+            {projectLabels
               ?.filter((l) => value.includes(l.id))
               .map((label) => (
                 <Tooltip position="top" tooltipHeading="Labels" tooltipContent={label.name ?? ""}>
@@ -123,7 +130,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
             <Tooltip
               position="top"
               tooltipHeading="Labels"
-              tooltipContent={(projectLabels ? projectLabels : [])
+              tooltipContent={projectLabels
                 ?.filter((l) => value.includes(l.id))
                 .map((l) => l.name)
                 .join(", ")}
@@ -167,7 +174,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
               ? "cursor-pointer"
               : "cursor-pointer hover:bg-custom-background-80"
           }  ${buttonClassName}`}
-          onClick={() => !projectLabels && fetchLabels()}
+          onClick={() => !storeLabels && fetchLabels()}
         >
           {label}
           {!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />}
@@ -200,8 +207,9 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
                   key={option.value}
                   value={option.value}
                   className={({ selected }) =>
-                    `flex items-center justify-between gap-2 cursor-pointer select-none truncate rounded px-1 py-1.5 hover:bg-custom-background-80
-                     ${selected ? "text-custom-text-100" : "text-custom-text-200"}`
+                    `flex items-center justify-between gap-2 cursor-pointer select-none truncate rounded px-1 py-1.5 hover:bg-custom-background-80 ${
+                      selected ? "text-custom-text-100" : "text-custom-text-200"
+                    }`
                   }
                 >
                   {({ selected }) => (

web/components/issues/issue-layouts/properties/state.tsx

@@ -17,6 +17,7 @@ import { RootStore } from "store/root";
 export interface IIssuePropertyState {
   projectId: string | null;
   value: any | string | null;
+  defaultOptions?: any;
   onChange: (state: IState) => void;
   disabled?: boolean;
   hideDropdownArrow?: boolean;
@@ -30,6 +31,7 @@ export const IssuePropertyState: React.FC<IIssuePropertyState> = observer((props
   const {
     projectId,
     value,
+    defaultOptions = [],
     onChange,
     disabled,
     hideDropdownArrow = false,
@@ -47,10 +49,9 @@ export const IssuePropertyState: React.FC<IIssuePropertyState> = observer((props
   const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
   const [isLoading, setIsLoading] = useState<Boolean>(false);
 
-  const projectStates: IState[] = [];
-  const projectStatesByGroup = projectStateStore.groupedProjectStates;
-  if (projectStatesByGroup)
-    for (const group in projectStatesByGroup) projectStates.push(...projectStatesByGroup[group]);
+  let projectStates: IState[] = defaultOptions;
+  const storeStates = projectId ? projectStateStore.states[projectId] : [];
+  if (storeStates && storeStates.length > 0) projectStates = storeStates;
 
   const fetchProjectStates = () => {
     setIsLoading(true);
@@ -120,7 +121,7 @@ export const IssuePropertyState: React.FC<IIssuePropertyState> = observer((props
               className={`flex items-center justify-between h-5 gap-1 w-full text-xs px-2.5 py-1 rounded border-[0.5px] border-custom-border-300 ${
                 disabled ? "cursor-not-allowed text-custom-text-200" : "cursor-pointer hover:bg-custom-background-80"
               } ${buttonClassName}`}
-              onClick={() => !projectStatesByGroup && fetchProjectStates()}
+              onClick={() => !storeStates && fetchProjectStates()}
             >
               {label}
               {!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />}

web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx

@@ -0,0 +1,114 @@
+import { useState } from "react";
+import { useRouter } from "next/router";
+import { CustomMenu } from "@plane/ui";
+import { Copy, Link, Pencil, Trash2 } from "lucide-react";
+// hooks
+import useToast from "hooks/use-toast";
+// components
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+// helpers
+import { copyUrlToClipboard } from "helpers/string.helper";
+// types
+import { IIssue } from "types";
+import { IQuickActionProps } from "../list/list-view-types";
+import { EProjectStore } from "store/command-palette.store";
+
+export const AllIssueQuickActions: React.FC<IQuickActionProps> = (props) => {
+  const { issue, handleDelete, handleUpdate } = props;
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  // states
+  const [createUpdateIssueModal, setCreateUpdateIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<IIssue | null>(null);
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+
+  const { setToastAlert } = useToast();
+
+  const handleCopyIssueLink = () => {
+    copyUrlToClipboard(`/${workspaceSlug}/projects/${issue.project}/issues/${issue.id}`).then(() =>
+      setToastAlert({
+        type: "success",
+        title: "Link copied",
+        message: "Issue link copied to clipboard",
+      })
+    );
+  };
+
+  return (
+    <>
+      <DeleteIssueModal
+        data={issue}
+        isOpen={deleteIssueModal}
+        handleClose={() => setDeleteIssueModal(false)}
+        onSubmit={handleDelete}
+      />
+      <CreateUpdateIssueModal
+        isOpen={createUpdateIssueModal}
+        handleClose={() => {
+          setCreateUpdateIssueModal(false);
+          setIssueToEdit(null);
+        }}
+        // pre-populate date only if not editing
+        prePopulateData={!issueToEdit && createUpdateIssueModal ? { ...issue, name: `${issue.name} (copy)` } : {}}
+        data={issueToEdit}
+        onSubmit={async (data) => {
+          if (issueToEdit && handleUpdate) handleUpdate({ ...issueToEdit, ...data });
+        }}
+        currentStore={EProjectStore.PROJECT}
+      />
+      <CustomMenu placement="bottom-start" ellipsis>
+        <CustomMenu.MenuItem
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            handleCopyIssueLink();
+          }}
+        >
+          <div className="flex items-center gap-2">
+            <Link className="h-3 w-3" />
+            Copy link
+          </div>
+        </CustomMenu.MenuItem>
+        <CustomMenu.MenuItem
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            setIssueToEdit(issue);
+            setCreateUpdateIssueModal(true);
+          }}
+        >
+          <div className="flex items-center gap-2">
+            <Pencil className="h-3 w-3" />
+            Edit issue
+          </div>
+        </CustomMenu.MenuItem>
+        <CustomMenu.MenuItem
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            setCreateUpdateIssueModal(true);
+          }}
+        >
+          <div className="flex items-center gap-2">
+            <Copy className="h-3 w-3" />
+            Make a copy
+          </div>
+        </CustomMenu.MenuItem>
+        <CustomMenu.MenuItem
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            setDeleteIssueModal(true);
+          }}
+        >
+          <div className="flex items-center gap-2">
+            <Trash2 className="h-3 w-3" />
+            Delete issue
+          </div>
+        </CustomMenu.MenuItem>
+      </CustomMenu>
+    </>
+  );
+};

web/components/issues/issue-layouts/quick-action-dropdowns/index.ts

@@ -2,3 +2,4 @@ export * from "./cycle-issue";
 export * from "./module-issue";
 export * from "./project-issue";
 export * from "./archived-issue";
+export * from "./all-issue";

web/components/issues/issue-layouts/roots/all-issue-layout-root.tsx

@@ -0,0 +1,134 @@
+import React, { useCallback } from "react";
+import { useRouter } from "next/router";
+import { observer } from "mobx-react-lite";
+import useSWR from "swr";
+// mobx store
+import { useMobxStore } from "lib/mobx/store-provider";
+// components
+import { GlobalViewEmptyState, GlobalViewsAppliedFiltersRoot } from "components/issues";
+import { SpreadsheetView } from "components/issues/issue-layouts";
+import { AllIssueQuickActions } from "components/issues/issue-layouts/quick-action-dropdowns";
+// ui
+import { Spinner } from "@plane/ui";
+// types
+import { IIssue, IIssueDisplayFilterOptions, TStaticViewTypes } from "types";
+import { IIssueUnGroupedStructure } from "store/issue";
+import { EIssueActions } from "../types";
+
+import { EFilterType, TUnGroupedIssues } from "store/issues/types";
+
+type Props = {
+  type?: TStaticViewTypes | null;
+};
+
+export const AllIssueLayoutRoot: React.FC<Props> = observer((props) => {
+  const { type = null } = props;
+
+  const router = useRouter();
+  const { workspaceSlug, globalViewId } = router.query as { workspaceSlug: string; globalViewId: string };
+
+  const currentIssueView = type ?? globalViewId;
+
+  const {
+    workspaceMember: { workspaceMembers },
+    workspace: { workspaceLabels },
+    globalViews: { fetchAllGlobalViews },
+    workspaceGlobalIssues: { loader, getIssues, getIssuesIds, fetchIssues, updateIssue, removeIssue },
+    workspaceGlobalIssuesFilter: { currentView, issueFilters, fetchFilters, updateFilters, setCurrentView },
+  } = useMobxStore();
+
+  useSWR(workspaceSlug ? `WORKSPACE_GLOBAL_VIEWS${workspaceSlug}` : null, async () => {
+    if (workspaceSlug) {
+      await fetchAllGlobalViews(workspaceSlug);
+    }
+  });
+
+  useSWR(
+    workspaceSlug && currentIssueView ? `WORKSPACE_GLOBAL_VIEW_ISSUES_${workspaceSlug}_${currentIssueView}` : null,
+    async () => {
+      if (workspaceSlug && currentIssueView) {
+        setCurrentView(currentIssueView);
+        await fetchAllGlobalViews(workspaceSlug);
+        await fetchFilters(workspaceSlug, currentIssueView);
+        await fetchIssues(workspaceSlug, currentIssueView, getIssues ? "mutation" : "init-loader");
+      }
+    }
+  );
+
+  const isEditingAllowed = false;
+
+  const issuesResponse = getIssues;
+  const issueIds = (getIssuesIds ?? []) as TUnGroupedIssues;
+  const issues = issueIds?.filter((id) => id && issuesResponse?.[id]).map((id) => issuesResponse?.[id]);
+
+  const issueActions = {
+    [EIssueActions.UPDATE]: async (issue: IIssue) => {
+      const projectId = issue.project;
+      if (!workspaceSlug || !projectId) return;
+
+      await updateIssue(workspaceSlug, projectId, issue.id, issue, currentIssueView);
+    },
+    [EIssueActions.DELETE]: async (issue: IIssue) => {
+      const projectId = issue.project;
+      if (!workspaceSlug || !projectId) return;
+
+      await removeIssue(workspaceSlug, projectId, issue.id, currentIssueView);
+    },
+  };
+
+  const handleIssues = useCallback(
+    async (issue: IIssue, action: EIssueActions) => {
+      if (action === EIssueActions.UPDATE) await issueActions[action]!(issue);
+      if (action === EIssueActions.DELETE) await issueActions[action]!(issue);
+    },
+    [getIssues]
+  );
+
+  const handleDisplayFiltersUpdate = useCallback(
+    (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
+      if (!workspaceSlug) return;
+
+      updateFilters(workspaceSlug, EFilterType.DISPLAY_FILTERS, { ...updatedDisplayFilter });
+    },
+    [updateFilters, workspaceSlug]
+  );
+
+  return (
+    <div className="relative w-full h-full flex flex-col overflow-hidden">
+      {currentView != currentIssueView && loader === "init-loader" ? (
+        <div className="w-full h-full flex justify-center items-center">
+          <Spinner />
+        </div>
+      ) : (
+        <>
+          <GlobalViewsAppliedFiltersRoot />
+
+          {Object.keys(getIssues ?? {}).length == 0 && !loader ? (
+            <>{/* <GlobalViewEmptyState /> */}</>
+          ) : (
+            <div className="w-full h-full relative overflow-auto">
+              <SpreadsheetView
+                displayProperties={issueFilters?.displayProperties ?? {}}
+                displayFilters={issueFilters?.displayFilters ?? {}}
+                handleDisplayFilterUpdate={handleDisplayFiltersUpdate}
+                issues={issues as IIssueUnGroupedStructure}
+                quickActions={(issue) => (
+                  <AllIssueQuickActions
+                    issue={issue}
+                    handleUpdate={async () => handleIssues({ ...issue }, EIssueActions.UPDATE)}
+                    handleDelete={async () => handleIssues(issue, EIssueActions.DELETE)}
+                  />
+                )}
+                members={workspaceMembers?.map((m) => m.member)}
+                labels={workspaceLabels || undefined}
+                handleIssues={handleIssues}
+                disableUserActions={isEditingAllowed}
+                viewId={currentIssueView}
+              />
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+});

web/components/issues/issue-layouts/roots/global-view-layout-root.tsx

@@ -1,118 +0,0 @@
-import React, { useCallback } from "react";
-import { useRouter } from "next/router";
-import { observer } from "mobx-react-lite";
-import useSWR from "swr";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
-// components
-import { GlobalViewEmptyState, GlobalViewsAppliedFiltersRoot, SpreadsheetView } from "components/issues";
-// ui
-import { Spinner } from "@plane/ui";
-// types
-import { IIssue, IIssueDisplayFilterOptions, TStaticViewTypes } from "types";
-
-type Props = {
-  type?: TStaticViewTypes;
-};
-
-export const GlobalViewLayoutRoot: React.FC<Props> = observer((props) => {
-  const { type } = props;
-
-  const router = useRouter();
-  const { workspaceSlug, globalViewId } = router.query;
-
-  const {
-    globalViews: globalViewsStore,
-    globalViewIssues: globalViewIssuesStore,
-    globalViewFilters: globalViewFiltersStore,
-    workspaceFilter: workspaceFilterStore,
-    workspace: workspaceStore,
-    workspaceMember: { workspaceMembers },
-    issueDetail: issueDetailStore,
-    project: projectStore,
-  } = useMobxStore();
-
-  const viewDetails = globalViewId ? globalViewsStore.globalViewDetails[globalViewId.toString()] : undefined;
-
-  const storedFilters = globalViewId ? globalViewFiltersStore.storedFilters[globalViewId.toString()] : undefined;
-
-  const projects = workspaceSlug ? projectStore.projects[workspaceSlug.toString()] : null;
-
-  useSWR(
-    workspaceSlug && globalViewId && viewDetails ? `GLOBAL_VIEW_ISSUES_${globalViewId.toString()}` : null,
-    workspaceSlug && globalViewId && viewDetails
-      ? () => {
-          globalViewIssuesStore.fetchViewIssues(workspaceSlug.toString(), globalViewId.toString(), storedFilters ?? {});
-        }
-      : null
-  );
-
-  useSWR(
-    workspaceSlug && type ? `GLOBAL_VIEW_ISSUES_${type.toString()}` : null,
-    workspaceSlug && type
-      ? () => {
-          globalViewIssuesStore.fetchStaticIssues(workspaceSlug.toString(), type);
-        }
-      : null
-  );
-
-  const handleDisplayFiltersUpdate = useCallback(
-    (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
-      if (!workspaceSlug) return;
-
-      workspaceFilterStore.updateWorkspaceFilters(workspaceSlug.toString(), {
-        display_filters: updatedDisplayFilter,
-      });
-    },
-    [workspaceFilterStore, workspaceSlug]
-  );
-
-  const handleUpdateIssue = useCallback(
-    (issue: IIssue, data: Partial<IIssue>) => {
-      if (!workspaceSlug) return;
-
-      const payload = {
-        ...issue,
-        ...data,
-      };
-
-      globalViewIssuesStore.updateIssueStructure(type ?? globalViewId!.toString(), payload);
-      // issueDetailStore.updateIssue(workspaceSlug.toString(), issue.project, issue.id, data);
-    },
-    [globalViewId, globalViewIssuesStore, workspaceSlug, issueDetailStore]
-  );
-
-  const issues = type
-    ? globalViewIssuesStore.viewIssues?.[type]
-    : globalViewId
-    ? globalViewIssuesStore.viewIssues?.[globalViewId.toString()]
-    : undefined;
-
-  if (!issues)
-    return (
-      <div className="h-full w-full grid place-items-center">
-        <Spinner />
-      </div>
-    );
-
-  return (
-    <div className="relative w-full h-full flex flex-col overflow-hidden">
-      <GlobalViewsAppliedFiltersRoot />
-      {issues?.length === 0 || !projects || projects?.length === 0 ? (
-        <GlobalViewEmptyState />
-      ) : (
-        <div className="h-full w-full overflow-auto">
-          {/* <SpreadsheetView
-            displayProperties={workspaceFilterStore.workspaceDisplayProperties}
-            displayFilters={workspaceFilterStore.workspaceDisplayFilters}
-            handleDisplayFilterUpdate={handleDisplayFiltersUpdate}
-            issues={issues}
-            members={workspaceMembers?.map((m) => m.member)}
-            labels={workspaceStore.workspaceLabels ? workspaceStore.workspaceLabels : undefined}
-            disableUserActions={false}
-          /> */}
-        </div>
-      )}
-    </div>
-  );
-});

web/components/issues/issue-layouts/roots/index.ts

@@ -1,5 +1,5 @@
 export * from "./cycle-layout-root";
-export * from "./global-view-layout-root";
+export * from "./all-issue-layout-root";
 export * from "./module-layout-root";
 export * from "./project-layout-root";
 export * from "./project-view-layout-root";