dev: update takeoff script to take custom port values

* feat: added heading 3 in the editor summary markings

* feat: fixed editor and summary bar sizing

* feat: added `issue-embed` extension

* feat: exposed issue embed extension

* feat: added main embed config configuration to document editor body

* feat: added peek overview and issue embed fetch function

* feat: enabled slash commands to take additonal suggestions from editors

* chore: replaced `IssueEmbedWidget` into widget extension

* chore: removed issue embed from previous places

* feat: added issue embed suggestion extension

* feat: added issue embed suggestion renderer

* feat: added issue embed suggestions into extensions module

* feat: added issues in issueEmbedConfiguration in document editor

* chore: package fixes

* chore: removed log statements

* feat: added title updation logic into document editor

* fix: issue suggestion items, not rendering issue widget on enter

* feat: added error card for issue widget

* feat: improved focus logic for issue search and navigate

* feat: appended transactionid for issueWidgetTransaction

* chore: packages update

* feat: disabled editing of title in readonly mode

* feat: added issueEmbedConfig in readonly editor

* fix: issue suggestions not loading after structure changed to object

* feat: added toast messages for success/error messages from doc editor

* fix: issue suggestions sorting issue

* fix: formatting errors resolved

* fix: infinite reloading of the readonly document editor

* fix: css in avatar of issue widget card

* feat: added show alert on pages reload

* feat: added saving state for the pages editor

* fix: issue with heading 3 in side bar view

* style: updated issue suggestions dropdown ui

* fix: Pages intiliazation and mutation with updated MobX store

* fixed image uploads being cancelled on refocus due to swr

* fix: issue with same description rerendering empty content fixed

* fix: scroll in issue suggestion view

* fix: added submission prop

* fix: Updated the comment update to take issue id in inbox issues

* feat:changed date representation in IssueEmbedCard

* fix: page details mutation with optimistic updates using swr

* fix: menu options in read only editor with auth fixed

* fix: add error handling for title and page desc

* fixed yarn.lock

* fix: read-only editor title wrapping

* fix: build error with rich text editor

---------

Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Co-authored-by: Palanikannan1437 <73993394+Palanikannan1437@users.noreply.github.com>

.dockerignore

@@ -2,16 +2,5 @@
 *.pyc
 .env
 venv
-node_modules/
-**/node_modules/
-npm-debug.log
-.next/
-**/.next/
-.turbo/
-**/.turbo/
-build/
-**/build/
-out/
-**/out/
-dist/
-**/dist/
+node_modules
+npm-debug.log

.github/workflows/build-branch.yml

@@ -9,7 +9,6 @@ on:
       - preview
       - qa
       - develop
-      - release-*
   release:
     types: [released, prereleased]
 
@@ -63,14 +62,14 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Frontend Docker Tag 
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:stable
           else
             TAG=${{ env.FRONTEND_TAG }}
           fi
@@ -105,14 +104,14 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Space Docker Tag 
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:stable
           else
             TAG=${{ env.SPACE_TAG }}
           fi
@@ -147,14 +146,14 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Backend Docker Tag 
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:stable
           else
             TAG=${{ env.BACKEND_TAG }}
           fi
@@ -189,14 +188,14 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
       - name: Set Proxy Docker Tag 
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:stable
           else
             TAG=${{ env.PROXY_TAG }}
           fi

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

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

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

@@ -1,13 +1,11 @@
-name: Create Sync Action
+name: Create PR in Plane EE Repository to sync the changes
 
 on:
   pull_request:
     branches:
-      - develop # Change this to preview
+      - master
     types:
       - closed
-env: 
-  SOURCE_BRANCH_NAME: ${{github.event.pull_request.base.ref}}
 
 jobs:
   create_pr:
@@ -18,13 +16,27 @@ jobs:
       pull-requests: write
       contents: read
     steps:
+      - name: Check SOURCE_REPO
+        id: check_repo
+        env:
+          SOURCE_REPO: ${{ secrets.SOURCE_REPO_NAME }}
+        run: |
+          echo "::set-output name=is_correct_repo::$(if [[ "$SOURCE_REPO" == "makeplane/plane" ]]; then echo 'true'; else echo 'false'; fi)"
+
       - name: Checkout Code
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
         uses: actions/checkout@v2
         with:
           persist-credentials: false
           fetch-depth: 0
 
+      - name: Set up Branch Name
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
+        run: |
+          echo "SOURCE_BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV
+
       - name: Setup GH CLI
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
         run: |
           type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
           curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
@@ -34,22 +46,34 @@ jobs:
           sudo apt install gh -y
 
       - name: Create Pull Request
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
         env:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
-          TARGET_REPO="${{ secrets.SYNC_TARGET_REPO_NAME }}"
-          TARGET_BRANCH="${{ secrets.SYNC_TARGET_BRANCH_NAME }}"
-          TARGET_BASE_BRANCH="${{ secrets.SYNC_TARGET_BASE_BRANCH_NAME }}"
+          TARGET_REPO="${{ secrets.TARGET_REPO_NAME }}"
+          TARGET_BRANCH="${{ secrets.TARGET_REPO_BRANCH }}"
           SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
 
           git checkout $SOURCE_BRANCH
-          git remote add target-origin "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH
+          git remote add target "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
+          git push target $SOURCE_BRANCH:$SOURCE_BRANCH
 
-          PR_TITLE=${{secrets.SYNC_PR_TITLE}}
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          PR_BODY="${{ github.event.pull_request.body }}"
+
+          # Remove double quotes
+          PR_TITLE_CLEANED="${PR_TITLE//\"/}"
+          PR_BODY_CLEANED="${PR_BODY//\"/}"
+
+          # Construct PR_BODY_CONTENT using a here-document
+          PR_BODY_CONTENT=$(cat <<EOF
+          $PR_BODY_CLEANED
+          EOF
+          )
 
           gh pr create \
-            --base $TARGET_BASE_BRANCH \
-            --head $TARGET_BRANCH \
-            --title "$PR_TITLE" \
+            --base $TARGET_BRANCH \
+            --head $SOURCE_BRANCH \
+            --title "[SYNC] $PR_TITLE_CLEANED" \
+            --body "$PR_BODY_CONTENT" \
             --repo $TARGET_REPO

CONTRIBUTING.md

@@ -33,8 +33,8 @@ The backend is a django project which is kept inside apiserver
 1. Clone the repo
 
 ```bash
-git clone https://github.com/makeplane/plane.git [folder-name]
-cd [folder-name]
+git clone https://github.com/makeplane/plane
+cd plane
 chmod +x setup.sh
 ```
 
@@ -44,12 +44,33 @@ chmod +x setup.sh
 ./setup.sh
 ```
 
-3. Start the containers
+3. Define `NEXT_PUBLIC_API_BASE_URL=http://localhost` in **web/.env** and **space/.env** file
 
 ```bash
-docker compose -f docker-compose-local.yml up
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./web/.env
 ```
 
+```bash
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./space/.env
+```
+
+4. Run Docker compose up
+
+```bash
+docker compose up -d
+```
+
+5. Install dependencies
+
+```bash
+yarn install
+```
+
+6. Run the web app in development mode
+
+```bash
+yarn dev
+```
 
 ## Missing a Feature?
 

ENV_SETUP.md

@@ -49,10 +49,24 @@ NGINX_PORT=80
 ​
 
 ```
+# Enable/Disable OAUTH - default 0 for selfhosted instance
+NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```
 
+​
+
+## {PROJECT_FOLDER}/spaces/.env.example
+
+​
+
+```
+# Flag to toggle OAuth
+NEXT_PUBLIC_ENABLE_OAUTH=0
+```
+
+​
 
 ## {PROJECT_FOLDER}/apiserver/.env
 

README.md

@@ -37,7 +37,7 @@ Meet [Plane](https://plane.so). An open-source software development tool to mana
 
 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
 
-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting/docker-compose).
+The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting).
 
 ## ⚡️ Contributors Quick Start
 
@@ -63,7 +63,7 @@ Thats it!
 
 ## 🍙 Self Hosting
 
-For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/self-hosting/docker-compose) documentation page
+For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/self-hosting) documentation page
 
 ## 🚀 Features
 

apiserver/.env.example

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

apiserver/Dockerfile.dev

@@ -27,8 +27,7 @@ WORKDIR /code
 COPY requirements.txt ./requirements.txt
 ADD requirements ./requirements
 
-# Install the local development settings
-RUN pip install -r requirements/local.txt --compile --no-cache-dir
+RUN pip install -r requirements.txt --compile --no-cache-dir
 
 RUN addgroup -S plane && \
     adduser -S captain -G plane
@@ -49,5 +48,5 @@ USER captain
 # Expose container port and run entry point script
 EXPOSE 8000
 
-CMD [ "./bin/takeoff.local" ]
+# CMD [ "./bin/takeoff" ]
 

apiserver/bin/takeoff.local

@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-python manage.py wait_for_db
-python manage.py migrate
-
-# Create the default bucket
-#!/bin/bash
-
-# Collect system information
-HOSTNAME=$(hostname)
-MAC_ADDRESS=$(ip link show | awk '/ether/ {print $2}' | head -n 1)
-CPU_INFO=$(cat /proc/cpuinfo)
-MEMORY_INFO=$(free -h)
-DISK_INFO=$(df -h)
-
-# Concatenate information and compute SHA-256 hash
-SIGNATURE=$(echo "$HOSTNAME$MAC_ADDRESS$CPU_INFO$MEMORY_INFO$DISK_INFO" | sha256sum | awk '{print $1}')
-
-# Export the variables
-export MACHINE_SIGNATURE=$SIGNATURE
-
-# Register instance
-python manage.py register_instance $MACHINE_SIGNATURE
-# Load the configuration variable
-python manage.py configure_instance
-
-# Create the default bucket
-python manage.py create_bucket
-
-python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local
-

apiserver/package.json

@@ -1,4 +1,4 @@
 {
-  "name": "plane-api",
-  "version": "0.14.0"
-}
+    "name": "plane-api",
+    "version": "0.13.2"
+}

apiserver/plane/api/serializers/base.py

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

apiserver/plane/api/serializers/issue.py

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

apiserver/plane/api/serializers/module.py

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

apiserver/plane/api/views/issue.py

@@ -221,20 +221,11 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
 
     def patch(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
-        project = Project.objects.get(pk=project_id)
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueSerializer(
-            issue,
-            data=request.data,
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-            },
-            partial=True,
-        )
+        serializer = IssueSerializer(issue, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             issue_activity.delay(

apiserver/plane/api/views/module.py

@@ -121,8 +121,8 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
     def post(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        serializer = ModuleSerializer(data=request.data, context={"project_id": project_id, "workspace_id": project.workspace_id})
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
+        serializer = ModuleSerializer(data=request.data, context={"project": project})
         if serializer.is_valid():
             serializer.save()
             module = Module.objects.get(pk=serializer.data["id"])
@@ -132,7 +132,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
     
     def patch(self, request, slug, project_id, pk):
         module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
-        serializer = ModuleSerializer(module, data=request.data, context={"project_id": project_id}, partial=True)
+        serializer = ModuleSerializer(module, data=request.data)
         if serializer.is_valid():
             serializer.save()
             return Response(serializer.data, status=status.HTTP_201_CREATED)

apiserver/plane/app/serializers/__init__.py

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

apiserver/plane/app/serializers/base.py

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

apiserver/plane/app/serializers/cycle.py

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

apiserver/plane/app/serializers/estimate.py

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

apiserver/plane/app/serializers/inbox.py

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

apiserver/plane/app/serializers/issue.py

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

apiserver/plane/app/serializers/module.py

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

apiserver/plane/app/serializers/project.py

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

apiserver/plane/app/serializers/view.py

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

apiserver/plane/app/serializers/workspace.py

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

apiserver/plane/app/urls/cycle.py

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

apiserver/plane/app/urls/inbox.py

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

apiserver/plane/app/urls/issue.py

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

apiserver/plane/app/urls/module.py

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

apiserver/plane/app/urls/project.py

@@ -13,7 +13,6 @@ from plane.app.views import (
     UserProjectInvitationsViewset,
     ProjectPublicCoverImagesEndpoint,
     ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )
 
 
@@ -75,11 +74,6 @@ urlpatterns = [
         ),
         name="user-project-invitations",
     ),
-    path(
-        "users/me/workspaces/<str:slug>/project-roles/",
-        UserProjectRolesEndpoint.as_view(),
-        name="user-project-roles",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/join/<uuid:pk>/",
         ProjectJoinEndpoint.as_view(),

apiserver/plane/app/urls/views.py

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

apiserver/plane/app/urls/workspace.py

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

apiserver/plane/app/views/__init__.py

@@ -11,7 +11,6 @@ from .project import (
     ProjectFavoritesViewSet,
     ProjectPublicCoverImagesEndpoint,
     ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )
 from .user import (
     UserEndpoint,
@@ -45,8 +44,6 @@ from .workspace import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
-    WorkspaceProjectMemberEndpoint,
-    WorkspaceUserPropertiesEndpoint,
 )
 from .state import StateViewSet
 from .view import (
@@ -61,7 +58,6 @@ from .cycle import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleUserPropertiesEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue import (
@@ -106,7 +102,6 @@ from .module import (
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
-    ModuleUserPropertiesEndpoint,
 )
 
 from .api import ApiTokenEndpoint

apiserver/plane/app/views/auth_extended.py

@@ -34,7 +34,7 @@ from plane.app.serializers import (
 from plane.db.models import User, WorkspaceMemberInvite
 from plane.license.utils.instance_value import get_configuration_value
 from plane.bgtasks.forgot_password_task import forgot_password
-from plane.license.models import Instance
+from plane.license.models import Instance, InstanceConfiguration
 from plane.settings.redis import redis_instance
 from plane.bgtasks.magic_link_code_task import magic_link
 from plane.bgtasks.event_tracking_task import auth_events
@@ -321,19 +321,8 @@ class EmailCheckEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Get configuration values
-        ENABLE_SIGNUP, ENABLE_MAGIC_LINK_LOGIN = get_configuration_value(
-            [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP"),
-                },
-                {
-                    "key": "ENABLE_MAGIC_LINK_LOGIN",
-                    "default": os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
-                },
-            ]
-        )
+        # Get the configurations
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
 
         email = request.data.get("email", False)
 
@@ -358,7 +347,12 @@ class EmailCheckEndpoint(BaseAPIView):
         if user is None:
             # Create the user
             if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                 and not WorkspaceMemberInvite.objects.filter(
                     email=email,
                 ).exists()
@@ -378,8 +372,13 @@ class EmailCheckEndpoint(BaseAPIView):
                 is_password_autoset=True,
             )
 
+
             if not bool(
-                ENABLE_MAGIC_LINK_LOGIN,
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_MAGIC_LINK_LOGIN",
+                    os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
+                ),
             ):
                 return Response(
                     {"error": "Magic link sign in is disabled."},
@@ -387,15 +386,16 @@ class EmailCheckEndpoint(BaseAPIView):
                 )
 
             # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium="MAGIC_LINK",
-                first_time=True,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium="MAGIC_LINK",
+                    first_time=True,
+                )
             key, token, current_attempt = generate_magic_token(email=email)
             if not current_attempt:
                 return Response(
@@ -413,21 +413,28 @@ class EmailCheckEndpoint(BaseAPIView):
         else:
             if user.is_password_autoset:
                 ## Generate a random token
-                if not bool(ENABLE_MAGIC_LINK_LOGIN):
+                if not bool(
+                    get_configuration_value(
+                        instance_configuration,
+                        "ENABLE_MAGIC_LINK_LOGIN",
+                        os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
+                    ),
+                ):
                     return Response(
                         {"error": "Magic link sign in is disabled."},
                         status=status.HTTP_400_BAD_REQUEST,
                     )
 
-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="MAGIC_LINK",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="MAGIC_LINK",
+                        first_time=False,
+                    )
 
                 # Generate magic token
                 key, token, current_attempt = generate_magic_token(email=email)
@@ -447,15 +454,16 @@ class EmailCheckEndpoint(BaseAPIView):
                     status=status.HTTP_200_OK,
                 )
             else:
-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="EMAIL",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="EMAIL",
+                        first_time=False,
+                    )
 
                 # User should enter password to login
                 return Response(

apiserver/plane/app/views/authentication.py

@@ -27,7 +27,7 @@ from plane.db.models import (
     ProjectMember,
 )
 from plane.settings.redis import redis_instance
-from plane.license.models import 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
 
@@ -52,6 +52,8 @@ class SignUpEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+
         email = request.data.get("email", False)
         password = request.data.get("password", False)
         ## Raise exception if any of the above are missing
@@ -71,20 +73,14 @@ class SignUpEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # get configuration values
-        # Get configuration values
-        ENABLE_SIGNUP, = get_configuration_value(
-            [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP"),
-                },
-            ]
-        )
-
         # If the sign up is not enabled and the user does not have invite disallow him from creating the account
         if (
-            ENABLE_SIGNUP == "0"
+            get_configuration_value(
+                instance_configuration,
+                "ENABLE_SIGNUP",
+                os.environ.get("ENABLE_SIGNUP", "0"),
+            )
+            == "0"
             and not WorkspaceMemberInvite.objects.filter(
                 email=email,
             ).exists()
@@ -173,17 +169,16 @@ class SignInEndpoint(BaseAPIView):
 
         # Create the user
         else:
-            ENABLE_SIGNUP, = get_configuration_value(
-                [
-                    {
-                        "key": "ENABLE_SIGNUP",
-                        "default": os.environ.get("ENABLE_SIGNUP"),
-                    },
-                ]
-            )
+            # Get the configurations
+            instance_configuration = InstanceConfiguration.objects.values("key", "value")
             # Create the user
             if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                 and not WorkspaceMemberInvite.objects.filter(
                     email=email,
                 ).exists()
@@ -269,15 +264,16 @@ class SignInEndpoint(BaseAPIView):
         workspace_member_invites.delete()
         project_member_invites.delete()
         # Send event
-        auth_events.delay(
-            user=user.id,
-            email=email,
-            user_agent=request.META.get("HTTP_USER_AGENT"),
-            ip=request.META.get("REMOTE_ADDR"),
-            event_name="SIGN_IN",
-            medium="EMAIL",
-            first_time=False,
-        )
+        if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+            auth_events.delay(
+                user=user.id,
+                email=email,
+                user_agent=request.META.get("HTTP_USER_AGENT"),
+                ip=request.META.get("REMOTE_ADDR"),
+                event_name="SIGN_IN",
+                medium="EMAIL",
+                first_time=False,
+            )
 
         access_token, refresh_token = get_tokens_for_user(user)
         data = {
@@ -343,16 +339,24 @@ class MagicSignInEndpoint(BaseAPIView):
 
             if str(token) == str(user_token):
                 user = User.objects.get(email=email)
+                if not user.is_active:
+                    return Response(
+                        {
+                            "error": "Your account has been deactivated. Please contact your site administrator."
+                        },
+                        status=status.HTTP_403_FORBIDDEN,
+                    )
                 # Send event
-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="MAGIC_LINK",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="MAGIC_LINK",
+                        first_time=False,
+                    )
 
                 user.is_active = True
                 user.is_email_verified = True

apiserver/plane/app/views/base.py

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

apiserver/plane/app/views/config.py

@@ -11,6 +11,7 @@ from rest_framework.response import Response
 
 # Module imports
 from .base import BaseAPIView
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_configuration_value
 
 
@@ -20,106 +21,89 @@ class ConfigurationEndpoint(BaseAPIView):
     ]
 
     def get(self, request):
-        # Get all the configuration
-        (
-            GOOGLE_CLIENT_ID,
-            GITHUB_CLIENT_ID,
-            GITHUB_APP_NAME,
-            EMAIL_HOST_USER,
-            EMAIL_HOST_PASSWORD,
-            ENABLE_MAGIC_LINK_LOGIN,
-            ENABLE_EMAIL_PASSWORD,
-            SLACK_CLIENT_ID,
-            POSTHOG_API_KEY,
-            POSTHOG_HOST,
-            UNSPLASH_ACCESS_KEY,
-            OPENAI_API_KEY,
-        ) = get_configuration_value(
-            [
-                {
-                    "key": "GOOGLE_CLIENT_ID",
-                    "default": os.environ.get("GOOGLE_CLIENT_ID", None),
-                },
-                {
-                    "key": "GITHUB_CLIENT_ID",
-                    "default": os.environ.get("GITHUB_CLIENT_ID", None),
-                },
-                {
-                    "key": "GITHUB_APP_NAME",
-                    "default": os.environ.get("GITHUB_APP_NAME", None),
-                },
-                {
-                    "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER", None),
-                },
-                {
-                    "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD", None),
-                },
-                {
-                    "key": "ENABLE_MAGIC_LINK_LOGIN",
-                    "default": os.environ.get("ENABLE_MAGIC_LINK_LOGIN", "1"),
-                },
-                {
-                    "key": "ENABLE_EMAIL_PASSWORD",
-                    "default": os.environ.get("ENABLE_EMAIL_PASSWORD", "1"),
-                },
-                {
-                    "key": "SLACK_CLIENT_ID",
-                    "default": os.environ.get("SLACK_CLIENT_ID", "1"),
-                },
-                {
-                    "key": "POSTHOG_API_KEY",
-                    "default": os.environ.get("POSTHOG_API_KEY", "1"),
-                },
-                {
-                    "key": "POSTHOG_HOST",
-                    "default": os.environ.get("POSTHOG_HOST", "1"),
-                },
-                {
-                    "key": "UNSPLASH_ACCESS_KEY",
-                    "default": os.environ.get("UNSPLASH_ACCESS_KEY", "1"),
-                },
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", "1"),
-                },
-            ]
-        )
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
 
         data = {}
         # Authentication
-        data["google_client_id"] = (
-            GOOGLE_CLIENT_ID if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != '""' else None
+        data["google_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GOOGLE_CLIENT_ID",
+            os.environ.get("GOOGLE_CLIENT_ID", None),
         )
-        data["github_client_id"] = (
-            GITHUB_CLIENT_ID if GITHUB_CLIENT_ID and GITHUB_CLIENT_ID != '""' else None
+        data["github_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_CLIENT_ID",
+            os.environ.get("GITHUB_CLIENT_ID", None),
+        )
+        data["github_app_name"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_APP_NAME",
+            os.environ.get("GITHUB_APP_NAME", None),
         )
-        data["github_app_name"] = GITHUB_APP_NAME
         data["magic_login"] = (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
-        ) and ENABLE_MAGIC_LINK_LOGIN == "1"
+            bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_USER",
+                    os.environ.get("EMAIL_HOST_USER", None),
+                ),
+            )
+            and bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_PASSWORD",
+                    os.environ.get("EMAIL_HOST_PASSWORD", None),
+                )
+            )
+        ) and get_configuration_value(
+            instance_configuration, "ENABLE_MAGIC_LINK_LOGIN", "1"
+        ) == "1"
 
-        data["email_password_login"] = ENABLE_EMAIL_PASSWORD == "1"
+        data["email_password_login"] = (
+            get_configuration_value(
+                instance_configuration, "ENABLE_EMAIL_PASSWORD", "1"
+            )
+            == "1"
+        )
         # Slack client
-        data["slack_client_id"] = SLACK_CLIENT_ID
+        data["slack_client_id"] = get_configuration_value(
+            instance_configuration,
+            "SLACK_CLIENT_ID",
+            os.environ.get("SLACK_CLIENT_ID", None),
+        )
 
         # Posthog
-        data["posthog_api_key"] = POSTHOG_API_KEY
-        data["posthog_host"] = POSTHOG_HOST
-
-        # Unsplash
-        data["has_unsplash_configured"] = bool(UNSPLASH_ACCESS_KEY)
-
-        # Open AI settings
-        data["has_openai_configured"] = bool(OPENAI_API_KEY)
-
-        # File size settings
-        data["file_size_limit"] = float(os.environ.get("FILE_SIZE_LIMIT", 5242880))
-
-        # is smtp configured
-        data["is_smtp_configured"] = not (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
+        data["posthog_api_key"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_API_KEY",
+            os.environ.get("POSTHOG_API_KEY", None),
+        )
+        data["posthog_host"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_HOST",
+            os.environ.get("POSTHOG_HOST", None),
         )
 
+        # Unsplash
+        data["has_unsplash_configured"] = bool(
+            get_configuration_value(
+                instance_configuration,
+                "UNSPLASH_ACCESS_KEY",
+                os.environ.get("UNSPLASH_ACCESS_KEY", None),
+            )
+        )
+
+        # Open AI settings
+        data["has_openai_configured"] = bool(
+            get_configuration_value(
+                instance_configuration,
+                "OPENAI_API_KEY",
+                os.environ.get("OPENAI_API_KEY", None),
+            )
+        )
+
+        data["file_size_limit"] = float(os.environ.get("FILE_SIZE_LIMIT", 5242880))
+
+        data["is_self_managed"] = bool(int(os.environ.get("IS_SELF_MANAGED", "1")))
+
         return Response(data, status=status.HTTP_200_OK)

apiserver/plane/app/views/cycle.py

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

apiserver/plane/app/views/estimate.py

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

apiserver/plane/app/views/external.py

@@ -1,7 +1,6 @@
 # Python imports
 import requests
 import os
-
 # Third party imports
 from openai import OpenAI
 from rest_framework.response import Response
@@ -16,31 +15,23 @@ from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
 from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 from plane.utils.integrations.github import get_release_notes
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_configuration_value
 
-
 class GPTIntegrationEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,
     ]
 
     def post(self, request, slug, project_id):
-        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
-            [
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", None),
-                },
-                {
-                    "key": "GPT_ENGINE",
-                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
-                },
-            ]
-        )
 
         # Get the configuration value
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        api_key = get_configuration_value(instance_configuration, "OPENAI_API_KEY", os.environ.get("OPENAI_API_KEY"))
+        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE", os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"))
+
         # Check the keys
-        if not OPENAI_API_KEY or not GPT_ENGINE:
+        if not api_key or not gpt_engine:
             return Response(
                 {"error": "OpenAI API key and engine is required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -57,11 +48,11 @@ class GPTIntegrationEndpoint(BaseAPIView):
         final_text = task + "\n" + prompt
 
         client = OpenAI(
-            api_key=OPENAI_API_KEY,
+            api_key=api_key,
         )
 
         response = client.chat.completions.create(
-            model=GPT_ENGINE,
+            model=gpt_engine,
             messages=[{"role": "user", "content": final_text}],
         )
 
@@ -88,17 +79,13 @@ class ReleaseNotesEndpoint(BaseAPIView):
 
 
 class UnsplashEndpoint(BaseAPIView):
+
     def get(self, request):
-        UNSPLASH_ACCESS_KEY, = get_configuration_value(
-            [
-                {
-                    "key": "UNSPLASH_ACCESS_KEY",
-                    "default": os.environ.get("UNSPLASH_ACCESS_KEY"),
-                }
-            ]
-        )
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        unsplash_access_key = get_configuration_value(instance_configuration, "UNSPLASH_ACCESS_KEY", os.environ.get("UNSPLASH_ACCESS_KEY"))
+
         # Check unsplash access key
-        if not UNSPLASH_ACCESS_KEY:
+        if not unsplash_access_key:
             return Response([], status=status.HTTP_200_OK)
 
         # Query parameters
@@ -107,9 +94,9 @@ class UnsplashEndpoint(BaseAPIView):
         per_page = request.GET.get("per_page", 20)
 
         url = (
-            f"https://api.unsplash.com/search/photos/?client_id={UNSPLASH_ACCESS_KEY}&query={query}&page=${page}&per_page={per_page}"
+            f"https://api.unsplash.com/search/photos/?client_id={unsplash_access_key}&query={query}&page=${page}&per_page={per_page}"
             if query
-            else f"https://api.unsplash.com/photos/?client_id={UNSPLASH_ACCESS_KEY}&page={page}&per_page={per_page}"
+            else f"https://api.unsplash.com/photos/?client_id={unsplash_access_key}&page={page}&per_page={per_page}"
         )
 
         headers = {

apiserver/plane/app/views/inbox.py

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

apiserver/plane/app/views/issue.py

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

apiserver/plane/app/views/module.py

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

apiserver/plane/app/views/oauth.py

@@ -30,7 +30,7 @@ from plane.db.models import (
 )
 from plane.bgtasks.event_tracking_task import auth_events
 from .base import BaseAPIView
-from plane.license.models import Instance
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_configuration_value
 
 
@@ -86,14 +86,7 @@ def get_access_token(request_token: str, client_id: str) -> str:
     if not request_token:
         raise ValueError("The request token has to be supplied!")
 
-    (CLIENT_SECRET,) = get_configuration_value(
-        [
-            {
-                "key": "GITHUB_CLIENT_SECRET",
-                "default": os.environ.get("GITHUB_CLIENT_SECRET", None),
-            },
-        ]
-    )
+    CLIENT_SECRET = os.environ.get("GITHUB_CLIENT_SECRET")
 
     url = f"https://github.com/login/oauth/access_token?client_id={client_id}&client_secret={CLIENT_SECRET}&code={request_token}"
     headers = {"accept": "application/json"}
@@ -154,18 +147,22 @@ class OauthEndpoint(BaseAPIView):
             id_token = request.data.get("credential", False)
             client_id = request.data.get("clientId", False)
 
-            GOOGLE_CLIENT_ID, GITHUB_CLIENT_ID = get_configuration_value(
-                [
-                    {
-                        "key": "GOOGLE_CLIENT_ID",
-                        "default": os.environ.get("GOOGLE_CLIENT_ID"),
-                    },
-                    {
-                        "key": "GITHUB_CLIENT_ID",
-                        "default": os.environ.get("GITHUB_CLIENT_ID"),
-                    },
-                ]
+            instance_configuration = InstanceConfiguration.objects.values(
+                "key", "value"
             )
+            if not get_configuration_value(
+                instance_configuration,
+                "GOOGLE_CLIENT_ID",
+                os.environ.get("GOOGLE_CLIENT_ID"),
+            ) or not get_configuration_value(
+                instance_configuration,
+                "GITHUB_CLIENT_ID",
+                os.environ.get("GITHUB_CLIENT_ID"),
+            ):
+                return Response(
+                    {"error": "Github or Google login is not configured"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
 
             if not medium or not id_token:
                 return Response(
@@ -176,19 +173,9 @@ class OauthEndpoint(BaseAPIView):
                 )
 
             if medium == "google":
-                if not GOOGLE_CLIENT_ID:
-                    return Response(
-                        {"error": "Google login is not configured"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                 data = validate_google_token(id_token, client_id)
 
             if medium == "github":
-                if not GITHUB_CLIENT_ID:
-                    return Response(
-                        {"error": "Github login is not configured"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                 access_token = get_access_token(id_token, client_id)
                 data = get_user_data(access_token)
 
@@ -291,15 +278,16 @@ class OauthEndpoint(BaseAPIView):
             )
 
             # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium=medium.upper(),
-                first_time=False,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium=medium.upper(),
+                    first_time=False,
+                )
 
             access_token, refresh_token = get_tokens_for_user(user)
 
@@ -310,16 +298,17 @@ class OauthEndpoint(BaseAPIView):
             return Response(data, status=status.HTTP_200_OK)
 
         except User.DoesNotExist:
-            (ENABLE_SIGNUP,) = get_configuration_value(
-                [
-                    {
-                        "key": "ENABLE_SIGNUP",
-                        "default": os.environ.get("ENABLE_SIGNUP", "0"),
-                    }
-                ]
+            ## Signup Case
+            instance_configuration = InstanceConfiguration.objects.values(
+                "key", "value"
             )
             if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                 and not WorkspaceMemberInvite.objects.filter(
                     email=email,
                 ).exists()
@@ -422,15 +411,16 @@ class OauthEndpoint(BaseAPIView):
             project_member_invites.delete()
 
             # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium=medium.upper(),
-                first_time=True,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium=medium.upper(),
+                    first_time=True,
+                )
 
             SocialLoginConnection.objects.update_or_create(
                 medium=medium,

apiserver/plane/app/views/page.py

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

apiserver/plane/app/views/project.py

@@ -36,14 +36,11 @@ from plane.app.serializers import (
     ProjectFavoriteSerializer,
     ProjectDeployBoardSerializer,
     ProjectMemberAdminSerializer,
-    ProjectMemberRoleSerializer,
 )
 
 from plane.app.permissions import (
-    WorkspaceUserPermission,
     ProjectBasePermission,
     ProjectMemberPermission,
-    ProjectLitePermission,
 )
 
 from plane.db.models import (
@@ -146,16 +143,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                     )
                 )
             )
-            .prefetch_related(
-                Prefetch(
-                    "project_projectmember",
-                    queryset=ProjectMember.objects.filter(
-                        workspace__slug=self.kwargs.get("slug"),
-                        is_active=True,
-                    ).select_related("member"),
-                    to_attr="members_list",
-                )
-            )
             .distinct()
         )
 
@@ -171,6 +158,16 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
         projects = (
             self.get_queryset()
             .annotate(sort_order=Subquery(sort_order_query))
+            .prefetch_related(
+                Prefetch(
+                    "project_projectmember",
+                    queryset=ProjectMember.objects.filter(
+                        workspace__slug=slug,
+                        is_active=True,
+                    ).select_related("member"),
+                    to_attr='members_list'
+                )
+            )
             .order_by("sort_order", "name")
         )
         if request.GET.get("per_page", False) and request.GET.get("cursor", False):
@@ -181,9 +178,12 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                     projects, many=True
                 ).data,
             )
-        projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).data
-        return Response(projects, status=status.HTTP_200_OK)
 
+        return Response(
+            ProjectListSerializer(
+                projects, many=True, fields=fields if fields else None
+            ).data
+        )
 
     def create(self, request, slug):
         try:
@@ -601,18 +601,6 @@ class ProjectMemberViewSet(BaseViewSet):
         ProjectMemberPermission,
     ]
 
-    def get_permissions(self):
-        if self.action == "leave":
-            self.permission_classes = [
-                ProjectLitePermission,
-            ]
-        else:
-            self.permission_classes = [
-                ProjectMemberPermission,
-            ]
-
-        return super(ProjectMemberViewSet, self).get_permissions()
-
     search_fields = [
         "member__display_name",
         "member__first_name",
@@ -677,25 +665,6 @@ class ProjectMemberViewSet(BaseViewSet):
                 )
             )
 
-            # Check if the user is already a member of the project and is inactive
-            if ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member_id=member.get("member_id"),
-                is_active=False,
-            ).exists():
-                member_detail = ProjectMember.objects.get(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    member_id=member.get("member_id"),
-                    is_active=False,
-                )
-                # Check if the user has not deactivated the account
-                user = User.objects.filter(pk=member.get("member_id")).first()
-                if user.is_active:
-                    member_detail.is_active = True
-                    member_detail.save(update_fields=["is_active"])
-
         project_members = ProjectMember.objects.bulk_create(
             bulk_project_members,
             batch_size=10,
@@ -711,7 +680,13 @@ class ProjectMemberViewSet(BaseViewSet):
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def list(self, request, slug, project_id):
-        # Get the list of project members for the project
+        project_member = ProjectMember.objects.get(
+            member=request.user,
+            workspace__slug=slug,
+            project_id=project_id,
+            is_active=True,
+        )
+
         project_members = ProjectMember.objects.filter(
             project_id=project_id,
             workspace__slug=slug,
@@ -719,7 +694,10 @@ class ProjectMemberViewSet(BaseViewSet):
             is_active=True,
         ).select_related("project", "member", "workspace")
 
-        serializer = ProjectMemberRoleSerializer(project_members, fields=("id", "member", "role"), many=True)
+        if project_member.role > 10:
+            serializer = ProjectMemberAdminSerializer(project_members, many=True)
+        else:
+            serializer = ProjectMemberSerializer(project_members, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, project_id, pk):
@@ -1071,20 +1049,3 @@ class ProjectDeployBoardViewSet(BaseViewSet):
 
         serializer = ProjectDeployBoardSerializer(project_deploy_board)
         return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class UserProjectRolesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceUserPermission,
-    ]
-
-    def get(self, request, slug):
-        project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=request.user.id,
-        ).values("project_id", "role")
-
-        project_members = {
-            str(member["project_id"]): member["role"] for member in project_members
-        }
-        return Response(project_members, status=status.HTTP_200_OK)

apiserver/plane/app/views/search.py

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

apiserver/plane/app/views/user.py

@@ -49,10 +49,6 @@ class UserEndpoint(BaseViewSet):
         # Check all workspace user is active
         user = self.get_object()
 
-        # Instance admin check
-        if InstanceAdmin.objects.filter(user=user).exists():
-            return Response({"error": "You cannot deactivate your account since you are an instance admin"}, status=status.HTTP_400_BAD_REQUEST)
-
         projects_to_deactivate = []
         workspaces_to_deactivate = []
 

apiserver/plane/app/views/view.py

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

apiserver/plane/app/views/workspace.py

@@ -44,8 +44,6 @@ from plane.app.serializers import (
     IssueLiteSerializer,
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
-    ProjectMemberRoleSerializer,
-    WorkspaceUserPropertiesSerializer,
 )
 from plane.app.views.base import BaseAPIView
 from . import BaseViewSet
@@ -66,21 +64,17 @@ from plane.db.models import (
     WorkspaceMember,
     CycleIssue,
     IssueReaction,
-    WorkspaceUserProperties
 )
 from plane.app.permissions import (
     WorkSpaceBasePermission,
     WorkSpaceAdminPermission,
     WorkspaceEntityPermission,
     WorkspaceViewerPermission,
-    WorkspaceUserPermission,
-    ProjectLitePermission,
 )
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.event_tracking_task import workspace_invite_event
 
-
 class WorkSpaceViewSet(BaseViewSet):
     model = Workspace
     serializer_class = WorkSpaceSerializer
@@ -178,7 +172,6 @@ class UserWorkSpacesEndpoint(BaseAPIView):
     ]
 
     def get(self, request):
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
         member_count = (
             WorkspaceMember.objects.filter(
                 workspace=OuterRef("id"),
@@ -214,12 +207,9 @@ class UserWorkSpacesEndpoint(BaseAPIView):
             )
             .distinct()
         )
-        workspaces = WorkSpaceSerializer(
-            self.filter_queryset(workspace),
-            fields=fields if fields else None,
-            many=True,
-        ).data
-        return Response(workspaces, status=status.HTTP_200_OK)
+
+        serializer = WorkSpaceSerializer(self.filter_queryset(workspace), many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 class WorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
@@ -416,16 +406,17 @@ class WorkspaceJoinEndpoint(BaseAPIView):
 
                     # Delete the invitation
                     workspace_invite.delete()
-
+                
                 # Send event
-                workspace_invite_event.delay(
-                    user=user.id if user is not None else None,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="MEMBER_ACCEPTED",
-                    accepted_from="EMAIL",
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    workspace_invite_event.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="MEMBER_ACCEPTED",
+                        accepted_from="EMAIL",
+                    )
 
                 return Response(
                     {"message": "Workspace Invitation Accepted"},
@@ -505,18 +496,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         WorkspaceEntityPermission,
     ]
 
-    def get_permissions(self):
-        if self.action == "leave":
-            self.permission_classes = [
-                WorkspaceUserPermission,
-            ]
-        else:
-            self.permission_classes = [
-                WorkspaceEntityPermission,
-            ]
-
-        return super(WorkSpaceMemberViewSet, self).get_permissions()
-
     search_fields = [
         "member__display_name",
         "member__first_name",
@@ -546,15 +525,10 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         workspace_members = self.get_queryset()
 
         if workspace_member.role > 10:
-            serializer = WorkspaceMemberAdminSerializer(
-                workspace_members,
-                fields=("id", "member", "role"),
-                many=True,
-            )
+            serializer = WorkspaceMemberAdminSerializer(workspace_members, many=True)
         else:
             serializer = WorkSpaceMemberSerializer(
                 workspace_members,
-                fields=("id", "member", "role"),
                 many=True,
             )
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -719,43 +693,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class WorkspaceProjectMemberEndpoint(BaseAPIView):
-    serializer_class = ProjectMemberRoleSerializer
-    model = ProjectMember
-
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug):
-        # Fetch all project IDs where the user is involved
-        project_ids = ProjectMember.objects.filter(
-            member=request.user,
-            member__is_bot=False,
-            is_active=True,
-        ).values_list('project_id', flat=True).distinct()
-
-        # Get all the project members in which the user is involved
-        project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member__is_bot=False,
-            project_id__in=project_ids,
-            is_active=True,
-        ).select_related("project", "member", "workspace")
-        project_members = ProjectMemberRoleSerializer(project_members, many=True).data
-
-        project_members_dict = dict()
-
-        # Construct a dictionary with project_id as key and project_members as value
-        for project_member in project_members:
-            project_id = project_member.pop("project")
-            if str(project_id) not in project_members_dict:
-                project_members_dict[str(project_id)] = []
-            project_members_dict[str(project_id)].append(project_member)
-
-        return Response(project_members_dict, status=status.HTTP_200_OK)
-
-
 class TeamMemberViewSet(BaseViewSet):
     serializer_class = TeamSerializer
     model = Team
@@ -1385,7 +1322,8 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
         issues = IssueLiteSerializer(
             issue_queryset, many=True, fields=fields if fields else None
         ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)
 
 
 class WorkspaceLabelsEndpoint(BaseAPIView):
@@ -1399,30 +1337,3 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
             project__project_projectmember__member=request.user,
         ).values("parent", "name", "color", "id", "project_id", "workspace__slug")
         return Response(labels, status=status.HTTP_200_OK)
-
-
-class WorkspaceUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceViewerPermission,
-    ]
-
-    def patch(self, request, slug):
-        workspace_properties = WorkspaceUserProperties.objects.get(
-            user=request.user,
-            workspace__slug=slug,
-        )
-        
-        workspace_properties.filters = request.data.get("filters", workspace_properties.filters)
-        workspace_properties.display_filters = request.data.get("display_filters", workspace_properties.display_filters)
-        workspace_properties.display_properties = request.data.get("display_properties", workspace_properties.display_properties)
-        workspace_properties.save()
-
-        serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug):
-        workspace_properties, _ = WorkspaceUserProperties.objects.get_or_create(
-            user=request.user, workspace__slug=slug
-        )
-        serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -18,6 +18,7 @@ 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, Instance
 from plane.license.utils.instance_value import get_email_configuration
 
 row_mapping = {
@@ -51,6 +52,11 @@ def send_export_email(email, slug, csv_buffer, rows):
 
     csv_buffer.seek(0)
 
+    # Configure email connection from the database
+    instance_configuration = InstanceConfiguration.objects.filter(
+        key__startswith="EMAIL_"
+    ).values("key", "value")
+
     (
         EMAIL_HOST,
         EMAIL_HOST_USER,
@@ -58,14 +64,14 @@ def send_export_email(email, slug, csv_buffer, rows):
         EMAIL_PORT,
         EMAIL_USE_TLS,
         EMAIL_FROM,
-    ) = get_email_configuration()
+    ) = get_email_configuration(instance_configuration=instance_configuration)
 
     connection = get_connection(
         host=EMAIL_HOST,
         port=int(EMAIL_PORT),
         username=EMAIL_HOST_USER,
         password=EMAIL_HOST_PASSWORD,
-        use_tls=EMAIL_USE_TLS == "1",
+        use_tls=bool(EMAIL_USE_TLS),
     )
 
     msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/event_tracking_task.py

@@ -1,78 +1,50 @@
 import uuid
-import os
 
-# third party imports
+from posthog import Posthog
+from django.conf import settings
+
+#third party imports
 from celery import shared_task
 from sentry_sdk import capture_exception
-from posthog import Posthog
-
-# module imports
-from plane.license.utils.instance_value import get_configuration_value
-
-
-def posthogConfiguration():
-    POSTHOG_API_KEY, POSTHOG_HOST = get_configuration_value(
-        [
-            {
-                "key": "POSTHOG_API_KEY",
-                "default": os.environ.get("POSTHOG_API_KEY", None),
-            },
-            {
-                "key": "POSTHOG_HOST",
-                "default": os.environ.get("POSTHOG_HOST", None),
-            },
-        ]
-    )
-    if POSTHOG_API_KEY and POSTHOG_HOST:
-        return POSTHOG_API_KEY, POSTHOG_HOST
-    else:
-        return None, None
 
 
 @shared_task
 def auth_events(user, email, user_agent, ip, event_name, medium, first_time):
     try:
-        POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()
-
-        if POSTHOG_API_KEY and POSTHOG_HOST:
-            posthog = Posthog(POSTHOG_API_KEY, host=POSTHOG_HOST)
-            posthog.capture(
-                email,
-                event=event_name,
-                properties={
-                        "event_id": uuid.uuid4().hex,
-                        "user": {"email": email, "id": str(user)},
-                        "device_ctx": {
-                            "ip": ip,
-                            "user_agent": user_agent,
-                        },
-                        "medium": medium,
-                        "first_time": first_time
-                }
-            )
+        posthog = Posthog(settings.POSTHOG_API_KEY, host=settings.POSTHOG_HOST)
+        posthog.capture(
+            email,
+            event=event_name,
+            properties={
+                    "event_id": uuid.uuid4().hex,
+                    "user": {"email": email, "id": str(user)},
+                    "device_ctx": {
+                        "ip": ip,
+                        "user_agent": user_agent,
+                    },
+                    "medium": medium,
+                    "first_time": first_time
+            }
+        )
     except Exception as e:
         capture_exception(e)
  
-
 @shared_task
 def workspace_invite_event(user, email, user_agent, ip, event_name, accepted_from):
     try:
-        POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()
-
-        if POSTHOG_API_KEY and POSTHOG_HOST:
-            posthog = Posthog(POSTHOG_API_KEY, host=POSTHOG_HOST)
-            posthog.capture(
-                email,
-                event=event_name,
-                properties={
-                        "event_id": uuid.uuid4().hex,
-                        "user": {"email": email, "id": str(user)},
-                        "device_ctx": {
-                            "ip": ip,
-                            "user_agent": user_agent,
-                        },
-                        "accepted_from": accepted_from
-                }
-            )
+        posthog = Posthog(settings.POSTHOG_API_KEY, host=settings.POSTHOG_HOST)
+        posthog.capture(
+            email,
+            event=event_name,
+            properties={
+                    "event_id": uuid.uuid4().hex,
+                    "user": {"email": email, "id": str(user)},
+                    "device_ctx": {
+                        "ip": ip,
+                        "user_agent": user_agent,
+                    },
+                    "accepted_from": accepted_from
+            }
+        )
     except Exception as e:
         capture_exception(e)

apiserver/plane/bgtasks/forgot_password_task.py

@@ -14,6 +14,7 @@ from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration
 
 
@@ -25,6 +26,10 @@ def forgot_password(first_name, email, uidb64, token, current_site):
         )
         abs_url = str(current_site) + relative_link
 
+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
+
         (
             EMAIL_HOST,
             EMAIL_HOST_USER,
@@ -32,7 +37,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             EMAIL_PORT,
             EMAIL_USE_TLS,
             EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)
 
         subject = "A new password to your Plane account has been requested"
 
@@ -46,12 +51,15 @@ def forgot_password(first_name, email, uidb64, token, current_site):
 
         text_content = strip_tags(html_content)
 
+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
         connection = get_connection(
             host=EMAIL_HOST,
             port=int(EMAIL_PORT),
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/issue_activites_task.py

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

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -14,12 +14,17 @@ from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
+from plane.license.models import InstanceConfiguration, Instance
 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")
+
         (
             EMAIL_HOST,
             EMAIL_HOST_USER,
@@ -27,7 +32,7 @@ def magic_link(email, key, token, current_site):
             EMAIL_PORT,
             EMAIL_USE_TLS,
             EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)
 
         # Send the mail
         subject = f"Your unique Plane login code is {token}"
@@ -41,7 +46,7 @@ def magic_link(email, key, token, current_site):
             port=int(EMAIL_PORT),
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/notification_task.py

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

apiserver/plane/bgtasks/project_invitation_task.py

@@ -13,6 +13,7 @@ from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import Project, User, ProjectMemberInvite
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_email_configuration
 
 @shared_task
@@ -46,6 +47,7 @@ def project_invitation(email, project_id, token, current_site, invitor):
         project_member_invite.save()
 
         # Configure email connection from the database
+        instance_configuration = InstanceConfiguration.objects.filter(key__startswith='EMAIL_').values("key", "value")
         (
             EMAIL_HOST,
             EMAIL_HOST_USER,
@@ -53,14 +55,14 @@ def project_invitation(email, project_id, token, current_site, invitor):
             EMAIL_PORT,
             EMAIL_USE_TLS,
             EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)
 
         connection = get_connection(
             host=EMAIL_HOST,
             port=int(EMAIL_PORT),
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -17,6 +17,7 @@ from slack_sdk.errors import SlackApiError
 
 # Module imports
 from plane.db.models import Workspace, WorkspaceMemberInvite, User
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration
 
 
@@ -36,6 +37,9 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
         # The complete url including the domain
         abs_url = str(current_site) + relative_link
 
+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
 
         (
             EMAIL_HOST,
@@ -44,7 +48,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
             EMAIL_PORT,
             EMAIL_USE_TLS,
             EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)
 
         # Subject of the email
         subject = f"{user.first_name or user.display_name or user.email} has invited you to join them in {workspace.name} on Plane"
@@ -65,12 +69,15 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
         workspace_member_invite.message = text_content
         workspace_member_invite.save()
 
+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
         connection = get_connection(
             host=EMAIL_HOST,
             port=int(EMAIL_PORT),
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/celery.py

@@ -28,6 +28,10 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.file_asset_task.delete_file_asset",
         "schedule": crontab(hour=0, minute=0),
     },
+    "check-instance-verification": {
+        "task": "plane.license.bgtasks.instance_verification_task.instance_verification_task",
+        "schedule": crontab(minute=0, hour='*/4'),
+    },
 }
 
 # Load task modules from all registered Django app configs.

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

@@ -1,83 +0,0 @@
-# Generated by Django 4.2.7 on 2023-12-29 10:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0050_user_use_case_alter_workspace_organization_size'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='cycle',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='inboxissue',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='inboxissue',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issuecomment',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issuecomment',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='label',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='label',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='state',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='state',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

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

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

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

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

apiserver/plane/db/models/__init__.py

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

apiserver/plane/db/models/cycle.py

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

apiserver/plane/db/models/inbox.py

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

apiserver/plane/db/models/issue.py

@@ -33,48 +33,6 @@ def get_default_properties():
     }
 
 
-def get_default_filters():
-    return {
-        "priority": None,
-        "state": None,
-        "state_group": None,
-        "assignees": None,
-        "created_by": None,
-        "labels": None,
-        "start_date": None,
-        "target_date": None,
-        "subscriber": None,
-    }
-
-def get_default_display_filters():
-    return {
-        "group_by": None,
-        "order_by": "-created_at",
-        "type": None,
-        "sub_issue": True,
-        "show_empty_groups": True,
-        "layout": "list",
-        "calendar_date_range": "",
-    }
-
-def get_default_display_properties():
-    return {
-        "assignee": True,
-        "attachment_count": True,
-        "created_on": True,
-        "due_date": True,
-        "estimate": True,
-        "key": True,
-        "labels": True,
-        "link": True,
-        "priority": True,
-        "start_date": True,
-        "state": True,
-        "sub_issue_count": True,
-        "updated_on": True,
-    }
-
-
 # TODO: Handle identifiers for Bulk Inserts - nk
 class IssueManager(models.Manager):
     def get_queryset(self):
@@ -144,8 +102,6 @@ class Issue(ProjectBaseModel):
     completed_at = models.DateTimeField(null=True)
     archived_at = models.DateField(null=True)
     is_draft = models.BooleanField(default=False)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     objects = models.Manager()
     issue_objects = IssueManager()
@@ -410,8 +366,6 @@ class IssueComment(ProjectBaseModel):
         default="INTERNAL",
         max_length=100,
     )
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     def save(self, *args, **kwargs):
         self.comment_stripped = (
@@ -436,9 +390,7 @@ class IssueProperty(ProjectBaseModel):
         on_delete=models.CASCADE,
         related_name="issue_property_user",
     )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
+    properties = models.JSONField(default=get_default_properties)
 
     class Meta:
         verbose_name = "Issue Property"
@@ -464,8 +416,6 @@ class Label(ProjectBaseModel):
     description = models.TextField(blank=True)
     color = models.CharField(max_length=255, blank=True)
     sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
         unique_together = ["name", "project"]

apiserver/plane/db/models/module.py

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

apiserver/plane/db/models/state.py

@@ -24,8 +24,6 @@ class State(ProjectBaseModel):
         max_length=20,
     )
     default = models.BooleanField(default=False)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     def __str__(self):
         """Return name of the state"""

apiserver/plane/db/models/view.py

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

apiserver/plane/db/models/workspace.py

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

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

@@ -30,7 +30,7 @@ from plane.license.api.serializers import (
 from plane.license.api.permissions import (
     InstanceAdminPermission,
 )
-from plane.db.models import User, WorkspaceMember, ProjectMember
+from plane.db.models import User
 from plane.license.utils.encryption import encrypt_data
 
 

apiserver/plane/license/bgtasks/instance_verification_task.py

@@ -0,0 +1,136 @@
+# Python imports
+import os
+import json
+import requests
+
+# Django imports
+from django.conf import settings
+
+# Third party imports
+from celery import shared_task
+
+# Module imports
+from plane.db.models import User
+from plane.license.models import Instance, InstanceAdmin
+
+
+def instance_verification(instance):
+    with open("package.json", "r") as file:
+        # Load JSON content from the file
+        data = json.load(file)
+
+    headers = {"Content-Type": "application/json"}
+    payload = {
+        "instance_key": settings.INSTANCE_KEY,
+        "version": data.get("version", 0.1),
+        "machine_signature": os.environ.get("MACHINE_SIGNATURE", "machine-signature"),
+        "user_count": User.objects.filter(is_bot=False).count(),
+    }
+    # Register the instance
+    response = requests.post(
+        f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+        headers=headers,
+        data=json.dumps(payload),
+        timeout=30,
+    )
+
+    # check response status
+    if response.status_code == 201:
+        data = response.json()
+        # Update instance
+        instance.instance_id = data.get("id")
+        instance.license_key = data.get("license_key")
+        instance.api_key = data.get("api_key")
+        instance.version = data.get("version")
+        instance.user_count = data.get("user_count", 0)
+        instance.is_verified = True
+        instance.save()
+    else:
+        return
+
+
+def admin_verification(instance):
+    # Save the user in control center
+    headers = {
+        "Content-Type": "application/json",
+        "x-instance-id": instance.instance_id,
+        "x-api-key": instance.api_key,
+    }
+
+    # Get all the unverified instance admins
+    instance_admins = InstanceAdmin.objects.filter(is_verified=False).select_related(
+        "user"
+    )
+    updated_instance_admin = []
+
+    # Verify the instance admin
+    for instance_admin in instance_admins:
+        instance_admin.is_verified = True
+        # Create the admin
+        response = requests.post(
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/register/",
+            headers=headers,
+            data=json.dumps(
+                {
+                    "email": str(instance_admin.user.email),
+                    "signup_mode": "EMAIL",
+                    "is_admin": True,
+                }
+            ),
+            timeout=30,
+        )
+        updated_instance_admin.append(instance_admin)
+
+    # update all the instance admins
+    InstanceAdmin.objects.bulk_update(
+        updated_instance_admin, ["is_verified"], batch_size=10
+    )
+    return
+
+def instance_user_count(instance):
+    try:
+        instance_users = User.objects.filter(is_bot=False).count()
+
+        # Update the count in the license engine
+        payload = {
+            "user_count": instance_users,
+        }
+
+        # Save the user in control center
+        headers = {
+            "Content-Type": "application/json",
+            "x-instance-id": instance.instance_id,
+            "x-api-key": instance.api_key,
+        }
+
+        # Update the license engine
+        _ = requests.post(
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+            headers=headers,
+            data=json.dumps(payload),
+            timeout=30,
+        )
+        return
+    except requests.RequestException:
+        return
+
+
+@shared_task
+def instance_verification_task():
+    try:
+        # Get the first instance
+        instance = Instance.objects.first()
+
+        # Only register instance if it is not verified
+        if not instance.is_verified:
+            instance_verification(instance=instance)
+
+        # Admin verifications
+        admin_verification(instance=instance)
+
+        # Update user count
+        instance_user_count(instance=instance)
+
+        return
+    except requests.RequestException:
+        return

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

@@ -30,11 +30,13 @@ class Command(BaseCommand):
                 # Load JSON content from the file
                 data = json.load(file)
 
-            machine_signature = options.get("machine_signature", "machine-signature")
+            machine_signature = options.get("machine_signature", False)
 
             if not machine_signature:
                 raise CommandError("Machine signature is required")
 
+            # Check if machine is online
+            headers = {"Content-Type": "application/json"}
             payload = {
                 "instance_key": settings.INSTANCE_KEY,
                 "version": data.get("version", 0.1),
@@ -42,21 +44,51 @@ class Command(BaseCommand):
                 "user_count": User.objects.filter(is_bot=False).count(),
             }
 
-            instance = Instance.objects.create(
-                instance_name="Plane Free",
-                instance_id=secrets.token_hex(12),
-                license_key=None,
-                api_key=secrets.token_hex(8),
-                version=payload.get("version"),
-                last_checked_at=timezone.now(),
-                user_count=payload.get("user_count", 0),
-            )
-
-            self.stdout.write(
-                self.style.SUCCESS(
-                    f"Instance registered"
+            try:
+                response = requests.post(
+                    f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+                    headers=headers,
+                    data=json.dumps(payload),
+                    timeout=30
                 )
-            )        
+
+                if response.status_code == 201:
+                    data = response.json()
+                    # Create instance
+                    instance = Instance.objects.create(
+                        instance_name="Plane Free",
+                        instance_id=data.get("id"),
+                        license_key=data.get("license_key"),
+                        api_key=data.get("api_key"),
+                        version=data.get("version"),
+                        last_checked_at=timezone.now(),
+                        user_count=data.get("user_count", 0),
+                        is_verified=True,
+                    )
+
+                    self.stdout.write(
+                        self.style.SUCCESS(
+                            f"Instance successfully registered and verified"
+                        )
+                    )
+                    return
+            except requests.RequestException as _e:
+                instance = Instance.objects.create(
+                    instance_name="Plane Free",
+                    instance_id=secrets.token_hex(12),
+                    license_key=None,
+                    api_key=secrets.token_hex(8),
+                    version=payload.get("version"),
+                    last_checked_at=timezone.now(),
+                    user_count=payload.get("user_count", 0),
+                )
+                self.stdout.write(
+                    self.style.SUCCESS(
+                        f"Instance successfully registered"
+                    )
+                )
+                return
+            raise CommandError("Instance could not be registered")
         else:
             self.stdout.write(
                 self.style.SUCCESS(

apiserver/plane/license/utils/encryption.py

@@ -9,20 +9,14 @@ def derive_key(secret_key):
     dk = hashlib.pbkdf2_hmac('sha256', secret_key.encode(), b'salt', 100000)
     return base64.urlsafe_b64encode(dk)
 
-# Encrypt data
-def encrypt_data(data):
-    if data:
-        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-        encrypted_data = cipher_suite.encrypt(data.encode())
-        return encrypted_data.decode()  # Convert bytes to string
-    else:
-        return ""
 
-# Decrypt data 
+def encrypt_data(data):
+    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+    encrypted_data = cipher_suite.encrypt(data.encode())
+    return encrypted_data.decode()  # Convert bytes to string
+
+
 def decrypt_data(encrypted_data):
-    if encrypted_data:
-        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-        decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
-        return decrypted_data.decode()
-    else:
-        return ""
+    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+    decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
+    return decrypted_data.decode()

apiserver/plane/license/utils/instance_value.py

@@ -1,71 +1,63 @@
-# Python imports
 import os
 
-# Django imports
-from django.conf import settings
-
-# Module imports
-from plane.license.models import InstanceConfiguration
-from plane.license.utils.encryption import decrypt_data
-
 
 # Helper function to return value from the passed key
-def get_configuration_value(keys):
-    environment_list = []
-    if settings.SKIP_ENV_VAR:
-        # Get the configurations
-        instance_configuration = InstanceConfiguration.objects.values(
-            "key", "value", "is_encrypted"
-        )
-
-        for key in keys:
-            for item in instance_configuration:
-                if key.get("key") == item.get("key"):
-                    if item.get("is_encrypted", False):
-                        environment_list.append(decrypt_data(item.get("value")))
-                    else:
-                        environment_list.append(item.get("value"))
-
-                    break
-            else:
-                environment_list.append(key.get("default"))
-    else:
-        # Get the configuration from os
-        for key in keys:
-            environment_list.append(os.environ.get(key.get("key"), key.get("default")))
-
-    return tuple(environment_list)
+def get_configuration_value(query, key, default=None):
+    for item in query:
+        if item["key"] == key:
+            return item.get("value", default)
+    return default
 
 
-def get_email_configuration():
-    return (
-        get_configuration_value(
-            [
-                {
-                    "key": "EMAIL_HOST",
-                    "default": os.environ.get("EMAIL_HOST"),
-                },
-                {
-                    "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER"),
-                },
-                {
-                    "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD"),
-                },
-                {
-                    "key": "EMAIL_PORT",
-                    "default": os.environ.get("EMAIL_PORT", 587),
-                },
-                {
-                    "key": "EMAIL_USE_TLS",
-                    "default": os.environ.get("EMAIL_USE_TLS", "1"),
-                },
-                {
-                    "key": "EMAIL_FROM",
-                    "default": os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>"),
-                },
-            ]
-        )
+def get_email_configuration(instance_configuration):
+    # Get the configuration variables
+    EMAIL_HOST_USER = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST_USER",
+        os.environ.get("EMAIL_HOST_USER", None),
     )
 
+    EMAIL_HOST_PASSWORD = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST_PASSWORD",
+        os.environ.get("EMAIL_HOST_PASSWORD", None),
+    )
+
+    EMAIL_HOST = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST",
+        os.environ.get("EMAIL_HOST", None),
+    )
+
+    EMAIL_FROM = get_configuration_value(
+        instance_configuration,
+        "EMAIL_FROM",
+        os.environ.get("EMAIL_FROM", None),
+    )
+
+    EMAIL_USE_TLS = get_configuration_value(
+        instance_configuration,
+        "EMAIL_USE_TLS",
+        os.environ.get("EMAIL_USE_TLS", "1"),
+    )
+
+    EMAIL_PORT = get_configuration_value(
+        instance_configuration,
+        "EMAIL_PORT",
+        587,
+    )
+
+    EMAIL_FROM = get_configuration_value(
+        instance_configuration,
+        "EMAIL_FROM",
+        os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>"),
+    )
+
+    return (
+        EMAIL_HOST,
+        EMAIL_HOST_USER,
+        EMAIL_HOST_PASSWORD,
+        EMAIL_PORT,
+        EMAIL_USE_TLS,
+        EMAIL_FROM,
+    )

apiserver/plane/settings/common.py

@@ -287,13 +287,12 @@ CELERY_IMPORTS = (
     "plane.bgtasks.issue_automation_task",
     "plane.bgtasks.exporter_expired_task",
     "plane.bgtasks.file_asset_task",
+    "plane.license.bgtasks.instance_verification_task",
 )
 
 # Sentry Settings
 # Enable Sentry Settings
-if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get(
-    "SENTRY_DSN"
-).startswith("https://"):
+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=[
@@ -329,12 +328,12 @@ USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
 POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
 POSTHOG_HOST = os.environ.get("POSTHOG_HOST", False)
 
+# 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"
 )
-
-# Skip environment variable configuration
-SKIP_ENV_VAR = os.environ.get("SKIP_ENV_VAR", "1") == "1"
-
-DATA_UPLOAD_MAX_MEMORY_SIZE = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))

apiserver/plane/urls.py

@@ -19,11 +19,8 @@ urlpatterns = [
 
 
 if settings.DEBUG:
-    try:
-        import debug_toolbar
+    import debug_toolbar
 
-        urlpatterns = [
-            re_path(r"^__debug__/", include(debug_toolbar.urls)),
-        ] + urlpatterns
-    except ImportError:
-        pass
+    urlpatterns = [
+        re_path(r"^__debug__/", include(debug_toolbar.urls)),
+    ] + urlpatterns

deploy/coolify/README.md

@@ -1,8 +1,8 @@
-## Coolify Setup
+## Coolify Setup 
 
 Access the `coolify-docker-compose` file [here](https://raw.githubusercontent.com/makeplane/plane/master/deploy/coolify/coolify-docker-compose.yml) or download using using below command
 
 ```
 curl -fsSL https://raw.githubusercontent.com/makeplane/plane/master/deploy/coolify/coolify-docker-compose.yml
 
-```
+```

deploy/coolify/coolify-docker-compose.yml

@@ -7,6 +7,7 @@ services:
     restart: always
     command: /usr/local/bin/start.sh web/server.js web
     environment:
+      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
       - NEXT_PUBLIC_DEPLOY_URL=$SERVICE_FQDN_SPACE_8082
     depends_on:
       - api
@@ -20,6 +21,7 @@ services:
     command: /usr/local/bin/start.sh space/server.js space
     environment:
       - SERVICE_FQDN_SPACE_8082=/api
+      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
     depends_on:
       - api
       - worker

deploy/kubernetes/README.md

@@ -1,5 +1,8 @@
+
 # Helm Chart
 
-Click on the below link to access the helm chart instructions.
+Click on the below link to access the helm chart instructions. 
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/makeplane)](https://artifacthub.io/packages/search?repo=makeplane)
+
+

deploy/selfhost/README.md

@@ -1,20 +1,18 @@
-# Self Hosting
+# Self Hosting 
 
-In this guide, we will walk you through the process of setting up a self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization.
+In this guide, we will walk you through the process of setting up a self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization. 
 
-We will cover two main options for setting up your self-hosted environment: using a cloud server or using your desktop. For the cloud server, we will use an AWS EC2 instance. For the desktop, we will use Docker to create a local environment.
+We will cover two main options for setting up your self-hosted environment: using a cloud server or using your desktop. For the cloud server, we will use an AWS EC2 instance. For the desktop, we will use Docker to create a local environment. 
 
 Let's get started!
 
-## Setting up Docker Environment
-
+## Setting up Docker Environment 
 <details>
   <summary>Option 1 - Using Cloud Server</summary>
   <p>Best way to start is to create EC2 maching on AWS. It must of minimum t3.medium/t3a/medium</p>
   <p>Run the below command to install docker engine.</p>
 
-`curl -fsSL https://get.docker.com -o install-docker.sh`
-
+   ```curl -fsSL https://get.docker.com -o install-docker.sh```
 </details>
 
 ---
@@ -22,34 +20,30 @@ Let's get started!
 <details>
   <summary>Option 2 - Using Desktop</summary>
 
-#### For Mac
-
+  #### For Mac
   <ol>
     <li> Download Docker Desktop for Mac from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-mac/" target="_blank">Docker Hub</a>. </li>
     <li> Double-click the downloaded `.dmg` file and drag the Docker app icon to the Applications folder. </li>
     <li>Open Docker Desktop from the Applications folder. You might be asked to provide your system password to install additional software.</li>
   </ol>
 
-#### For Windows:
-
+  #### For Windows:
   <ol>
     <li>Download Docker Desktop for Windows from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-windows/" target="_blank">Docker Hub</a>.</li>
     <li>Run the installer and follow the instructions. You might be asked to enable Hyper-V and "Containers" Windows features.</li>
     <li>Open Docker Desktop. You might be asked to log out and log back in, or restart your machine, for changes to take effect.</li>
   </ol>
 
-After installation, you can verify the installation by opening a terminal (Command Prompt on Windows, Terminal app on Mac) and running the command `docker --version`. This should display the installed version of Docker.
-
+  After installation, you can verify the installation by opening a terminal (Command Prompt on Windows, Terminal app on Mac) and running the command `docker --version`. This should display the installed version of Docker.
 </details>
 
 ---
 
 ## Installing Plane
 
-Installing plane is a very easy and minimal step process.
-
-### Prerequisite
+Installing plane is a very easy and minimal step process. 
 
+### Prerequisite 
 - Docker installed and running
 - OS with bash scripting enabled (Ubuntu, Linux AMI, macos). Windows systems need to have [gitbash](https://git-scm.com/download/win)
 - User context used must have access to docker services. In most cases, use sudo su to switch as root user
@@ -88,11 +82,11 @@ chmod +x setup.sh
 
 ### Proceed with setup
 
-Above steps will set you ready to install and start plane services.
+Above steps will set you ready to install and start plane services. 
 
-Lets get started by running the `./setup.sh` command.
+Lets get started by running the `./setup.sh` command. 
 
-This will prompt you with the below options.
+This will prompt you with the below options. 
 
 ```
 Select a Action you want to perform:
@@ -106,27 +100,26 @@ Select a Action you want to perform:
 Action [2]: 1
 ```
 
-For the 1st time setup, type "1" as action input.
+For the 1st time setup, type "1" as action input. 
 
 This will create a create a folder `plane-app` or `plane-app-preview` (in case of preview deployment) and will download 2 files inside that
-
 - `docker-compose.yaml`
 - `.env`
 
-Again the `options [1-6]` will be popped up and this time hit `6` to exit.
+Again the `options [1-6]` will be popped up and this time hit `6` to exit. 
 
 ---
 
 ### Continue with setup - Environment Settings
 
-Before proceeding, we suggest used to review `.env` file and set the values.
-Below are the most import keys you must refer to. _<span style="color: #fcba03">You can use any text editor to edit this file</span>_.
+Before proceeding, we suggest used to review `.env` file and set the values. 
+Below are the most import keys you must refer to. *<span style="color: #fcba03">You can use any text editor to edit this file</span>*.
 
 > `NGINX_PORT` - This is default set to `80`. Make sure the port you choose to use is not preoccupied. (e.g `NGINX_PORT=8080`)
 
-> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`) 
 
-> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080`  or `http://[IP-ADDRESS]:8080`)
 
 There are many other settings you can play with, but we suggest you configure `EMAIL SETTINGS` as it will enable you to invite your teammates onto the platform.
 
@@ -155,15 +148,15 @@ Be patient as it might take sometime based on download speed and system configur
 
 ![Downloading completed](images/started.png)
 
-This is the confirmation that all images were downloaded and the services are up & running.
+This is the confirmation that all images were downloaded and the services are up & running. 
 
-You have successfully self hosted `Plane` instance. Access the application by going to IP or domain you have configured it (e.g `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+You have successfully self hosted `Plane` instance. Access the application by going to IP or domain you have configured it (e.g `https://plane.example.com:8080`  or `http://[IP-ADDRESS]:8080`)
 
 ---
 
 ### Stopping the Server
 
-In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that.
+In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that. 
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `3` to stop the sevices
 
@@ -187,7 +180,7 @@ If all goes well, you must see something like this
 
 ### Restarting the Server
 
-In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option.
+In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option. 
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `4` to restart the sevices
 
@@ -213,7 +206,7 @@ If all goes well, you must see something like this
 
 It is always advised to keep Plane up to date with the latest release.
 
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release.
+Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release. 
 
 ```
 Select a Action you want to perform:
@@ -227,7 +220,7 @@ Select a Action you want to perform:
 Action [2]: 5
 ```
 
-By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `variables-upgrade.env`. Here system will not replace `.env` with the new one.
+By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `variables-upgrade.env`. Here system will not replace `.env` with the new one. 
 
 You must expect the below message
 
@@ -235,17 +228,18 @@ You must expect the below message
 
 Once done, choose `6` to exit from prompt.
 
-> It is very important for you to compare the 2 files `variables-upgrade.env` and `.env`. Copy the newly added variable from downloaded file to `.env` and set the expected values.
+> It is very important for you to compare the 2 files `variables-upgrade.env` and `.env`. Copy the newly added variable from downloaded file to `.env` and set the expected values.   
 
 Once done with making changes in `.env` file, jump on to `Start Server`
 
+
 ## Upgrading from v0.13.2 to v0.14.x
 
 This is one time activity for users who are upgrading from v0.13.2 to v0.14.0
 
 As there has been significant changes to Self Hosting process, this step mainly covers the data migration from current (v0.13.2) docker volumes from newly created volumes
 
-> Before we begin with migration, make sure your v0.14.0 was started and then stopped. This is required to know the newly created docker volume names.
+> Before we begin with migration, make sure your v0.14.0 was started and then stopped. This is required to know the newly created docker volume names. 
 
 Begin with downloading the migration script using below command
 
@@ -262,15 +256,15 @@ Now run the `./migrate.sh` command and expect the instructions as below
 ```
 ******************************************************************
 
-This script is solely for the migration purpose only.
+This script is solely for the migration purpose only. 
 This is a 1 time migration of volume data from v0.13.2 => v0.14.x
 
-Assumption:
+Assumption: 
 1. Postgres data volume name ends with _pgdata
 2. Minio data volume name ends with _uploads
 3. Redis data volume name ends with _redisdata
 
-Any changes to this script can break the migration.
+Any changes to this script can break the migration. 
 
 Before you proceed, make sure you run the below command
 to know the docker volumes
@@ -281,12 +275,12 @@ docker volume ls -q | grep -i "_redisdata"
 
 *******************************************************
 
-Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata"
+Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata" 
 ---------------------
 plane-app_redisdata
 v0132_redisdata
 
-Provide the Source Volume Prefix :
+Provide the Source Volume Prefix : 
 ```
 
 **Open another terminal window**, and run the mentioned 3 command. This may be different for users who have changed the volume names in their previous setup (v0.13.2)
@@ -295,9 +289,9 @@ For every command you must see 2 records something like shown in above example o
 
 To move forward, you would need PREFIX of old setup and new setup. As per above example, `v0132` is the prefix of v0.13.2 and `plane-app` is the prefix of v0.14.0 setup
 
-**Back to original terminal window**, _Provide the Source Volume Prefix_ and hit ENTER.
+**Back to original terminal window**, *Provide the Source Volume Prefix* and hit ENTER.
 
-Now you will be prompted to _Provide Destination Volume Prefix_. Provide the value and hit ENTER
+Now you will be prompted to *Provide Destination Volume Prefix*. Provide the value and hit ENTER
 
 ```
 Provide the Source Volume Prefix : v0132
@@ -308,6 +302,8 @@ In case the suffixes are wrong or the mentioned volumes are not found, you will
 
 ![Migrate Error](images/migrate-error.png)
 
-In case of successful migration, it will be a silent exit without error.
+In case of successful migration, it will be a silent exit without error. 
+
+Now its time to restart v0.14.0 setup. 
+
 
-Now its time to restart v0.14.0 setup.

deploy/selfhost/docker-compose.yml

@@ -6,6 +6,7 @@ x-app-env : &app-env
     - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
     - 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"}
@@ -40,7 +41,7 @@ x-app-env : &app-env
     - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
     # OPENAI SETTINGS - Deprecated can be configured through admin panel
     - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
-    - OPENAI_API_KEY=${OPENAI_API_KEY:-""}
+    - OPENAI_API_KEY=${OPENAI_API_KEY:-"sk-"}
     - GPT_ENGINE=${GPT_ENGINE:-"gpt-3.5-turbo"}
     # LOGIN/SIGNUP SETTINGS - Deprecated can be configured through admin panel
     - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
@@ -66,7 +67,7 @@ services:
   web:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-frontend:${APP_RELEASE:-latest}
+    image: makeplane/plane-frontend-ce:${APP_RELEASE:-latest}
     restart: unless-stopped
     command: /usr/local/bin/start.sh web/server.js web
     deploy:
@@ -78,7 +79,7 @@ services:
   space:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-space:${APP_RELEASE:-latest}
+    image: makeplane/plane-space-ce:${APP_RELEASE:-latest}
     restart: unless-stopped
     command: /usr/local/bin/start.sh space/server.js space
     deploy:
@@ -91,7 +92,7 @@ services:
   api:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
     restart: unless-stopped
     command: ./bin/takeoff
     deploy:
@@ -103,7 +104,7 @@ services:
   worker:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
     restart: unless-stopped
     command: ./bin/worker
     depends_on:
@@ -114,7 +115,7 @@ services:
   beat-worker:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
     restart: unless-stopped
     command: ./bin/beat
     depends_on:
@@ -149,7 +150,7 @@ services:
   proxy:
     <<: *app-env
     platform: linux/amd64
-    image: makeplane/plane-proxy:${APP_RELEASE:-latest}
+    image: makeplane/plane-proxy-ce:${APP_RELEASE:-latest}
     ports:
         - ${NGINX_PORT}:80
     depends_on:

deploy/selfhost/variables.env

@@ -7,6 +7,7 @@ API_REPLICAS=1
 NGINX_PORT=80
 WEB_URL=http://localhost
 DEBUG=0
+NEXT_PUBLIC_ENABLE_OAUTH=0
 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
 SENTRY_DSN=""
 SENTRY_ENVIRONMENT="production"

docker-compose-local.yml

@@ -12,6 +12,7 @@ volumes:
 
 services:
   plane-redis:
+    container_name: plane-redis
     image: redis:6.2.7-alpine
     restart: unless-stopped
     networks:
@@ -20,6 +21,7 @@ services:
       - redisdata:/data
  
   plane-minio:
+    container_name: plane-minio
     image: minio/minio
     restart: unless-stopped
     networks:
@@ -34,6 +36,7 @@ services:
       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
  
   plane-db:
+    container_name: plane-db
     image: postgres:15.2-alpine
     restart: unless-stopped
     networks:
@@ -50,6 +53,7 @@ services:
       PGDATA: /var/lib/postgresql/data
 
   web:
+    container_name: web
     build:
       context: .
       dockerfile: ./web/Dockerfile.dev
@@ -57,7 +61,8 @@ services:
     networks:
       - dev_env
     volumes:
-      - ./web:/app/web
+      - .:/app
+    command: yarn dev --filter=web
     env_file:
       - ./web/.env
     depends_on:
@@ -68,17 +73,22 @@ services:
     build:
       context: .
       dockerfile: ./space/Dockerfile.dev
+    container_name: space
     restart: unless-stopped
     networks:
       - dev_env
     volumes:
-      - ./space:/app/space
+      - .:/app
+    command: yarn dev --filter=space
+    env_file:
+      - ./space/.env
     depends_on:
       - api
       - worker
       - web
 
   api:
+    container_name: api
     build:
       context: ./apiserver
       dockerfile: Dockerfile.dev
@@ -89,7 +99,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    # command: /bin/sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local"
+    command: /bin/sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local"
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -97,6 +107,7 @@ services:
       - plane-redis
   
   worker:
+    container_name: bgworker
     build:
       context: ./apiserver
       dockerfile: Dockerfile.dev
@@ -116,6 +127,7 @@ services:
       - plane-redis
 
   beat-worker:
+    container_name: beatworker
     build:
       context: ./apiserver
       dockerfile: Dockerfile.dev
@@ -135,9 +147,10 @@ services:
       - plane-redis
 
   proxy:
+    container_name: proxy
     build:
       context: ./nginx
-      dockerfile: Dockerfile.dev
+      dockerfile: Dockerfile
     restart: unless-stopped
     networks:
       - dev_env

nginx/Dockerfile.dev

@@ -1,10 +0,0 @@
-FROM nginx:1.25.0-alpine
-
-RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf.dev /etc/nginx/nginx.conf.template
-
-COPY ./env.sh /docker-entrypoint.sh
-
-RUN chmod +x /docker-entrypoint.sh
-# Update all environment variables
-CMD ["/docker-entrypoint.sh"]

nginx/nginx-single-docker-image.conf

@@ -18,7 +18,7 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
-    location /spaces/ {
+    location /space/ {
         proxy_pass http://localhost:4000/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;

nginx/nginx.conf.dev

@@ -1,39 +0,0 @@
-events {
-}
-
-http {
-    sendfile on;
-
-    server {
-        listen 80;
-        root /www/data/;
-        access_log /var/log/nginx/access.log;
-
-        client_max_body_size ${FILE_SIZE_LIMIT};
-
-        add_header X-Content-Type-Options    "nosniff" always;
-        add_header Referrer-Policy           "no-referrer-when-downgrade" always;
-        add_header Permissions-Policy        "interest-cohort=()" always;
-        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-
-        location / {
-            proxy_pass http://web:3000/;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-        }
-
-        location /api/ {
-            proxy_pass http://api:8000/api/;
-        }
-
-        location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;
-            proxy_pass http://space:4000/spaces/;
-        }
-
-        location /${BUCKET_NAME}/ {
-            proxy_pass http://plane-minio:9000/uploads/;
-        }
-    }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.14.0",
+  "version": "0.13.2",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -10,8 +10,7 @@
     "packages/eslint-config-custom",
     "packages/tailwind-config-custom",
     "packages/tsconfig",
-    "packages/ui",
-    "packages/types"
+    "packages/ui"
   ],
   "scripts": {
     "build": "turbo run build",
@@ -28,7 +27,7 @@
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
-    "turbo": "^1.11.2"
+    "turbo": "^1.10.16"
   },
   "resolutions": {
     "@types/react": "18.2.42"

packages/editor/core/.eslintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ["custom"],
-};

packages/editor/core/.prettierignore

@@ -1,6 +0,0 @@
-.next
-.vercel
-.tubro
-out/
-dis/
-build/

packages/editor/core/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "printWidth": 120,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.14.0",
+  "version": "0.0.1",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",
@@ -17,7 +17,7 @@
     }
   },
   "scripts": {
-    "build": "tsup --minify",
+    "build": "tsup",
     "dev": "tsup --watch",
     "check-types": "tsc --noEmit",
     "format": "prettier --write \"**/*.{ts,tsx,md}\""
@@ -28,28 +28,34 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@tiptap/core": "^2.1.13",
+    "@plane/editor-types": "*",
+    "@tiptap/core": "^2.1.7",
     "@tiptap/extension-blockquote": "^2.1.13",
-    "@tiptap/extension-code-block-lowlight": "^2.1.13",
-    "@tiptap/extension-color": "^2.1.13",
-    "@tiptap/extension-image": "^2.1.13",
-    "@tiptap/extension-link": "^2.1.13",
-    "@tiptap/extension-list-item": "^2.1.13",
-    "@tiptap/extension-mention": "^2.1.13",
-    "@tiptap/extension-task-item": "^2.1.13",
-    "@tiptap/extension-task-list": "^2.1.13",
-    "@tiptap/extension-text-style": "^2.1.13",
-    "@tiptap/extension-underline": "^2.1.13",
-    "@tiptap/pm": "^2.1.13",
-    "@tiptap/react": "^2.1.13",
-    "@tiptap/starter-kit": "^2.1.13",
-    "@tiptap/suggestion": "^2.0.13",
+    "@tiptap/extension-code-block-lowlight": "^2.1.12",
+    "@tiptap/extension-color": "^2.1.11",
+    "@tiptap/extension-image": "^2.1.7",
+    "@tiptap/extension-link": "^2.1.7",
+    "@tiptap/extension-list-item": "^2.1.12",
+    "@tiptap/extension-mention": "^2.1.12",
+    "@tiptap/extension-table": "^2.1.6",
+    "@tiptap/extension-table-cell": "^2.1.6",
+    "@tiptap/extension-table-header": "^2.1.6",
+    "@tiptap/extension-table-row": "^2.1.6",
+    "@tiptap/extension-task-item": "^2.1.7",
+    "@tiptap/extension-task-list": "^2.1.7",
+    "@tiptap/extension-text-style": "^2.1.11",
+    "@tiptap/extension-underline": "^2.1.7",
+    "@tiptap/pm": "^2.1.7",
+    "@tiptap/prosemirror-tables": "^1.1.4",
+    "@tiptap/react": "^2.1.7",
+    "@tiptap/starter-kit": "^2.1.10",
+    "@tiptap/suggestion": "^2.0.4",
     "class-variance-authority": "^0.7.0",
     "clsx": "^1.2.1",
     "highlight.js": "^11.8.0",
     "jsx-dom-cjs": "^8.0.3",
     "lowlight": "^3.0.0",
-    "lucide-react": "^0.294.0",
+    "lucide-react": "^0.244.0",
     "react-moveable": "^0.54.2",
     "tailwind-merge": "^1.14.0",
     "tippy.js": "^6.3.7",

packages/editor/core/src/index.ts

@@ -1,32 +1,23 @@
 // styles
 // import "./styles/tailwind.css";
-import "src/styles/editor.css";
-import "src/styles/table.css";
-import "src/styles/github-dark.css";
+// import "./styles/editor.css";
+import "./styles/github-dark.css";
 
-export { isCellSelection } from "src/ui/extensions/table/table/utilities/is-cell-selection";
+export { isCellSelection } from "./ui/extensions/table/table/utilities/is-cell-selection";
 
 // utils
-export * from "src/lib/utils";
-export * from "src/ui/extensions/table/table";
-export { startImageUpload } from "src/ui/plugins/upload-image";
+export * from "./lib/utils";
+export * from "./ui/extensions/table/table";
+export { startImageUpload } from "./ui/plugins/upload-image";
 
 // components
-export { EditorContainer } from "src/ui/components/editor-container";
-export { EditorContentWrapper } from "src/ui/components/editor-content";
+export { EditorContainer } from "./ui/components/editor-container";
+export { EditorContentWrapper } from "./ui/components/editor-content";
 
 // hooks
-export { useEditor } from "src/hooks/use-editor";
-export { useReadOnlyEditor } from "src/hooks/use-read-only-editor";
+export { useEditor } from "./ui/hooks/use-editor";
+export { useReadOnlyEditor } from "./ui/hooks/use-read-only-editor";
 
 // helper items
-export * from "src/ui/menus/menu-items";
-export * from "src/lib/editor-commands";
-
-// types
-export type { DeleteImage } from "src/types/delete-image";
-export type { UploadImage } from "src/types/upload-image";
-export type { RestoreImage } from "src/types/restore-image";
-export type { IMentionHighlight, IMentionSuggestion } from "src/types/mention-suggestion";
-export type { ISlashCommandItem, CommandProps } from "src/types/slash-commands-suggestion";
-export type { LucideIconType } from "src/types/lucide-icon";
+export * from "./ui/menus/menu-items";
+export * from "./lib/editor-commands";

packages/editor/core/src/lib/editor-commands.ts

@@ -1,20 +1,38 @@
+import { UploadImage } from "@plane/editor-types";
 import { Editor, Range } from "@tiptap/core";
-import { startImageUpload } from "src/ui/plugins/upload-image";
-import { findTableAncestor } from "src/lib/utils";
-import { UploadImage } from "src/types/upload-image";
+import { startImageUpload } from "../ui/plugins/upload-image";
+import { findTableAncestor } from "./utils";
 
 export const toggleHeadingOne = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 1 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 1 })
+      .run();
   else editor.chain().focus().toggleHeading({ level: 1 }).run();
 };
 
 export const toggleHeadingTwo = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 2 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 2 })
+      .run();
   else editor.chain().focus().toggleHeading({ level: 2 }).run();
 };
 
 export const toggleHeadingThree = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 3 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 3 })
+      .run();
   else editor.chain().focus().toggleHeading({ level: 3 }).run();
 };
 
@@ -39,7 +57,8 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {
 };
 
 export const toggleOrderedList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleOrderedList().run();
+  if (range)
+    editor.chain().focus().deleteRange(range).toggleOrderedList().run();
   else editor.chain().focus().toggleOrderedList().run();
 };
 
@@ -59,8 +78,21 @@ export const toggleStrike = (editor: Editor, range?: Range) => {
 };
 
 export const toggleBlockquote = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleNode("paragraph", "paragraph").toggleBlockquote().run();
-  else editor.chain().focus().toggleNode("paragraph", "paragraph").toggleBlockquote().run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .toggleNode("paragraph", "paragraph")
+      .toggleBlockquote()
+      .run();
+  else
+    editor
+      .chain()
+      .focus()
+      .toggleNode("paragraph", "paragraph")
+      .toggleBlockquote()
+      .run();
 };
 
 export const insertTableCommand = (editor: Editor, range?: Range) => {
@@ -73,8 +105,19 @@ export const insertTableCommand = (editor: Editor, range?: Range) => {
       }
     }
   }
-  if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
-  else editor.chain().focus().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+      .run();
+  else
+    editor
+      .chain()
+      .focus()
+      .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+      .run();
 };
 
 export const unsetLinkEditor = (editor: Editor) => {
@@ -88,8 +131,10 @@ export const setLinkEditor = (editor: Editor, url: string) => {
 export const insertImageCommand = (
   editor: Editor,
   uploadFile: UploadImage,
-  setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void,
-  range?: Range
+  setIsSubmitting?: (
+    isSubmitting: "submitting" | "submitted" | "saved",
+  ) => void,
+  range?: Range,
 ) => {
   if (range) editor.chain().focus().deleteRange(range).run();
   const input = document.createElement("input");

packages/editor/core/src/lib/utils.ts

@@ -6,19 +6,25 @@ interface EditorClassNames {
   customClassName?: string;
 }
 
-export const getEditorClassNames = ({ noBorder, borderOnFocus, customClassName }: EditorClassNames) =>
+export const getEditorClassNames = ({
+  noBorder,
+  borderOnFocus,
+  customClassName,
+}: EditorClassNames) =>
   cn(
     "relative w-full max-w-full sm:rounded-lg mt-2 p-3 relative focus:outline-none rounded-md",
     noBorder ? "" : "border border-custom-border-200",
     borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0",
-    customClassName
+    customClassName,
   );
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 
-export const findTableAncestor = (node: Node | null): HTMLTableElement | null => {
+export const findTableAncestor = (
+  node: Node | null,
+): HTMLTableElement | null => {
   while (node !== null && node.nodeName !== "TABLE") {
     node = node.parentNode;
   }

packages/editor/core/src/styles/editor.css

@@ -6,12 +6,6 @@
   height: 0;
 }
 
-/* block quotes */
-.ProseMirror blockquote p::before,
-.ProseMirror blockquote p::after {
-  display: none;
-}
-
 .ProseMirror .is-empty::before {
   content: attr(data-placeholder);
   float: left;
@@ -21,10 +15,9 @@
 }
 
 /* Custom image styles */
+
 .ProseMirror img {
   transition: filter 0.1s ease-in-out;
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
 
   &:hover {
     cursor: pointer;
@@ -60,12 +53,11 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
   background-color: rgb(var(--color-background-100));
   margin: 0;
   cursor: pointer;
-  width: 0.8rem;
-  height: 0.8rem;
+  width: 1.2rem;
+  height: 1.2rem;
   position: relative;
-  border: 1.5px solid rgb(var(--color-text-100));
-  margin-right: 0.2rem;
-  margin-top: 0.15rem;
+  border: 2px solid rgb(var(--color-text-100));
+  margin-right: 0.3rem;
   display: grid;
   place-content: center;
 
@@ -79,8 +71,8 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
 
   &::before {
     content: "";
-    width: 0.5em;
-    height: 0.5em;
+    width: 0.65em;
+    height: 0.65em;
     transform: scale(0);
     transition: 120ms transform ease-in-out;
     box-shadow: inset 1em 1em;
@@ -141,8 +133,6 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
 .img-placeholder {
   position: relative;
   width: 35%;
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
 
   &:before {
     content: "";
@@ -169,8 +159,7 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   table {
     border-collapse: collapse;
     table-layout: fixed;
-    margin: 0.5em 0 0.5em 0;
-
+    margin: 0;
     border: 1px solid rgb(var(--color-border-200));
     width: 100%;
 
@@ -240,34 +229,3 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
 .ProseMirror table * .is-empty::before {
   opacity: 0;
 }
-
-.ProseMirror pre {
-  background: rgba(var(--color-background-80));
-  border-radius: 0.5rem;
-  color: rgba(var(--color-text-100));
-  font-family: "JetBrainsMono", monospace;
-  padding: 0.75rem 1rem;
-}
-
-.ProseMirror pre code {
-  background: none;
-  color: inherit;
-  font-size: 0.8rem;
-  padding: 0;
-}
-
-div[data-type="horizontalRule"] {
-  line-height: 0;
-  padding: 0.25rem 0;
-  margin-top: 0;
-  margin-bottom: 0;
-
-  & > div {
-    border-bottom: 1px solid rgb(var(--color-text-100));
-  }
-}
-
-/* image resizer */
-.moveable-control-box {
-  z-index: 10 !important;
-}

packages/editor/core/src/types/lucide-icon.ts

@@ -1,3 +0,0 @@
-import { Smile } from "lucide-react";
-
-export type LucideIconType = typeof Smile;

packages/editor/core/src/ui/components/editor-container.tsx

@@ -7,7 +7,11 @@ interface EditorContainerProps {
   children: ReactNode;
 }
 
-export const EditorContainer = ({ editor, editorClassNames, children }: EditorContainerProps) => (
+export const EditorContainer = ({
+  editor,
+  editorClassNames,
+  children,
+}: EditorContainerProps) => (
   <div
     id="editor-container"
     onClick={() => {

packages/editor/core/src/ui/components/editor-content.tsx

@@ -1,6 +1,6 @@
 import { Editor, EditorContent } from "@tiptap/react";
 import { ReactNode } from "react";
-import { ImageResizer } from "src/ui/extensions/image/image-resize";
+import { ImageResizer } from "../extensions/image/image-resize";
 
 interface EditorContentProps {
   editor: Editor | null;
@@ -8,10 +8,16 @@ interface EditorContentProps {
   children?: ReactNode;
 }
 
-export const EditorContentWrapper = ({ editor, editorContentCustomClassNames = "", children }: EditorContentProps) => (
+export const EditorContentWrapper = ({
+  editor,
+  editorContentCustomClassNames = "",
+  children,
+}: EditorContentProps) => (
   <div className={`contentEditor ${editorContentCustomClassNames}`}>
     <EditorContent editor={editor} />
-    {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} />}
+    {editor?.isActive("image") && editor?.isEditable && (
+      <ImageResizer editor={editor} />
+    )}
     {children}
   </div>
 );