feat: package init

.env.example

@@ -38,9 +38,3 @@ USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"

.github/actions/build-push-ce/action.yml

@@ -0,0 +1,126 @@
+name: "Build and Push Docker Image"
+description: "Reusable action for building and pushing Docker images"
+inputs:
+  docker-username:
+    description: "The Dockerhub username"
+    required: true
+  docker-token:
+    description: "The Dockerhub Token"
+    required: true
+
+  # Docker Image Options
+  docker-image-owner:
+    description: "The owner of the Docker image"
+    required: true
+  docker-image-name:
+    description: "The name of the Docker image"
+    required: true
+  build-context:
+    description: "The build context"
+    required: true
+    default: "."
+  dockerfile-path:
+    description: "The path to the Dockerfile"
+    required: true
+  build-args:
+    description: "The build arguments"
+    required: false
+    default: ""
+  
+  # Buildx Options
+  buildx-driver:
+    description: "Buildx driver"
+    required: true
+    default: "docker-container"
+  buildx-version:
+    description: "Buildx version"
+    required: true
+    default: "latest"
+  buildx-platforms:
+    description: "Buildx platforms"
+    required: true
+    default: "linux/amd64"
+  buildx-endpoint:
+    description: "Buildx endpoint"
+    required: true
+    default: "default"
+
+  # Release Build Options
+  build-release:
+    description: "Flag to publish release"
+    required: false
+    default: "false"
+  build-prerelease:
+    description: "Flag to publish prerelease"
+    required: false
+    default: "false"
+  release-version:
+    description: "The release version"
+    required: false
+    default: "latest"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set Docker Tag
+      shell: bash
+      env:
+        IMG_OWNER: ${{ inputs.docker-image-owner }}
+        IMG_NAME: ${{ inputs.docker-image-name }}
+        BUILD_RELEASE: ${{ inputs.build-release }}
+        IS_PRERELEASE: ${{ inputs.build-prerelease }}
+        REL_VERSION: ${{ inputs.release-version }}
+      run: |
+        FLAT_BRANCH_VERSION=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9.-]//g')
+
+        if [ "${{ env.BUILD_RELEASE }}" == "true" ]; then
+          semver_regex="^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)?$"
+          if [[ ! ${{ env.REL_VERSION }} =~ $semver_regex ]]; then
+            echo "Invalid Release Version Format : ${{ env.REL_VERSION }}"
+            echo "Please provide a valid SemVer version"
+            echo "e.g. v1.2.3 or v1.2.3-alpha-1"
+            echo "Exiting the build process"
+            exit 1  # Exit with status 1 to fail the step
+          fi
+
+          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${{ env.REL_VERSION }}
+
+          if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
+            TAG=${TAG},${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:stable
+          fi
+        elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:latest
+        else
+          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${FLAT_BRANCH_VERSION}
+        fi
+        
+        echo "DOCKER_TAGS=${TAG}" >> $GITHUB_ENV
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ inputs.docker-username }}
+        password: ${{ inputs.docker-token}}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        driver: ${{ inputs.buildx-driver }}
+        version: ${{ inputs.buildx-version }}
+        endpoint: ${{ inputs.buildx-endpoint }}
+
+    - name: Check out the repo
+      uses: actions/checkout@v4
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v5.1.0
+      with:
+        context: ${{ inputs.build-context }}
+        file: ${{ inputs.dockerfile-path }}
+        platforms: ${{ inputs.buildx-platforms }}
+        tags: ${{ env.DOCKER_TAGS }}
+        push: true
+        build-args: ${{ inputs.build-args }}
+      env:
+        DOCKER_BUILDKIT: 1
+        DOCKER_USERNAME: ${{ inputs.docker-username }}
+        DOCKER_PASSWORD: ${{ inputs.docker-token }}

.github/workflows/build-aio-branch.yml

@@ -88,7 +88,7 @@ jobs:
 
   full_build_push:
     if: ${{ needs.branch_build_setup.outputs.do_full_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: full
@@ -148,7 +148,7 @@ jobs:
 
   slim_build_push:
     if: ${{ needs.branch_build_setup.outputs.do_slim_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: slim

.github/workflows/build-branch.yml

@@ -25,10 +25,6 @@ on:
         required: false
         default: false
         type: boolean
-  push:
-    branches:
-      - preview
-      - canary
 
 env:
   TARGET_BRANCH: ${{ github.ref_name }}
@@ -40,13 +36,19 @@ env:
 jobs:
   branch_build_setup:
     name: Build Setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     outputs:
       gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
       gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
       gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
       gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
       gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
+      build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
+      build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
+      build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
+      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
+      build_web: ${{ steps.changed_files.outputs.web_any_changed }}
+      build_live: ${{ steps.changed_files.outputs.live_any_changed }}
 
       dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
       dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
@@ -117,19 +119,61 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
 
+      - name: Get changed files
+        id: changed_files
+        uses: tj-actions/changed-files@v42
+        with:
+          files_yaml: |
+            apiserver:
+              - apiserver/**
+            proxy:
+              - nginx/**
+            admin:
+              - admin/**
+              - packages/**
+              - "package.json"
+              - "yarn.lock"
+              - "tsconfig.json"
+              - "turbo.json"
+            space:
+              - space/**
+              - packages/**
+              - "package.json"
+              - "yarn.lock"
+              - "tsconfig.json"
+              - "turbo.json"
+            web:
+              - web/**
+              - packages/**
+              - "package.json"
+              - "yarn.lock"
+              - "tsconfig.json"
+              - "turbo.json"
+            live:
+              - live/**
+              - packages/**
+              - 'package.json'
+              - 'yarn.lock'
+              - 'tsconfig.json'
+              - 'turbo.json'
+
   branch_build_push_admin:
+    if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Admin Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Admin Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
           build-context: .
@@ -140,18 +184,22 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_web:
+    if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Web Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Web Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
           build-context: .
@@ -162,18 +210,22 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_space:
+    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Space Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Space Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
           build-context: .
@@ -184,18 +236,22 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_live:
+    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Live Collaboration Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Live Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
           build-context: .
@@ -206,18 +262,22 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_apiserver:
+    if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push API Server Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Backend Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
           build-context: ./apiserver
@@ -228,18 +288,22 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_proxy:
+    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Proxy Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Proxy Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
           build-context: ./nginx
@@ -249,10 +313,35 @@ jobs:
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
+  attach_assets_to_build:
+    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
+    name: Attach Assets to Release
+    runs-on: ubuntu-20.04
+    needs: [branch_build_setup]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update Assets
+        run: |
+          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
+
+      - name: Attach Assets
+        id: attach_assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: selfhost-assets
+          retention-days: 2
+          path: |
+            ${{ github.workspace }}/deploy/selfhost/setup.sh
+            ${{ github.workspace }}/deploy/selfhost/restore.sh
+            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
+            ${{ github.workspace }}/deploy/selfhost/variables.env
+
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs:
       [
         branch_build_setup,
@@ -262,6 +351,7 @@ jobs:
         branch_build_push_live,
         branch_build_push_apiserver,
         branch_build_push_proxy,
+        attach_assets_to_build,
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -272,8 +362,6 @@ jobs:
       - name: Update Assets
         run: |
           cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
-          sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
-          # sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env
 
       - name: Create Release
         id: create_release
@@ -288,7 +376,6 @@ jobs:
           generate_release_notes: true
           files: |
             ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
             ${{ github.workspace }}/deploy/selfhost/restore.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
             ${{ github.workspace }}/deploy/selfhost/variables.env

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

@@ -6,9 +6,49 @@ on:
     types: ["opened", "synchronize", "ready_for_review"]
 
 jobs:
-  lint-apiserver:
+  get-changed-files:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
+    outputs:
+      apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
+      admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
+      space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
+      web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files_yaml: |
+            apiserver:
+              - apiserver/**
+            admin:
+              - admin/**
+              - packages/**
+              - 'package.json'
+              - 'yarn.lock'
+              - 'tsconfig.json'
+              - 'turbo.json'
+            space:
+              - space/**
+              - packages/**
+              - 'package.json'
+              - 'yarn.lock'
+              - 'tsconfig.json'
+              - 'turbo.json'
+            web:
+              - web/**
+              - packages/**
+              - 'package.json'
+              - 'yarn.lock'
+              - 'tsconfig.json'
+              - 'turbo.json'
+
+  lint-apiserver:
+    needs: get-changed-files
+    runs-on: ubuntu-latest
+    if: needs.get-changed-files.outputs.apiserver_changed == 'true'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -23,38 +63,41 @@ jobs:
         run: ruff check --fix apiserver
 
   lint-admin:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.admin_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=admin
 
   lint-space:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.space_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=space
 
   lint-web:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.web_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=web
 
@@ -66,7 +109,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=admin
 
@@ -78,7 +121,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=space
 
@@ -90,6 +133,6 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=web

.github/workflows/feature-deployment.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v4
 
   full_build_push:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: full

.github/workflows/sync-repo.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   sync_changes:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     permissions:
       pull-requests: write
       contents: read

.gitignore

@@ -1,6 +1,5 @@
 node_modules
 .next
-.yarn
 
 ### NextJS ###
 # Dependencies
@@ -53,8 +52,6 @@ mediafiles
 .env
 .DS_Store
 logs/
-htmlcov/
-.coverage
 
 node_modules/
 assets/dist/
@@ -81,17 +78,10 @@ pnpm-workspace.yaml
 .npmrc
 .secrets
 tmp/
-
 ## packages
 dist
 .temp/
 deploy/selfhost/plane-app/
-
 ## Storybook
 *storybook.log
 output.css
-
-dev-editor
-# Redis
-*.rdb
-*.rdb.gz

.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

CONTRIBUTING.md

@@ -15,33 +15,14 @@ Without said minimal reproduction, we won't be able to investigate all [issues](
 
 You can open a new issue with this [issue form](https://github.com/makeplane/plane/issues/new).
 
-### Naming conventions for issues
-
-When opening a new issue, please use a clear and concise title that follows this format:
-
-- For bugs: `🐛 Bug: [short description]`
-- For features: `🚀 Feature: [short description]`
-- For improvements: `🛠️ Improvement: [short description]`
-- For documentation: `📘 Docs: [short description]`
-
-**Examples:**
-- `🐛 Bug: API token expiry time not saving correctly`
-- `📘 Docs: Clarify RAM requirement for local setup`
-- `🚀 Feature: Allow custom time selection for token expiration`
-
-This helps us triage and manage issues more efficiently.
-
 ## Projects setup and Architecture
 
 ### Requirements
 
-- Docker Engine installed and running
-- Node.js version 20+ [LTS version](https://nodejs.org/en/about/previous-releases)
+- Node.js version v16.18.0
 - Python version 3.8+
 - Postgres version v14
 - Redis version v6.2.7
-- **Memory**: Minimum **12 GB RAM** recommended
-  > ⚠️ Running the project on a system with only 8 GB RAM may lead to setup failures or memory crashes (especially during Docker container build/start or dependency install). Use cloud environments like GitHub Codespaces or upgrade local RAM if possible.
 
 ### Setup the project
 
@@ -69,17 +50,6 @@ chmod +x setup.sh
 docker compose -f docker-compose-local.yml up
 ```
 
-5. Start web apps:
-
-```bash
-yarn dev
-```
-
-6. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin
-7. Open up your browser to http://localhost:3000 then log in using the same credentials from the previous step
-
-That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
-
 ## Missing a Feature?
 
 If a feature is missing, you can directly _request_ a new one [here](https://github.com/makeplane/plane/issues/new?assignees=&labels=feature&template=feature_request.yml&title=%F0%9F%9A%80+Feature%3A+). You also can do the same by choosing "🚀 Feature" when raising a [New Issue](https://github.com/makeplane/plane/issues/new/choose) on our GitHub Repository.
@@ -92,143 +62,17 @@ To ensure consistency throughout the source code, please keep these rules in min
 - All features or bug fixes must be tested by one or more specs (unit-tests).
 - We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
 
+## Need help? Questions and suggestions
+
+Questions, suggestions, and thoughts are most welcome. We can also be reached in our [Discord Server](https://discord.com/invite/A92xrEGCge).
+
 ## Ways to contribute
 
 - Try Plane Cloud and the self hosting platform and give feedback
 - Add new integrations
-- Add or update translations
 - Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
 - Share your thoughts and suggestions with us
 - Help create tutorials and blog posts
 - Request a feature by submitting a proposal
 - Report a bug
 - **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.
-
-## Contributing to language support
-This guide is designed to help contributors understand how to add or update translations in the application.
-
-### Understanding translation structure
-
-#### File organization
-Translations are organized by language in the locales directory. Each language has its own folder containing JSON files for translations. Here's how it looks:
-
-```
-packages/i18n/src/locales/
-    ├── en/
-    │   ├── core.json       # Critical translations
-    │   └── translations.json
-    ├── fr/
-    │   └── translations.json
-    └── [language]/
-        └── translations.json
-```
-#### Nested structure
-To keep translations organized, we use a nested structure for keys. This makes it easier to manage and locate specific translations. For example:
-
-```json
-{
-  "issue": {
-    "label": "Work item",
-    "title": {
-      "label": "Work item title"
-    }
-  }
-}
-```
-
-### Translation formatting guide
-We use [IntlMessageFormat](https://formatjs.github.io/docs/intl-messageformat/) to handle dynamic content, such as variables and pluralization. Here's how to format your translations:
-
-#### Examples
-- **Simple variables**
-    ```json
-    {
-    "greeting": "Hello, {name}!"
-    }
-    ```
-
-- **Pluralization**
-    ```json
-    {
-    "items": "{count, plural, one {Work item} other {Work items}}"
-    }
-    ```
-
-### Contributing guidelines
-
-#### Updating existing translations
-1. Locate the key in `locales/<language>/translations.json`.
-
-2. Update the value while ensuring the key structure remains intact.
-3. Preserve any existing ICU formats (e.g., variables, pluralization).
-
-#### Adding new translation keys
-1. When introducing a new key, ensure it is added to **all** language files, even if translations are not immediately available. Use English as a placeholder if needed.
-
-2. Keep the nesting structure consistent across all languages.
-
-3. If the new key requires dynamic content (e.g., variables or pluralization), ensure the ICU format is applied uniformly across all languages.
-
-### Adding new languages
-Adding a new language involves several steps to ensure it integrates seamlessly with the project. Follow these instructions carefully:
-
-1. **Update type definitions**
-Add the new language to the TLanguage type in the language definitions file:
-
-    ```typescript
-    // types/language.ts
-    export type TLanguage = "en" | "fr" | "your-lang";
-    ```
-
-2. **Add language configuration**
-Include the new language in the list of supported languages:
-
-    ```typescript
-    // constants/language.ts
-    export const SUPPORTED_LANGUAGES: ILanguageOption[] = [
-    { label: "English", value: "en" },
-    { label: "Your Language", value: "your-lang" }
-    ];
-    ```
-
-3. **Create translation files**
-    1.  Create a new folder for your language under locales (e.g., `locales/your-lang/`).
-
-    2. Add a `translations.json` file inside the folder.
-
-    3. Copy the structure from an existing translation file and translate all keys.
-
-4. **Update import logic**
-Modify the language import logic to include your new language:
-
-    ```typescript
-    private importLanguageFile(language: TLanguage): Promise<any> {
-    switch (language) {
-        case "your-lang":
-        return import("../locales/your-lang/translations.json");
-        // ...
-    }
-    }
-    ```
-
-### Quality checklist
-Before submitting your contribution, please ensure the following:
-
-- All translation keys exist in every language file.
-- Nested structures match across all language files.
-- ICU message formats are correctly implemented.
-- All languages load without errors in the application.
-- Dynamic values and pluralization work as expected.
-- There are no missing or untranslated keys.
-
-#### Pro tips
-- When in doubt, refer to the English translations for context.
-- Verify pluralization works with different numbers.
-- Ensure dynamic values (e.g., `{name}`) are correctly interpolated.
-- Double-check that nested key access paths are accurate.
-
-Happy translating! 🌍✨
-
-## Need help? Questions and suggestions
-
-Questions, suggestions, and thoughts are most welcome. We can also be reached in our [Discord Server](https://discord.com/invite/A92xrEGCge).

ENV_SETUP.md

@@ -43,6 +43,9 @@ NGINX_PORT=80
 # Debug value for api server use it as 0 for production use
 DEBUG=0
 CORS_ALLOWED_ORIGINS="http://localhost"
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
 # Database Settings
 POSTGRES_USER="plane"
 POSTGRES_PASSWORD="plane"

README.md

@@ -6,7 +6,6 @@
 </a>
 </p>
 <h1 align="center"><b>Plane</b></h1>
-<p align="center"><b>Open-source project management that unlocks customer value</b></p>
 
 <p align="center">
 <a href="https://discord.com/invite/A92xrEGCge">
@@ -16,10 +15,10 @@
 </p>
 
 <p align="center">
-    <a href="https://plane.so/"><b>Website</b></a> •
-    <a href="https://github.com/makeplane/plane/releases"><b>Releases</b></a> •
-    <a href="https://twitter.com/planepowers"><b>Twitter</b></a> •
-    <a href="https://docs.plane.so/"><b>Documentation</b></a>
+    <a href="https://dub.sh/plane-website-readme"><b>Website</b></a> •
+    <a href="https://git.new/releases"><b>Releases</b></a> •
+    <a href="https://dub.sh/planepowershq"><b>Twitter</b></a> •
+    <a href="https://dub.sh/planedocs"><b>Documentation</b></a>
 </p>
 
 <p>
@@ -39,7 +38,7 @@
     </a>
 </p>
 
-Meet [Plane](https://plane.so/), an open-source project management tool to track issues, run ~sprints~ cycles, and manage product roadmaps without the chaos of managing the tool itself. 🧘‍♀️
+Meet [Plane](https://dub.sh/plane-website-readme), an open-source project management tool to track issues, run ~sprints~ cycles, and manage product roadmaps without the chaos of managing the tool itself. 🧘‍♀️
 
 > Plane is evolving every day. Your suggestions, ideas, and reported bugs help us immensely. Do not hesitate to join in the conversation on [Discord](https://discord.com/invite/A92xrEGCge) or raise a GitHub issue. We read everything and respond to most.
 
@@ -47,10 +46,10 @@ Meet [Plane](https://plane.so/), an open-source project management tool to track
 
 Getting started with Plane is simple. Choose the setup that works best for you:
 
-- **Plane Cloud**
+- **Plane Cloud**   
 Sign up for a free account on [Plane Cloud](https://app.plane.so)—it's the fastest way to get up and running without worrying about infrastructure.
 
-- **Self-host Plane**
+- **Self-host Plane**  
 Prefer full control over your data and infrastructure? Install and run Plane on your own servers. Follow our detailed [deployment guides](https://developers.plane.so/self-hosting/overview) to get started.
 
 | Installation methods | Docs link                                                                                                                                          |
@@ -58,26 +57,26 @@ Prefer full control over your data and infrastructure? Install and run Plane on
 | Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://developers.plane.so/self-hosting/methods/docker-compose)         |
 | Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://developers.plane.so/self-hosting/methods/kubernetes) |
 
-`Instance admins` can configure instance settings with [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
+`Instance admins` can manage and customize settings using [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
 
 ## 🌟 Features
 
-- **Issues**
+- **Issues**  
 Efficiently create and manage tasks with a robust rich text editor that supports file uploads. Enhance organization and tracking by adding sub-properties and referencing related issues.
 
-- **Cycles**
+- **Cycles**   
 Maintain your team’s momentum with Cycles. Track progress effortlessly using burn-down charts and other insightful tools.
 
-- **Modules**
-Simplify complex projects by dividing them into smaller, manageable modules.
+- **Modules**  
+Simplify complex projects by dividing them into smaller, manageable modules. 
 
-- **Views**
+- **Views**  
 Customize your workflow by creating filters to display only the most relevant issues. Save and share these views with ease.
 
-- **Pages**
+- **Pages**  
 Capture and organize ideas using Plane Pages, complete with AI capabilities and a rich text editor. Format text, insert images, add hyperlinks, or convert your notes into actionable items.
 
-- **Analytics**
+- **Analytics**  
 Access real-time insights across all your Plane data. Visualize trends, remove blockers, and keep your projects moving forward.
 
 - **Drive** (_coming soon_): The drive helps you share documents, images, videos, or any other files that make sense to you or your team and align on the problem/solution.
@@ -85,11 +84,42 @@ Access real-time insights across all your Plane data. Visualize trends, remove b
 
 ## 🛠️ Local development
 
-See [CONTRIBUTING](./CONTRIBUTING.md)
+### Pre-requisites
+- Ensure Docker Engine is installed and running.
 
-## ⚙️ Built with
-[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)
-[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)
+###  Development setup
+Setting up your local environment is simple and straightforward. Follow these steps to get started:
+
+1. Clone the repository:
+   ```
+   git clone https://github.com/makeplane/plane.git
+   ```
+2. Navigate to the project folder:
+   ```
+   cd plane
+   ```
+3. Create a new branch for your feature or fix:
+   ```
+   git checkout -b <feature-branch-name>
+   ```
+4. Run the setup script in the terminal:
+   ```
+   ./setup.sh
+   ```
+5. Open the project in an IDE such as VS Code.
+
+6. Review the `.env` files in the relevant folders. Refer to [Environment Setup](./ENV_SETUP.md) for details on the environment variables used.
+
+7. Start the services using Docker:
+   ```
+   docker compose -f docker-compose-local.yml up -d
+   ```
+
+That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
+
+## Built with
+[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)<br/>
+[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)<br/>
 [![Node JS](https://img.shields.io/badge/node.js-339933?style=for-the-badge&logo=Node.js&logoColor=white)](https://nodejs.org/en)
 
 ## 📸 Screenshots
@@ -163,7 +193,7 @@ Feel free to ask questions, report bugs, participate in discussions, share ideas
 
 If you discover a security vulnerability in Plane, please report it responsibly instead of opening a public issue. We take all legitimate reports seriously and will investigate them promptly. See [Security policy](https://github.com/makeplane/plane/blob/master/SECURITY.md) for more info.
 
-To disclose any security issues, please email us at security@plane.so.
+To disclose any security issues, please email us at security@plane.so. 
 
 ## 🤝 Contributing
 
@@ -188,4 +218,4 @@ Please read [CONTRIBUTING.md](https://github.com/makeplane/plane/blob/master/CON
 
 
 ## License
-This project is licensed under the [GNU Affero General Public License v3.0](https://github.com/makeplane/plane/blob/master/LICENSE.txt).
+This project is licensed under the [GNU Affero General Public License v3.0](https://github.com/makeplane/plane/blob/master/LICENSE.txt).

admin/.env.example

@@ -1,12 +1,3 @@
-NEXT_PUBLIC_API_BASE_URL="http://localhost:8000"
-
-NEXT_PUBLIC_WEB_BASE_URL="http://localhost:3000"
-
-NEXT_PUBLIC_ADMIN_BASE_URL="http://localhost:3001"
+NEXT_PUBLIC_API_BASE_URL=""
 NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
-
-NEXT_PUBLIC_SPACE_BASE_URL="http://localhost:3002"
-NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
-
-NEXT_PUBLIC_LIVE_BASE_URL="http://localhost:3100"
-NEXT_PUBLIC_LIVE_BASE_PATH="/live"
+NEXT_PUBLIC_WEB_BASE_URL=""

admin/.eslintrc.js

@@ -2,4 +2,7 @@ module.exports = {
   root: true,
   extends: ["@plane/eslint-config/next.js"],
   parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: true,
+  },
 };

admin/Dockerfile.admin

@@ -1,9 +1,7 @@
-FROM node:20-alpine as base
-
 # *****************************************************************************
 # STAGE 1: Build the project
 # *****************************************************************************
-FROM base AS builder
+FROM node:18-alpine AS builder
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
@@ -15,7 +13,7 @@ RUN turbo prune --scope=admin --docker
 # *****************************************************************************
 # STAGE 2: Install dependencies & build the project
 # *****************************************************************************
-FROM base AS installer
+FROM node:18-alpine AS installer
 
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
@@ -54,7 +52,7 @@ RUN yarn turbo run build --filter=admin
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
 # *****************************************************************************
-FROM base AS runner
+FROM node:18-alpine AS runner
 WORKDIR /app
 
 COPY --from=installer /app/admin/next.config.js .

admin/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:18-alpine
 RUN apk add --no-cache libc6-compat
 # Set working directory
 WORKDIR /app

admin/app/ai/form.tsx

@@ -26,16 +26,16 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
     formState: { errors, isSubmitting },
   } = useForm<AIFormValues>({
     defaultValues: {
-      LLM_API_KEY: config["LLM_API_KEY"],
-      LLM_MODEL: config["LLM_MODEL"],
+      OPENAI_API_KEY: config["OPENAI_API_KEY"],
+      GPT_ENGINE: config["GPT_ENGINE"],
     },
   });
 
   const aiFormFields: TControllerInputFormField[] = [
     {
-      key: "LLM_MODEL",
+      key: "GPT_ENGINE",
       type: "text",
-      label: "LLM Model",
+      label: "GPT_ENGINE",
       description: (
         <>
           Choose an OpenAI engine.{" "}
@@ -49,12 +49,12 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
           </a>
         </>
       ),
-      placeholder: "gpt-4o-mini",
-      error: Boolean(errors.LLM_MODEL),
+      placeholder: "gpt-3.5-turbo",
+      error: Boolean(errors.GPT_ENGINE),
       required: false,
     },
     {
-      key: "LLM_API_KEY",
+      key: "OPENAI_API_KEY",
       type: "password",
       label: "API key",
       description: (
@@ -71,7 +71,7 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
         </>
       ),
       placeholder: "sk-asddassdfasdefqsdfasd23das3dasdcasd",
-      error: Boolean(errors.LLM_API_KEY),
+      error: Boolean(errors.OPENAI_API_KEY),
       required: false,
     },
   ];

admin/app/authentication/github/form.tsx

@@ -43,7 +43,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
     defaultValues: {
       GITHUB_CLIENT_ID: config["GITHUB_CLIENT_ID"],
       GITHUB_CLIENT_SECRET: config["GITHUB_CLIENT_SECRET"],
-      GITHUB_ORGANIZATION_ID: config["GITHUB_ORGANIZATION_ID"],
     },
   });
 
@@ -94,15 +93,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       error: Boolean(errors.GITHUB_CLIENT_SECRET),
       required: true,
     },
-    {
-      key: "GITHUB_ORGANIZATION_ID",
-      type: "text",
-      label: "Organization ID",
-      description: <>The organization github ID.</>,
-      placeholder: "123456789",
-      error: Boolean(errors.GITHUB_ORGANIZATION_ID),
-      required: false,
-    },
   ];
 
   const GITHUB_SERVICE_FIELD: TCopyField[] = [
@@ -160,7 +150,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
         reset({
           GITHUB_CLIENT_ID: response.find((item) => item.key === "GITHUB_CLIENT_ID")?.value,
           GITHUB_CLIENT_SECRET: response.find((item) => item.key === "GITHUB_CLIENT_SECRET")?.value,
-          GITHUB_ORGANIZATION_ID: response.find((item) => item.key === "GITHUB_ORGANIZATION_ID")?.value,
         });
       })
       .catch((err) => console.error(err));

admin/app/email/test-email-modal.tsx

@@ -1,9 +1,9 @@
 import React, { FC, useEffect, useState } from "react";
 import { Dialog, Transition } from "@headlessui/react";
-// plane imports
-import { InstanceService } from "@plane/services";
 // ui
 import { Button, Input } from "@plane/ui";
+// services
+import { InstanceService } from "@/services/instance.service";
 
 type Props = {
   isOpen: boolean;

admin/app/general/form.tsx

@@ -123,7 +123,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
                 No PII is collected.This anonymized data is used to understand how you use Plane and build new features
                 in line with{" "}
                 <a
-                  href="https://developers.plane.so/self-hosting/telemetry"
+                  href="https://docs.plane.so/self-hosting/telemetry"
                   target="_blank"
                   className="text-custom-primary-100 hover:underline"
                   rel="noreferrer"

admin/app/globals.css

@@ -1,4 +1,5 @@
-@import "@plane/propel/styles/fonts";
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0&display=swap");
 
 @tailwind base;
 @tailwind components;
@@ -59,31 +60,23 @@
     --color-border-300: 212, 212, 212; /* strong border- 1 */
     --color-border-400: 185, 185, 185; /* strong border- 2 */
 
-    --color-shadow-2xs:
-      0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
+    --color-shadow-2xs: 0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
       0px 1px 2px 0px rgba(23, 23, 23, 0.14);
-    --color-shadow-xs:
-      0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-xs: 0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
       0px 1px 8px -1px rgba(16, 24, 40, 0.1);
-    --color-shadow-sm:
-      0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02), 0px 1px 12px 0px rgba(0, 0, 0, 0.12);
-    --color-shadow-rg:
-      0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
+    --color-shadow-sm: 0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02),
+      0px 1px 12px 0px rgba(0, 0, 0, 0.12);
+    --color-shadow-rg: 0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
       0px 1px 12px 0px rgba(16, 24, 40, 0.04);
-    --color-shadow-md:
-      0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-md: 0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
       0px 1px 16px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-lg:
-      0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-lg: 0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
       0px 1px 24px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-xl:
-      0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
+    --color-shadow-xl: 0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
       0px 0px 52px 0px rgba(16, 24, 40, 0.16);
-    --color-shadow-2xl:
-      0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-2xl: 0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
       0px 1px 32px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-3xl:
-      0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-3xl: 0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
       0px 1px 48px 0px rgba(16, 24, 40, 0.12);
     --color-shadow-4xl: 0px 8px 40px 0px rgba(0, 0, 61, 0.05), 0px 12px 32px -16px rgba(0, 0, 0, 0.05);
 

admin/app/layout.tsx

@@ -3,16 +3,18 @@
 import { ReactNode } from "react";
 import { ThemeProvider, useTheme } from "next-themes";
 import { SWRConfig } from "swr";
-// plane imports
+// ui
 import { ADMIN_BASE_PATH, DEFAULT_SWR_CONFIG } from "@plane/constants";
 import { Toast } from "@plane/ui";
 import { resolveGeneralTheme } from "@plane/utils";
+// constants
+// helpers
 // lib
 import { InstanceProvider } from "@/lib/instance-provider";
 import { StoreProvider } from "@/lib/store-provider";
 import { UserProvider } from "@/lib/user-provider";
 // styles
-import "@/styles/globals.css";
+import "./globals.css";
 
 const ToastWithTheme = () => {
   const { resolvedTheme } = useTheme();

admin/app/page.tsx

@@ -7,15 +7,15 @@ import { DefaultLayout } from "@/layouts/default-layout";
 export const metadata: Metadata = {
   title: "Plane | Simple, extensible, open-source project management tool.",
   description:
-    "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",
+    "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
   openGraph: {
     title: "Plane | Simple, extensible, open-source project management tool.",
     description:
-      "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",
+      "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
     url: "https://plane.so/",
   },
   keywords:
-    "software development, customer feedback, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration",
+    "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration",
   twitter: {
     site: "@planepowers",
   },

admin/app/workspace/create/form.tsx

@@ -2,16 +2,18 @@ import { useState, useEffect } from "react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { Controller, useForm } from "react-hook-form";
-// plane imports
+// constants
 import { WEB_BASE_URL, ORGANIZATION_SIZE, RESTRICTED_URLS } from "@plane/constants";
-import { InstanceWorkspaceService } from "@plane/services";
+// types
 import { IWorkspace } from "@plane/types";
 // components
 import { Button, CustomSelect, getButtonStyling, Input, setToast, TOAST_TYPE } from "@plane/ui";
 // hooks
 import { useWorkspace } from "@/hooks/store";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
 
-const instanceWorkspaceService = new InstanceWorkspaceService();
+const workspaceService = new WorkspaceService();
 
 export const WorkspaceCreateForm = () => {
   // router
@@ -38,8 +40,8 @@ export const WorkspaceCreateForm = () => {
   const workspaceBaseURL = encodeURI(WEB_BASE_URL || window.location.origin + "/");
 
   const handleCreateWorkspace = async (formData: IWorkspace) => {
-    await instanceWorkspaceService
-      .slugCheck(formData.slug)
+    await workspaceService
+      .workspaceSlugCheck(formData.slug)
       .then(async (res) => {
         if (res.status === true && !RESTRICTED_URLS.includes(formData.slug)) {
           setSlugError(false);

admin/core/components/admin-sidebar/sidebar-dropdown.tsx

@@ -7,11 +7,12 @@ import { LogOut, UserCog2, Palette } from "lucide-react";
 import { Menu, Transition } from "@headlessui/react";
 // plane internal packages
 import { API_BASE_URL } from "@plane/constants";
-import { AuthService } from "@plane/services";
 import { Avatar } from "@plane/ui";
 import { getFileURL, cn } from "@plane/utils";
 // hooks
 import { useTheme, useUser } from "@/hooks/store";
+// services
+import { AuthService } from "@/services/auth.service";
 
 // service initialization
 const authService = new AuthService();

admin/core/components/instance/setup-form.tsx

@@ -6,11 +6,12 @@ import { useSearchParams } from "next/navigation";
 import { Eye, EyeOff } from "lucide-react";
 // plane internal packages
 import { API_BASE_URL, E_PASSWORD_STRENGTH } from "@plane/constants";
-import { AuthService } from "@plane/services";
 import { Button, Checkbox, Input, Spinner } from "@plane/ui";
 import { getPasswordStrength } from "@plane/utils";
 // components
 import { Banner, PasswordStrengthMeter } from "@/components/common";
+// services
+import { AuthService } from "@/services/auth.service";
 
 // service initialization
 const authService = new AuthService();
@@ -336,7 +337,7 @@ export const InstanceSetupForm: FC = (props) => {
             </label>
             <a
               tabIndex={-1}
-              href="https://developers.plane.so/self-hosting/telemetry"
+              href="https://docs.plane.so/telemetry"
               target="_blank"
               rel="noopener noreferrer"
               className="text-sm font-medium text-blue-500 hover:text-blue-600"

admin/core/components/login/sign-in-form.tsx

@@ -5,12 +5,13 @@ import { useSearchParams } from "next/navigation";
 import { Eye, EyeOff } from "lucide-react";
 // plane internal packages
 import { API_BASE_URL, EAdminAuthErrorCodes, TAuthErrorInfo } from "@plane/constants";
-import { AuthService } from "@plane/services";
 import { Button, Input, Spinner } from "@plane/ui";
 // components
 import { Banner } from "@/components/common";
 // helpers
 import { authErrorHandler } from "@/lib/auth-helpers";
+// services
+import { AuthService } from "@/services/auth.service";
 // local components
 import { AuthBanner } from "../authentication";
 

admin/core/services/api.service.ts

@@ -0,0 +1,53 @@
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
+// store
+// import { rootStore } from "@/lib/store-context";
+
+export abstract class APIService {
+  protected baseURL: string;
+  private axiosInstance: AxiosInstance;
+
+  constructor(baseURL: string) {
+    this.baseURL = baseURL;
+    this.axiosInstance = axios.create({
+      baseURL,
+      withCredentials: true,
+    });
+
+    this.setupInterceptors();
+  }
+
+  private setupInterceptors() {
+    // this.axiosInstance.interceptors.response.use(
+    //   (response) => response,
+    //   (error) => {
+    //     const store = rootStore;
+    //     if (error.response && error.response.status === 401 && store.user.currentUser) store.user.reset();
+    //     return Promise.reject(error);
+    //   }
+    // );
+  }
+
+  get<ResponseType>(url: string, params = {}): Promise<AxiosResponse<ResponseType>> {
+    return this.axiosInstance.get(url, { params });
+  }
+
+  post<RequestType, ResponseType>(url: string, data: RequestType, config = {}): Promise<AxiosResponse<ResponseType>> {
+    return this.axiosInstance.post(url, data, config);
+  }
+
+  put<RequestType, ResponseType>(url: string, data: RequestType, config = {}): Promise<AxiosResponse<ResponseType>> {
+    return this.axiosInstance.put(url, data, config);
+  }
+
+  patch<RequestType, ResponseType>(url: string, data: RequestType, config = {}): Promise<AxiosResponse<ResponseType>> {
+    return this.axiosInstance.patch(url, data, config);
+  }
+
+  delete<RequestType>(url: string, data?: RequestType, config = {}) {
+    return this.axiosInstance.delete(url, { data, ...config });
+  }
+
+  request<T>(config: AxiosRequestConfig = {}): Promise<AxiosResponse<T>> {
+    return this.axiosInstance(config);
+  }
+}

admin/core/services/auth.service.ts

@@ -0,0 +1,21 @@
+import { API_BASE_URL } from "@plane/constants";
+// services
+import { APIService } from "@/services/api.service";
+
+type TCsrfTokenResponse = {
+  csrf_token: string;
+};
+
+export class AuthService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async requestCSRFToken(): Promise<TCsrfTokenResponse> {
+    return this.get<TCsrfTokenResponse>("/auth/get-csrf-token/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+}

admin/core/services/instance.service.ts

@@ -0,0 +1,72 @@
+// plane internal packages
+import { API_BASE_URL } from "@plane/constants";
+import type {
+  IFormattedInstanceConfiguration,
+  IInstance,
+  IInstanceAdmin,
+  IInstanceConfiguration,
+  IInstanceInfo,
+} from "@plane/types";
+// helpers
+import { APIService } from "@/services/api.service";
+
+export class InstanceService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async getInstanceInfo(): Promise<IInstanceInfo> {
+    return this.get<IInstanceInfo>("/api/instances/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInstanceAdmins(): Promise<IInstanceAdmin[]> {
+    return this.get<IInstanceAdmin[]>("/api/instances/admins/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+
+  async updateInstanceInfo(data: Partial<IInstance>): Promise<IInstance> {
+    return this.patch<Partial<IInstance>, IInstance>("/api/instances/", data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInstanceConfigurations() {
+    return this.get<IInstanceConfiguration[]>("/api/instances/configurations/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+
+  async updateInstanceConfigurations(
+    data: Partial<IFormattedInstanceConfiguration>
+  ): Promise<IInstanceConfiguration[]> {
+    return this.patch<Partial<IFormattedInstanceConfiguration>, IInstanceConfiguration[]>(
+      "/api/instances/configurations/",
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async sendTestEmail(receiverEmail: string): Promise<undefined> {
+    return this.post<{ receiver_email: string }, undefined>("/api/instances/email-credentials-check/", {
+      receiver_email: receiverEmail,
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

admin/core/services/user.service.ts

@@ -0,0 +1,29 @@
+// plane internal packages
+import { API_BASE_URL } from "@plane/constants";
+import type { IUser } from "@plane/types";
+// services
+import { APIService } from "@/services/api.service";
+
+interface IUserSession extends IUser {
+  isAuthenticated: boolean;
+}
+
+export class UserService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async authCheck(): Promise<IUserSession> {
+    return this.get<any>("/api/instances/admins/me/")
+      .then((response) => ({ ...response?.data, isAuthenticated: true }))
+      .catch(() => ({ isAuthenticated: false }));
+  }
+
+  async currentUser(): Promise<IUser> {
+    return this.get<IUser>("/api/instances/admins/me/")
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response;
+      });
+  }
+}

admin/core/services/workspace.service.ts

@@ -0,0 +1,52 @@
+// plane internal packages
+import { API_BASE_URL } from "@plane/constants";
+import type { IWorkspace, TWorkspacePaginationInfo } from "@plane/types";
+// services
+import { APIService } from "@/services/api.service";
+
+export class WorkspaceService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  /**
+   * @description Fetches all workspaces
+   * @returns Promise<TWorkspacePaginationInfo>
+   */
+  async getWorkspaces(nextPageCursor?: string): Promise<TWorkspacePaginationInfo> {
+    return this.get<TWorkspacePaginationInfo>("/api/instances/workspaces/", {
+      cursor: nextPageCursor,
+    })
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  /**
+   * @description Checks if a slug is available
+   * @param slug - string
+   * @returns Promise<any>
+   */
+  async workspaceSlugCheck(slug: string): Promise<any> {
+    const params = new URLSearchParams({ slug });
+    return this.get(`/api/instances/workspace-slug-check/?${params.toString()}`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  /**
+   * @description Creates a new workspace
+   * @param data - IWorkspace
+   * @returns Promise<IWorkspace>
+   */
+  async createWorkspace(data: IWorkspace): Promise<IWorkspace> {
+    return this.post<IWorkspace, IWorkspace>("/api/instances/workspaces/", data)
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

admin/core/store/instance.store.ts

@@ -2,7 +2,6 @@ import set from "lodash/set";
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // plane internal packages
 import { EInstanceStatus, TInstanceStatus } from "@plane/constants";
-import { InstanceService } from "@plane/services";
 import {
   IInstance,
   IInstanceAdmin,
@@ -11,6 +10,8 @@ import {
   IInstanceInfo,
   IInstanceConfig,
 } from "@plane/types";
+// services
+import { InstanceService } from "@/services/instance.service";
 // root store
 import { CoreRootStore } from "@/store/root.store";
 
@@ -95,7 +96,7 @@ export class InstanceStore implements IInstanceStore {
     try {
       if (this.instance === undefined) this.isLoading = true;
       this.error = undefined;
-      const instanceInfo = await this.instanceService.info();
+      const instanceInfo = await this.instanceService.getInstanceInfo();
       // handling the new user popup toggle
       if (this.instance === undefined && !instanceInfo?.instance?.workspaces_exist)
         this.store.theme.toggleNewUserPopup();
@@ -124,7 +125,7 @@ export class InstanceStore implements IInstanceStore {
    */
   updateInstanceInfo = async (data: Partial<IInstance>) => {
     try {
-      const instanceResponse = await this.instanceService.update(data);
+      const instanceResponse = await this.instanceService.updateInstanceInfo(data);
       if (instanceResponse) {
         runInAction(() => {
           if (this.instance) set(this.instance, "instance", instanceResponse);
@@ -143,7 +144,7 @@ export class InstanceStore implements IInstanceStore {
    */
   fetchInstanceAdmins = async () => {
     try {
-      const instanceAdmins = await this.instanceService.admins();
+      const instanceAdmins = await this.instanceService.getInstanceAdmins();
       if (instanceAdmins) runInAction(() => (this.instanceAdmins = instanceAdmins));
       return instanceAdmins;
     } catch (error) {
@@ -158,7 +159,7 @@ export class InstanceStore implements IInstanceStore {
    */
   fetchInstanceConfigurations = async () => {
     try {
-      const instanceConfigurations = await this.instanceService.configurations();
+      const instanceConfigurations = await this.instanceService.getInstanceConfigurations();
       if (instanceConfigurations) runInAction(() => (this.instanceConfigurations = instanceConfigurations));
       return instanceConfigurations;
     } catch (error) {
@@ -173,7 +174,7 @@ export class InstanceStore implements IInstanceStore {
    */
   updateInstanceConfigurations = async (data: Partial<IFormattedInstanceConfiguration>) => {
     try {
-      const response = await this.instanceService.updateConfigurations(data);
+      const response = await this.instanceService.updateInstanceConfigurations(data);
       runInAction(() => {
         this.instanceConfigurations = this.instanceConfigurations?.map((config) => {
           const item = response.find((item) => item.key === config.key);

admin/core/store/user.store.ts

@@ -1,8 +1,10 @@
 import { action, observable, runInAction, makeObservable } from "mobx";
 // plane internal packages
 import { EUserStatus, TUserStatus } from "@plane/constants";
-import { AuthService, UserService } from "@plane/services";
 import { IUser } from "@plane/types";
+// services
+import { AuthService } from "@/services/auth.service";
+import { UserService } from "@/services/user.service";
 // root store
 import { CoreRootStore } from "@/store/root.store";
 
@@ -56,7 +58,7 @@ export class UserStore implements IUserStore {
   fetchCurrentUser = async () => {
     try {
       if (this.currentUser === undefined) this.isLoading = true;
-      const currentUser = await this.userService.adminDetails();
+      const currentUser = await this.userService.currentUser();
       if (currentUser) {
         await this.store.instance.fetchInstanceAdmins();
         runInAction(() => {

admin/core/store/workspace.store.ts

@@ -1,8 +1,8 @@
 import set from "lodash/set";
 import { action, observable, runInAction, makeObservable, computed } from "mobx";
-// plane imports
-import { InstanceWorkspaceService } from "@plane/services";
 import { IWorkspace, TLoader, TPaginationInfo } from "@plane/types";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
 // root store
 import { CoreRootStore } from "@/store/root.store";
 
@@ -29,7 +29,7 @@ export class WorkspaceStore implements IWorkspaceStore {
   workspaces: Record<string, IWorkspace> = {};
   paginationInfo: TPaginationInfo | undefined = undefined;
   // services
-  instanceWorkspaceService;
+  workspaceService;
 
   constructor(private store: CoreRootStore) {
     makeObservable(this, {
@@ -48,7 +48,7 @@ export class WorkspaceStore implements IWorkspaceStore {
       // curd actions
       createWorkspace: action,
     });
-    this.instanceWorkspaceService = new InstanceWorkspaceService();
+    this.workspaceService = new WorkspaceService();
   }
 
   // computed
@@ -84,7 +84,7 @@ export class WorkspaceStore implements IWorkspaceStore {
       } else {
         this.loader = "init-loader";
       }
-      const paginatedWorkspaceData = await this.instanceWorkspaceService.list();
+      const paginatedWorkspaceData = await this.workspaceService.getWorkspaces();
       runInAction(() => {
         const { results, ...paginationInfo } = paginatedWorkspaceData;
         results.forEach((workspace: IWorkspace) => {
@@ -109,7 +109,7 @@ export class WorkspaceStore implements IWorkspaceStore {
     if (!this.paginationInfo || this.paginationInfo.next_page_results === false) return [];
     try {
       this.loader = "pagination";
-      const paginatedWorkspaceData = await this.instanceWorkspaceService.list(this.paginationInfo.next_cursor);
+      const paginatedWorkspaceData = await this.workspaceService.getWorkspaces(this.paginationInfo.next_cursor);
       runInAction(() => {
         const { results, ...paginationInfo } = paginatedWorkspaceData;
         results.forEach((workspace: IWorkspace) => {
@@ -135,7 +135,7 @@ export class WorkspaceStore implements IWorkspaceStore {
   createWorkspace = async (data: IWorkspace): Promise<IWorkspace> => {
     try {
       this.loader = "mutation";
-      const workspace = await this.instanceWorkspaceService.create(data);
+      const workspace = await this.workspaceService.createWorkspace(data);
       runInAction(() => {
         set(this.workspaces, [workspace.id], workspace);
       });

admin/ee/components/authentication/authentication-modes.tsx

@@ -1 +1 @@
-export * from "ce/components/authentication/authentication-modes";
+export * from "ce/components/authentication/authentication-modes";

admin/next.config.js

@@ -9,19 +9,6 @@ const nextConfig = {
     unoptimized: true,
   },
   basePath: process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "",
-  transpilePackages: [
-    "@plane/constants",
-    "@plane/editor",
-    "@plane/hooks",
-    "@plane/i18n",
-    "@plane/logger",
-    "@plane/propel",
-    "@plane/services",
-    "@plane/shared-state",
-    "@plane/types",
-    "@plane/ui",
-    "@plane/utils",
-  ],
 };
 
 module.exports = nextConfig;

admin/package.json

@@ -1,8 +1,6 @@
 {
   "name": "admin",
-  "description": "Admin UI for Plane",
-  "version": "0.26.0",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -10,7 +8,6 @@
     "build": "next build",
     "preview": "next build && next start",
     "start": "next start",
-    "format": "prettier --write .",
     "lint": "eslint . --ext .ts,.tsx",
     "lint:errors": "eslint . --ext .ts,.tsx --quiet"
   },
@@ -18,38 +15,38 @@
     "@headlessui/react": "^1.7.19",
     "@plane/constants": "*",
     "@plane/hooks": "*",
-    "@plane/propel": "*",
-    "@plane/services": "*",
     "@plane/types": "*",
     "@plane/ui": "*",
     "@plane/utils": "*",
+    "@sentry/nextjs": "^8.32.0",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
-    "axios": "^1.8.3",
+    "axios": "^1.7.4",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.469.0",
+    "lucide-react": "^0.356.0",
     "mobx": "^6.12.0",
     "mobx-react": "^9.1.1",
-    "next": "^14.2.28",
+    "next": "^14.2.20",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.38",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "7.51.5",
     "swr": "^2.2.4",
+    "tailwindcss": "3.3.2",
     "uuid": "^9.0.1",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
     "@plane/eslint-config": "*",
-    "@plane/tailwind-config": "*",
     "@plane/typescript-config": "*",
     "@types/node": "18.16.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "@types/uuid": "^9.0.8",
     "@types/zxcvbn": "^4.4.4",
+    "tailwind-config-custom": "*",
     "typescript": "5.3.3"
   }
 }

admin/postcss.config.js

@@ -1,2 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-module.exports = require("@plane/tailwind-config/postcss.config.js");
+module.exports = {
+  plugins: {
+    "postcss-import": {},
+    "tailwindcss/nesting": {},
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};

admin/tailwind.config.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-const sharedConfig = require("@plane/tailwind-config/tailwind.config.js");
+const sharedConfig = require("tailwind-config-custom/tailwind.config.js");
 
 module.exports = {
   presets: [sharedConfig],

admin/tsconfig.json

@@ -1,19 +1,13 @@
 {
   "extends": "@plane/typescript-config/nextjs.json",
   "compilerOptions": {
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
+    "plugins": [{ "name": "next" }],
     "baseUrl": ".",
     "paths": {
       "@/*": ["core/*"],
       "@/public/*": ["public/*"],
-      "@/plane-admin/*": ["ce/*"],
-      "@/styles/*": ["styles/*"]
-    },
-    "strictNullChecks": true
+      "@/plane-admin/*": ["ce/*"]
+    }
   },
   "include": ["next-env.d.ts", "next.config.js", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]

aio/Dockerfile-app

@@ -145,8 +145,11 @@ RUN chmod +x /app/pg-setup.sh
 #  APPLICATION ENVIRONMENT SETTINGS
 # *****************************************************************************
 ENV APP_DOMAIN=localhost
+
 ENV WEB_URL=http://${APP_DOMAIN}
 ENV DEBUG=0
+ENV SENTRY_DSN=
+ENV SENTRY_ENVIRONMENT=production
 ENV CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN},https://${APP_DOMAIN}
 # Secret Key
 ENV SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5

apiserver/.coveragerc

@@ -1,25 +0,0 @@
-[run]
-source = plane
-omit =
-    */tests/*
-    */migrations/*
-    */settings/*
-    */wsgi.py
-    */asgi.py
-    */urls.py
-    manage.py
-    */admin.py
-    */apps.py
-
-[report]
-exclude_lines =
-    pragma: no cover
-    def __repr__
-    if self.debug:
-    raise NotImplementedError
-    if __name__ == .__main__.
-    pass
-    raise ImportError
-
-[html]
-directory = htmlcov 

apiserver/.env.example

@@ -1,7 +1,11 @@
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS="http://localhost:3000,http://localhost:3001,http://localhost:3002,http://localhost:3100"
+CORS_ALLOWED_ORIGINS="http://localhost"
+
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
 
 # Database Settings
 POSTGRES_USER="plane"
@@ -27,7 +31,7 @@ RABBITMQ_VHOST="plane"
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
 AWS_SECRET_ACCESS_KEY="secret-key"
-AWS_S3_ENDPOINT_URL="http://localhost:9000"
+AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 # Changing this requires change in the nginx.conf for uploads if using minio setup
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
@@ -37,37 +41,22 @@ FILE_SIZE_LIMIT=5242880
 DOCKERIZED=1 # deprecated
 
 # set to 1 If using the pre-configured minio setup
-USE_MINIO=0
+USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
 
 # Email redirections and minio domain settings
-WEB_URL="http://localhost:8000"
+WEB_URL="http://localhost"
 
 # Gunicorn Workers
 GUNICORN_WORKERS=2
 
 # Base URLs
-ADMIN_BASE_URL="http://localhost:3001"
-ADMIN_BASE_PATH="/god-mode"
+ADMIN_BASE_URL=
+SPACE_BASE_URL=
+APP_BASE_URL=
 
-SPACE_BASE_URL="http://localhost:3002"
-SPACE_BASE_PATH="/spaces"
-
-APP_BASE_URL="http://localhost:3000"
-APP_BASE_PATH=""
-
-LIVE_BASE_URL="http://localhost:3100"
-LIVE_BASE_PATH="/live"
-
-LIVE_SERVER_SECRET_KEY="secret-key"
 
 # Hard delete files after days
-HARD_DELETE_AFTER_DAYS=60
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"
+HARD_DELETE_AFTER_DAYS=60

apiserver/package.json

@@ -1,7 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.26.0",
-  "license": "AGPL-3.0",
-  "private": true,
-  "description": "API server powering Plane's backend"
+  "version": "0.24.1"
 }

apiserver/plane/api/rate_limit.py

@@ -1,13 +1,9 @@
-# python imports
-import os
-
-# Third party imports
 from rest_framework.throttling import SimpleRateThrottle
 
 
 class ApiKeyRateThrottle(SimpleRateThrottle):
     scope = "api_key"
-    rate = os.environ.get("API_KEY_RATE_LIMIT", "60/minute")
+    rate = "60/minute"
 
     def get_cache_key(self, request, view):
         # Retrieve the API key from the request header

apiserver/plane/api/serializers/__init__.py

@@ -15,4 +15,3 @@ from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
 from .intake import IntakeIssueSerializer
-from .estimate import EstimatePointSerializer

apiserver/plane/api/serializers/base.py

@@ -72,7 +72,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         StateLiteSerializer,
                         UserLiteSerializer,
                         WorkspaceLiteSerializer,
-                        EstimatePointSerializer,
                     )
 
                     # Expansion mapper
@@ -89,7 +88,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         "owned_by": UserLiteSerializer,
                         "members": UserLiteSerializer,
                         "parent": IssueLiteSerializer,
-                        "estimate_point": EstimatePointSerializer,
                     }
                     # Check if field in expansion  then expand the field
                     if expand in expansion:

apiserver/plane/api/serializers/cycle.py

@@ -1,5 +1,4 @@
 # Third party imports
-import pytz
 from rest_framework import serializers
 
 # Module imports
@@ -7,7 +6,6 @@ from .base import BaseSerializer
 from plane.db.models import Cycle, CycleIssue
 from plane.utils.timezone_converter import convert_to_utc
 
-
 class CycleSerializer(BaseSerializer):
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)
@@ -19,14 +17,6 @@ class CycleSerializer(BaseSerializer):
     completed_estimates = serializers.FloatField(read_only=True)
     started_estimates = serializers.FloatField(read_only=True)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        project = self.context.get("project")
-        if project and project.timezone:
-            project_timezone = pytz.timezone(project.timezone)
-            self.fields["start_date"].timezone = project_timezone
-            self.fields["end_date"].timezone = project_timezone
-
     def validate(self, data):
         if (
             data.get("start_date", None) is not None
@@ -39,23 +29,12 @@ class CycleSerializer(BaseSerializer):
             data.get("start_date", None) is not None
             and data.get("end_date", None) is not None
         ):
-            project_id = self.initial_data.get("project_id") or (
-                self.instance.project_id
-                if self.instance and hasattr(self.instance, "project_id")
-                else None
-            )
-
-            if not project_id:
-                raise serializers.ValidationError("Project ID is required")
-
+            project_id = self.initial_data.get("project_id") or self.instance.project_id
             data["start_date"] = convert_to_utc(
-                date=str(data.get("start_date").date()),
-                project_id=project_id,
-                is_start_date=True,
+                str(data.get("start_date").date()), project_id, is_start_date=True
             )
             data["end_date"] = convert_to_utc(
-                date=str(data.get("end_date", None).date()),
-                project_id=project_id,
+                str(data.get("end_date", None).date()), project_id
             )
         return data
 

apiserver/plane/api/serializers/estimate.py

@@ -1,10 +0,0 @@
-# Module imports
-from plane.db.models import EstimatePoint
-from .base import BaseSerializer
-
-
-class EstimatePointSerializer(BaseSerializer):
-    class Meta:
-        model = EstimatePoint
-        fields = ["id", "value"]
-        read_only_fields = fields

apiserver/plane/api/serializers/issue.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.utils import timezone
 from lxml import html
-from django.db import IntegrityError
 
 #  Third party imports
 from rest_framework import serializers
@@ -80,7 +79,6 @@ class IssueSerializer(BaseSerializer):
             data["assignees"] = ProjectMember.objects.filter(
                 project_id=self.context.get("project_id"),
                 is_active=True,
-                role__gte=15,
                 member_id__in=data["assignees"],
             ).values_list("member_id", flat=True)
 
@@ -140,64 +138,47 @@ class IssueSerializer(BaseSerializer):
         updated_by_id = issue.updated_by_id
 
         if assignees is not None and len(assignees):
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for assignee_id in assignees
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
-        else:
-            try:
-                # Then assign it to default assignee, if it is a valid assignee
-                if (
-                    default_assignee_id is not None
-                    and ProjectMember.objects.filter(
-                        member_id=default_assignee_id,
-                        project_id=project_id,
-                        role__gte=15,
-                        is_active=True,
-                    ).exists()
-                ):
-                    IssueAssignee.objects.create(
-                        assignee_id=default_assignee_id,
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee_id=assignee_id,
                         issue=issue,
                         project_id=project_id,
                         workspace_id=workspace_id,
                         created_by_id=created_by_id,
                         updated_by_id=updated_by_id,
                     )
-            except IntegrityError:
-                pass
+                    for assignee_id in assignees
+                ],
+                batch_size=10,
+            )
+        else:
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
+                IssueAssignee.objects.create(
+                    assignee_id=default_assignee_id,
+                    issue=issue,
+                    project_id=project_id,
+                    workspace_id=workspace_id,
+                    created_by_id=created_by_id,
+                    updated_by_id=updated_by_id,
+                )
 
         if labels is not None and len(labels):
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label_id=label_id,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label_id in labels
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label_id=label_id,
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label_id in labels
+                ],
+                batch_size=10,
+            )
 
         return issue
 
@@ -213,45 +194,37 @@ class IssueSerializer(BaseSerializer):
 
         if assignees is not None:
             IssueAssignee.objects.filter(issue=instance).delete()
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for assignee_id in assignees
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee_id=assignee_id,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for assignee_id in assignees
+                ],
+                batch_size=10,
+            )
 
         if labels is not None:
             IssueLabel.objects.filter(issue=instance).delete()
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label_id=label_id,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label_id in labels
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label_id=label_id,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label_id in labels
+                ],
+                batch_size=10,
+            )
 
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()

apiserver/plane/api/serializers/project.py

@@ -16,6 +16,7 @@ class ProjectSerializer(BaseSerializer):
     member_role = serializers.IntegerField(read_only=True)
     is_deployed = serializers.BooleanField(read_only=True)
     cover_image_url = serializers.CharField(read_only=True)
+    inbox_view = serializers.BooleanField(read_only=True, source="intake_view")
 
     class Meta:
         model = Project

apiserver/plane/api/urls/intake.py

@@ -4,6 +4,16 @@ from plane.api.views import IntakeIssueAPIEndpoint
 
 
 urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
+        IntakeIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
+        IntakeIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/",
         IntakeIssueAPIEndpoint.as_view(),

apiserver/plane/api/urls/issue.py

@@ -71,9 +71,4 @@ urlpatterns = [
         IssueAttachmentEndpoint.as_view(),
         name="attachment",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
-        IssueAttachmentEndpoint.as_view(),
-        name="issue-attachment",
-    ),
 ]

apiserver/plane/api/views/cycle.py

@@ -39,7 +39,7 @@ from plane.db.models import (
     UserFavorite,
 )
 from plane.utils.analytics_plot import burndown_plot
-from plane.utils.host import base_host
+
 from .base import BaseAPIView
 from plane.bgtasks.webhook_task import model_activity
 
@@ -137,14 +137,10 @@ class CycleAPIEndpoint(BaseAPIView):
         )
 
     def get(self, request, slug, project_id, pk=None):
-        project = Project.objects.get(workspace__slug=slug, pk=project_id)
         if pk:
             queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
             data = CycleSerializer(
-                queryset,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                queryset, fields=self.fields, expand=self.expand
             ).data
             return Response(data, status=status.HTTP_200_OK)
         queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -156,11 +152,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 start_date__lte=timezone.now(), end_date__gte=timezone.now()
             )
             data = CycleSerializer(
-                queryset,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                queryset, many=True, fields=self.fields, expand=self.expand
             ).data
             return Response(data, status=status.HTTP_200_OK)
 
@@ -171,11 +163,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -186,11 +174,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -201,11 +185,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -218,22 +198,14 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
         return self.paginate(
             request=request,
             queryset=(queryset),
             on_results=lambda cycles: CycleSerializer(
-                cycles,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                cycles, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -279,7 +251,7 @@ class CycleAPIEndpoint(BaseAPIView):
                     current_instance=None,
                     actor_id=request.user.id,
                     slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                 )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -351,7 +323,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 current_instance=current_instance,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -722,7 +694,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         # Return all Cycle Issues
         return Response(
@@ -788,7 +760,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -800,7 +771,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -849,7 +819,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                 )
             )
         )
-        old_cycle = old_cycle.first()
 
         estimate_type = Project.objects.filter(
             workspace__slug=slug,
@@ -969,7 +938,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             )
 
             estimate_completion_chart = burndown_plot(
-                queryset=old_cycle,
+                queryset=old_cycle.first(),
                 slug=slug,
                 project_id=project_id,
                 plot_type="points",
@@ -1117,7 +1086,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
 
         # Pass the new_cycle queryset to burndown_plot
         completion_chart = burndown_plot(
-            queryset=old_cycle,
+            queryset=old_cycle.first(),
             slug=slug,
             project_id=project_id,
             plot_type="issues",
@@ -1129,12 +1098,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
         ).first()
 
         current_cycle.progress_snapshot = {
-            "total_issues": old_cycle.total_issues,
-            "completed_issues": old_cycle.completed_issues,
-            "cancelled_issues": old_cycle.cancelled_issues,
-            "started_issues": old_cycle.started_issues,
-            "unstarted_issues": old_cycle.unstarted_issues,
-            "backlog_issues": old_cycle.backlog_issues,
+            "total_issues": old_cycle.first().total_issues,
+            "completed_issues": old_cycle.first().completed_issues,
+            "cancelled_issues": old_cycle.first().cancelled_issues,
+            "started_issues": old_cycle.first().started_issues,
+            "unstarted_issues": old_cycle.first().unstarted_issues,
+            "backlog_issues": old_cycle.first().backlog_issues,
             "distribution": {
                 "labels": label_distribution_data,
                 "assignees": assignee_distribution_data,
@@ -1199,7 +1168,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         return Response({"message": "Success"}, status=status.HTTP_200_OK)

apiserver/plane/api/views/intake.py

@@ -18,9 +18,8 @@ from plane.api.serializers import IntakeIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State
-from plane.utils.host import base_host
+
 from .base import BaseAPIView
-from plane.db.models.intake import SourceType
 
 
 class IntakeIssueAPIEndpoint(BaseAPIView):
@@ -126,7 +125,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             intake_id=intake.id,
             project_id=project_id,
             issue=issue,
-            source=SourceType.IN_APP,
+            source=request.data.get("source", "IN-APP"),
         )
         # Create an Issue Activity
         issue_activity.delay(
@@ -298,7 +297,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     current_instance=current_instance,
                     epoch=int(timezone.now().timestamp()),
                     notification=False,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                     intake=str(intake_issue.id),
                 )
 

apiserver/plane/api/views/issue.py

@@ -1,10 +1,9 @@
 # Python imports
 import json
-import uuid
+
+from django.core.serializers.json import DjangoJSONEncoder
 
 # Django imports
-from django.core.serializers.json import DjangoJSONEncoder
-from django.http import HttpResponseRedirect
 from django.db import IntegrityError
 from django.db.models import (
     Case,
@@ -20,11 +19,11 @@ from django.db.models import (
     Subquery,
 )
 from django.utils import timezone
-from django.conf import settings
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from rest_framework.parsers import MultiPartParser, FormParser
 
 # Module imports
 from plane.api.serializers import (
@@ -51,13 +50,9 @@ from plane.db.models import (
     Project,
     ProjectMember,
     CycleIssue,
-    Workspace,
 )
-from plane.settings.storage import S3Storage
-from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
+
 from .base import BaseAPIView
-from plane.utils.host import base_host
-from plane.bgtasks.webhook_task import model_activity
 
 
 class WorkspaceIssueAPIEndpoint(BaseAPIView):
@@ -323,17 +318,6 @@ class IssueAPIEndpoint(BaseAPIView):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
-
-            # Send the model activity
-            model_activity.delay(
-                model_name="issue",
-                model_id=str(serializer.data["id"]),
-                requested_data=request.data,
-                current_instance=None,
-                actor_id=request.user.id,
-                slug=slug,
-                origin=base_host(request=request, is_app=True),
-            )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -956,162 +940,37 @@ class IssueAttachmentEndpoint(BaseAPIView):
     serializer_class = IssueAttachmentSerializer
     permission_classes = [ProjectEntityPermission]
     model = FileAsset
+    parser_classes = (MultiPartParser, FormParser)
 
     def post(self, request, slug, project_id, issue_id):
-        name = request.data.get("name")
-        type = request.data.get("type", False)
-        size = request.data.get("size")
-        external_id = request.data.get("external_id")
-        external_source = request.data.get("external_source")
-
-        # Check if the request is valid
-        if not name or not size:
-            return Response(
-                {"error": "Invalid request.", "status": False},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        size_limit = min(size, settings.FILE_SIZE_LIMIT)
-
-        if not type or type not in settings.ATTACHMENT_MIME_TYPES:
-            return Response(
-                {"error": "Invalid file type.", "status": False},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Get the workspace
-        workspace = Workspace.objects.get(slug=slug)
-
-        # asset key
-        asset_key = f"{workspace.id}/{uuid.uuid4().hex}-{name}"
-
+        serializer = IssueAttachmentSerializer(data=request.data)
         if (
             request.data.get("external_id")
             and request.data.get("external_source")
             and FileAsset.objects.filter(
                 project_id=project_id,
                 workspace__slug=slug,
+                issue_id=issue_id,
                 external_source=request.data.get("external_source"),
                 external_id=request.data.get("external_id"),
-                issue_id=issue_id,
-                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
             ).exists()
         ):
-            asset = FileAsset.objects.filter(
-                project_id=project_id,
+            issue_attachment = FileAsset.objects.filter(
                 workspace__slug=slug,
-                external_source=request.data.get("external_source"),
+                project_id=project_id,
                 external_id=request.data.get("external_id"),
-                issue_id=issue_id,
-                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+                external_source=request.data.get("external_source"),
             ).first()
             return Response(
                 {
-                    "error": "Issue with the same external id and external source already exists",
-                    "id": str(asset.id),
+                    "error": "Issue attachment with the same external id and external source already exists",
+                    "id": str(issue_attachment.id),
                 },
                 status=status.HTTP_409_CONFLICT,
             )
 
-        # Create a File Asset
-        asset = FileAsset.objects.create(
-            attributes={"name": name, "type": type, "size": size_limit},
-            asset=asset_key,
-            size=size_limit,
-            workspace_id=workspace.id,
-            created_by=request.user,
-            issue_id=issue_id,
-            project_id=project_id,
-            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-            external_id=external_id,
-            external_source=external_source,
-        )
-
-        # Get the presigned URL
-        storage = S3Storage(request=request)
-        # Generate a presigned URL to share an S3 object
-        presigned_url = storage.generate_presigned_post(
-            object_name=asset_key, file_type=type, file_size=size_limit
-        )
-        # Return the presigned URL
-        return Response(
-            {
-                "upload_data": presigned_url,
-                "asset_id": str(asset.id),
-                "attachment": IssueAttachmentSerializer(asset).data,
-                "asset_url": asset.asset_url,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id, issue_id, pk):
-        issue_attachment = FileAsset.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
-        )
-        issue_attachment.is_deleted = True
-        issue_attachment.deleted_at = timezone.now()
-        issue_attachment.save()
-
-        issue_activity.delay(
-            type="attachment.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=base_host(request=request, is_app=True),
-        )
-
-        # Get the storage metadata
-        if not issue_attachment.storage_metadata:
-            get_asset_object_metadata.delay(str(issue_attachment.id))
-        issue_attachment.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def get(self, request, slug, project_id, issue_id, pk=None):
-        if pk:
-            # Get the asset
-            asset = FileAsset.objects.get(
-                id=pk, workspace__slug=slug, project_id=project_id
-            )
-
-            # Check if the asset is uploaded
-            if not asset.is_uploaded:
-                return Response(
-                    {"error": "The asset is not uploaded.", "status": False},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            storage = S3Storage(request=request)
-            presigned_url = storage.generate_presigned_url(
-                object_name=asset.asset.name,
-                disposition="attachment",
-                filename=asset.attributes.get("name"),
-            )
-            return HttpResponseRedirect(presigned_url)
-
-        # Get all the attachments
-        issue_attachments = FileAsset.objects.filter(
-            issue_id=issue_id,
-            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-            workspace__slug=slug,
-            project_id=project_id,
-            is_uploaded=True,
-        )
-        # Serialize the attachments
-        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def patch(self, request, slug, project_id, issue_id, pk):
-        issue_attachment = FileAsset.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
-        )
-        serializer = IssueAttachmentSerializer(issue_attachment)
-
-        # Send this activity only if the attachment is not uploaded before
-        if not issue_attachment.is_uploaded:
+        if serializer.is_valid():
+            serializer.save(project_id=project_id, issue_id=issue_id)
             issue_activity.delay(
                 type="attachment.activity.created",
                 requested_data=None,
@@ -1121,15 +980,32 @@ class IssueAttachmentEndpoint(BaseAPIView):
                 current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-            # Update the attachment
-            issue_attachment.is_uploaded = True
-            issue_attachment.created_by = request.user
+    def delete(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = FileAsset.objects.get(pk=pk)
+        issue_attachment.asset.delete(save=False)
+        issue_attachment.delete()
+        issue_activity.delay(
+            type="attachment.activity.deleted",
+            requested_data=None,
+            actor_id=str(self.request.user.id),
+            issue_id=str(self.kwargs.get("issue_id", None)),
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
 
-        # Get the storage metadata
-        if not issue_attachment.storage_metadata:
-            get_asset_object_metadata.delay(str(issue_attachment.id))
-        issue_attachment.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def get(self, request, slug, project_id, issue_id):
+        issue_attachments = FileAsset.objects.filter(
+            issue_id=issue_id, workspace__slug=slug, project_id=project_id
+        )
+        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/api/views/module.py

@@ -33,7 +33,6 @@ from plane.db.models import (
 
 from .base import BaseAPIView
 from plane.bgtasks.webhook_task import model_activity
-from plane.utils.host import base_host
 
 
 class ModuleAPIEndpoint(BaseAPIView):
@@ -175,7 +174,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                 current_instance=None,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             module = Module.objects.get(pk=serializer.data["id"])
             serializer = ModuleSerializer(module)
@@ -227,7 +226,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                 current_instance=current_instance,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
 
             return Response(serializer.data, status=status.HTTP_200_OK)
@@ -281,7 +280,6 @@ class ModuleAPIEndpoint(BaseAPIView):
             project_id=str(project_id),
             current_instance=json.dumps({"module_name": str(module.name)}),
             epoch=int(timezone.now().timestamp()),
-            origin=base_host(request=request, is_app=True),
         )
         module.delete()
         # Delete the module issues
@@ -451,7 +449,6 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
                 }
             ),
             epoch=int(timezone.now().timestamp()),
-            origin=base_host(request=request, is_app=True),
         )
 
         return Response(

apiserver/plane/api/views/project.py

@@ -28,9 +28,8 @@ from plane.db.models import (
     Workspace,
     UserFavorite,
 )
-from plane.bgtasks.webhook_task import model_activity, webhook_activity
+from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
-from plane.utils.host import base_host
 
 
 class ProjectAPIEndpoint(BaseAPIView):
@@ -172,14 +171,14 @@ class ProjectAPIEndpoint(BaseAPIView):
                 states = [
                     {
                         "name": "Backlog",
-                        "color": "#60646C",
+                        "color": "#A3A3A3",
                         "sequence": 15000,
                         "group": "backlog",
                         "default": True,
                     },
                     {
                         "name": "Todo",
-                        "color": "#60646C",
+                        "color": "#3A3A3A",
                         "sequence": 25000,
                         "group": "unstarted",
                     },
@@ -191,13 +190,13 @@ class ProjectAPIEndpoint(BaseAPIView):
                     },
                     {
                         "name": "Done",
-                        "color": "#46A758",
+                        "color": "#16A34A",
                         "sequence": 45000,
                         "group": "completed",
                     },
                     {
                         "name": "Cancelled",
-                        "color": "#9AA4BC",
+                        "color": "#EF4444",
                         "sequence": 55000,
                         "group": "cancelled",
                     },
@@ -229,7 +228,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                     current_instance=None,
                     actor_id=request.user.id,
                     slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                 )
 
                 serializer = ProjectSerializer(project)
@@ -239,7 +238,7 @@ class ProjectAPIEndpoint(BaseAPIView):
             if "already exists" in str(e):
                 return Response(
                     {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                 )
         except Workspace.DoesNotExist:
             return Response(
@@ -248,7 +247,7 @@ class ProjectAPIEndpoint(BaseAPIView):
         except ValidationError:
             return Response(
                 {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
             )
 
     def patch(self, request, slug, pk):
@@ -259,7 +258,9 @@ class ProjectAPIEndpoint(BaseAPIView):
                 ProjectSerializer(project).data, cls=DjangoJSONEncoder
             )
 
-            intake_view = request.data.get("intake_view", project.intake_view)
+            intake_view = request.data.get(
+                "inbox_view", request.data.get("intake_view", project.intake_view)
+            )
 
             if project.archived_at:
                 return Response(
@@ -287,6 +288,16 @@ class ProjectAPIEndpoint(BaseAPIView):
                             is_default=True,
                         )
 
+                    # Create the triage state in Backlog group
+                    State.objects.get_or_create(
+                        name="Triage",
+                        group="triage",
+                        description="Default state for managing all Intake Issues",
+                        project_id=pk,
+                        color="#ff7700",
+                        is_triage=True,
+                    )
+
                 project = self.get_queryset().filter(pk=serializer.data["id"]).first()
 
                 model_activity.delay(
@@ -296,7 +307,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                     current_instance=current_instance,
                     actor_id=request.user.id,
                     slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                 )
 
                 serializer = ProjectSerializer(project)
@@ -306,7 +317,7 @@ class ProjectAPIEndpoint(BaseAPIView):
             if "already exists" in str(e):
                 return Response(
                     {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                 )
         except (Project.DoesNotExist, Workspace.DoesNotExist):
             return Response(
@@ -315,7 +326,7 @@ class ProjectAPIEndpoint(BaseAPIView):
         except ValidationError:
             return Response(
                 {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
             )
 
     def delete(self, request, slug, pk):
@@ -325,19 +336,6 @@ class ProjectAPIEndpoint(BaseAPIView):
             entity_type="project", entity_identifier=pk, project_id=pk
         ).delete()
         project.delete()
-        webhook_activity.delay(
-            event="project",
-            verb="deleted",
-            field=None,
-            old_value=None,
-            new_value=None,
-            actor_id=request.user.id,
-            slug=slug,
-            current_site=base_host(request=request, is_app=True),
-            event_id=project.id,
-            old_identifier=None,
-            new_identifier=None,
-        )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/serializers/__init__.py

@@ -19,10 +19,6 @@ from .workspace import (
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
     WorkspaceUserPropertiesSerializer,
-    WorkspaceUserLinkSerializer,
-    WorkspaceRecentVisitSerializer,
-    WorkspaceHomePreferenceSerializer,
-    StickySerializer,
 )
 from .project import (
     ProjectSerializer,
@@ -72,8 +68,6 @@ from .issue import (
     IssueReactionLiteSerializer,
     IssueAttachmentLiteSerializer,
     IssueLinkLiteSerializer,
-    IssueVersionDetailSerializer,
-    IssueDescriptionVersionDetailSerializer,
 )
 
 from .module import (
@@ -121,6 +115,8 @@ from .exporter import ExporterHistorySerializer
 
 from .webhook import WebhookSerializer, WebhookLogSerializer
 
+from .dashboard import DashboardSerializer, WidgetSerializer
+
 from .favorite import UserFavoriteSerializer
 
 from .draft import (

apiserver/plane/app/serializers/api.py

@@ -1,7 +1,5 @@
 from .base import BaseSerializer
 from plane.db.models import APIToken, APIActivityLog
-from rest_framework import serializers
-from django.utils import timezone
 
 
 class APITokenSerializer(BaseSerializer):
@@ -19,17 +17,10 @@ class APITokenSerializer(BaseSerializer):
 
 
 class APITokenReadSerializer(BaseSerializer):
-    is_active = serializers.SerializerMethodField()
-
     class Meta:
         model = APIToken
         exclude = ("token",)
 
-    def get_is_active(self, obj: APIToken) -> bool:
-        if obj.expired_at is None:
-            return True
-        return timezone.now() < obj.expired_at
-
 
 class APIActivityLogSerializer(BaseSerializer):
     class Meta:

apiserver/plane/app/serializers/cycle.py

@@ -20,19 +20,12 @@ class CycleWriteSerializer(BaseSerializer):
             data.get("start_date", None) is not None
             and data.get("end_date", None) is not None
         ):
-            project_id = (
-                self.initial_data.get("project_id", None)
-                or (self.instance and self.instance.project_id)
-                or self.context.get("project_id", None)
-            )
+            project_id = self.initial_data.get("project_id") or self.instance.project_id
             data["start_date"] = convert_to_utc(
-                date=str(data.get("start_date").date()),
-                project_id=project_id,
-                is_start_date=True,
+                str(data.get("start_date").date()), project_id, is_start_date=True
             )
             data["end_date"] = convert_to_utc(
-                date=str(data.get("end_date", None).date()),
-                project_id=project_id,
+                str(data.get("end_date", None).date()), project_id
             )
         return data
 

apiserver/plane/app/serializers/dashboard.py

@@ -0,0 +1,21 @@
+# Module imports
+from .base import BaseSerializer
+from plane.db.models import Dashboard, Widget
+
+# Third party frameworks
+from rest_framework import serializers
+
+
+class DashboardSerializer(BaseSerializer):
+    class Meta:
+        model = Dashboard
+        fields = "__all__"
+
+
+class WidgetSerializer(BaseSerializer):
+    is_visible = serializers.BooleanField(read_only=True)
+    widget_filters = serializers.JSONField(read_only=True)
+
+    class Meta:
+        model = Widget
+        fields = ["id", "key", "is_visible", "widget_filters"]

apiserver/plane/app/serializers/issue.py

@@ -2,7 +2,6 @@
 from django.utils import timezone
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
 # Third Party imports
 from rest_framework import serializers
@@ -34,9 +33,6 @@ from plane.db.models import (
     IssueVote,
     IssueRelation,
     State,
-    IssueVersion,
-    IssueDescriptionVersion,
-    ProjectMember,
 )
 
 
@@ -111,23 +107,14 @@ class IssueCreateSerializer(BaseSerializer):
         data["label_ids"] = label_ids if label_ids else []
         return data
 
-    def validate(self, attrs):
+    def validate(self, data):
         if (
-            attrs.get("start_date", None) is not None
-            and attrs.get("target_date", None) is not None
-            and attrs.get("start_date", None) > attrs.get("target_date", None)
+            data.get("start_date", None) is not None
+            and data.get("target_date", None) is not None
+            and data.get("start_date", None) > data.get("target_date", None)
         ):
             raise serializers.ValidationError("Start date cannot exceed target date")
-
-        if attrs.get("assignee_ids", []):
-            attrs["assignee_ids"] = ProjectMember.objects.filter(
-                project_id=self.context["project_id"],
-                role__gte=15,
-                is_active=True,
-                member_id__in=attrs["assignee_ids"],
-            ).values_list("member_id", flat=True)
-
-        return attrs
+        return data
 
     def create(self, validated_data):
         assignees = validated_data.pop("assignee_ids", None)
@@ -145,64 +132,47 @@ class IssueCreateSerializer(BaseSerializer):
         updated_by_id = issue.updated_by_id
 
         if assignees is not None and len(assignees):
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for assignee_id in assignees
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
-        else:
-            # Then assign it to default assignee, if it is a valid assignee
-            if (
-                default_assignee_id is not None
-                and ProjectMember.objects.filter(
-                    member_id=default_assignee_id,
-                    project_id=project_id,
-                    role__gte=15,
-                    is_active=True,
-                ).exists()
-            ):
-                try:
-                    IssueAssignee.objects.create(
-                        assignee_id=default_assignee_id,
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee=user,
                         issue=issue,
                         project_id=project_id,
                         workspace_id=workspace_id,
                         created_by_id=created_by_id,
                         updated_by_id=updated_by_id,
                     )
-                except IntegrityError:
-                    pass
+                    for user in assignees
+                ],
+                batch_size=10,
+            )
+        else:
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
+                IssueAssignee.objects.create(
+                    assignee_id=default_assignee_id,
+                    issue=issue,
+                    project_id=project_id,
+                    workspace_id=workspace_id,
+                    created_by_id=created_by_id,
+                    updated_by_id=updated_by_id,
+                )
 
         if labels is not None and len(labels):
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label=label,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label in labels
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label=label,
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label in labels
+                ],
+                batch_size=10,
+            )
 
         return issue
 
@@ -218,45 +188,37 @@ class IssueCreateSerializer(BaseSerializer):
 
         if assignees is not None:
             IssueAssignee.objects.filter(issue=instance).delete()
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for assignee_id in assignees
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee=user,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for user in assignees
+                ],
+                batch_size=10,
+            )
 
         if labels is not None:
             IssueLabel.objects.filter(issue=instance).delete()
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label=label,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label in labels
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label=label,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label in labels
+                ],
+                batch_size=10,
+            )
 
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()
@@ -268,20 +230,6 @@ class IssueActivitySerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    source_data = serializers.SerializerMethodField()
-
-    def get_source_data(self, obj):
-        if (
-            hasattr(obj, "issue")
-            and hasattr(obj.issue, "source_data")
-            and obj.issue.source_data
-        ):
-            return {
-                "source": obj.issue.source_data[0].source,
-                "source_email": obj.issue.source_data[0].source_email,
-                "extra": obj.issue.source_data[0].extra,
-            }
-        return None
 
     class Meta:
         model = IssueActivity
@@ -333,38 +281,11 @@ class IssueRelationSerializer(BaseSerializer):
     )
     name = serializers.CharField(source="related_issue.name", read_only=True)
     relation_type = serializers.CharField(read_only=True)
-    state_id = serializers.UUIDField(source="related_issue.state.id", read_only=True)
-    priority = serializers.CharField(source="related_issue.priority", read_only=True)
-    assignee_ids = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
-        write_only=True,
-        required=False,
-    )
 
     class Meta:
         model = IssueRelation
-        fields = [
-            "id",
-            "project_id",
-            "sequence_id",
-            "relation_type",
-            "name",
-            "state_id",
-            "priority",
-            "assignee_ids",
-            "created_by",
-            "created_at",
-            "updated_at",
-            "updated_by",
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
-        ]
+        fields = ["id", "project_id", "sequence_id", "relation_type", "name"]
+        read_only_fields = ["workspace", "project"]
 
 
 class RelatedIssueSerializer(BaseSerializer):
@@ -375,38 +296,11 @@ class RelatedIssueSerializer(BaseSerializer):
     sequence_id = serializers.IntegerField(source="issue.sequence_id", read_only=True)
     name = serializers.CharField(source="issue.name", read_only=True)
     relation_type = serializers.CharField(read_only=True)
-    state_id = serializers.UUIDField(source="issue.state.id", read_only=True)
-    priority = serializers.CharField(source="issue.priority", read_only=True)
-    assignee_ids = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
-        write_only=True,
-        required=False,
-    )
 
     class Meta:
         model = IssueRelation
-        fields = [
-            "id",
-            "project_id",
-            "sequence_id",
-            "relation_type",
-            "name",
-            "state_id",
-            "priority",
-            "assignee_ids",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
-        ]
+        fields = ["id", "project_id", "sequence_id", "relation_type", "name"]
+        read_only_fields = ["workspace", "project"]
 
 
 class IssueAssigneeSerializer(BaseSerializer):
@@ -576,7 +470,6 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
             "asset",
             "attributes",
             # "issue_id",
-            "created_by",
             "updated_at",
             "updated_by",
             "asset_url",
@@ -774,64 +667,3 @@ class IssueSubscriberSerializer(BaseSerializer):
         model = IssueSubscriber
         fields = "__all__"
         read_only_fields = ["workspace", "project", "issue"]
-
-
-class IssueVersionDetailSerializer(BaseSerializer):
-    class Meta:
-        model = IssueVersion
-        fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "parent",
-            "state",
-            "estimate_point",
-            "name",
-            "priority",
-            "start_date",
-            "target_date",
-            "assignees",
-            "sequence_id",
-            "labels",
-            "sort_order",
-            "completed_at",
-            "archived_at",
-            "is_draft",
-            "external_source",
-            "external_id",
-            "type",
-            "cycle",
-            "modules",
-            "meta",
-            "name",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-        read_only_fields = ["workspace", "project", "issue"]
-
-
-class IssueDescriptionVersionDetailSerializer(BaseSerializer):
-    class Meta:
-        model = IssueDescriptionVersion
-        fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "description_binary",
-            "description_html",
-            "description_stripped",
-            "description_json",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-        read_only_fields = ["workspace", "project", "issue"]

apiserver/plane/app/serializers/page.py

@@ -54,8 +54,6 @@ class PageSerializer(BaseSerializer):
         labels = validated_data.pop("labels", None)
         project_id = self.context["project_id"]
         owned_by_id = self.context["owned_by_id"]
-        description = self.context["description"]
-        description_binary = self.context["description_binary"]
         description_html = self.context["description_html"]
 
         # Get the workspace id from the project
@@ -64,8 +62,6 @@ class PageSerializer(BaseSerializer):
         # Create the page
         page = Page.objects.create(
             **validated_data,
-            description=description,
-            description_binary=description_binary,
             description_html=description_html,
             owned_by_id=owned_by_id,
             workspace_id=project.workspace_id,

apiserver/plane/app/serializers/project.py

@@ -90,7 +90,17 @@ class ProjectLiteSerializer(BaseSerializer):
 
 
 class ProjectListSerializer(DynamicBaseSerializer):
+    total_issues = serializers.IntegerField(read_only=True)
+    archived_issues = serializers.IntegerField(read_only=True)
+    archived_sub_issues = serializers.IntegerField(read_only=True)
+    draft_issues = serializers.IntegerField(read_only=True)
+    draft_sub_issues = serializers.IntegerField(read_only=True)
+    sub_issues = serializers.IntegerField(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    total_cycles = serializers.IntegerField(read_only=True)
+    total_modules = serializers.IntegerField(read_only=True)
+    is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
     anchor = serializers.CharField(read_only=True)
@@ -103,9 +113,14 @@ class ProjectListSerializer(DynamicBaseSerializer):
         if project_members is not None:
             # Filter members by the project ID
             return [
-                member.member_id
+                {
+                    "id": member.id,
+                    "member_id": member.member_id,
+                    "member__display_name": member.member.display_name,
+                    "member__avatar": member.member.avatar,
+                    "member__avatar_url": member.member.avatar_url,
+                }
                 for member in project_members
-                if member.is_active and not member.member.is_bot
             ]
         return []
 
@@ -119,6 +134,10 @@ class ProjectDetailSerializer(BaseSerializer):
     default_assignee = UserLiteSerializer(read_only=True)
     project_lead = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    total_cycles = serializers.IntegerField(read_only=True)
+    total_modules = serializers.IntegerField(read_only=True)
+    is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
     anchor = serializers.CharField(read_only=True)

apiserver/plane/app/serializers/state.py

@@ -1,13 +1,11 @@
 # Module imports
 from .base import BaseSerializer
-from rest_framework import serializers
+
 
 from plane.db.models import State
 
 
 class StateSerializer(BaseSerializer):
-    order = serializers.FloatField(required=False)
-
     class Meta:
         model = State
         fields = [
@@ -20,7 +18,6 @@ class StateSerializer(BaseSerializer):
             "default",
             "description",
             "sequence",
-            "order",
         ]
         read_only_fields = ["workspace", "project"]
 

apiserver/plane/app/serializers/workspace.py

@@ -1,40 +1,25 @@
 # Third party imports
 from rest_framework import serializers
-from rest_framework import status
-from rest_framework.response import Response
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
 from .user import UserLiteSerializer, UserAdminLiteSerializer
 
-
 from plane.db.models import (
     Workspace,
     WorkspaceMember,
     WorkspaceMemberInvite,
     WorkspaceTheme,
     WorkspaceUserProperties,
-    WorkspaceUserLink,
-    UserRecentVisit,
-    Issue,
-    Page,
-    Project,
-    ProjectMember,
-    WorkspaceHomePreference,
-    Sticky,
-    WorkspaceUserPreference,
 )
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 
-# Django imports
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
-
 
 class WorkSpaceSerializer(DynamicBaseSerializer):
+    owner = UserLiteSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
+    total_issues = serializers.IntegerField(read_only=True)
     logo_url = serializers.CharField(read_only=True)
-    role = serializers.IntegerField(read_only=True)
 
     def validate_slug(self, value):
         # Check if the slug is restricted
@@ -59,7 +44,7 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
 class WorkspaceLiteSerializer(BaseSerializer):
     class Meta:
         model = Workspace
-        fields = ["name", "slug", "id", "logo_url"]
+        fields = ["name", "slug", "id"]
         read_only_fields = fields
 
 
@@ -90,11 +75,9 @@ class WorkspaceMemberAdminSerializer(DynamicBaseSerializer):
 
 
 class WorkSpaceMemberInviteSerializer(BaseSerializer):
-    workspace = WorkspaceLiteSerializer(read_only=True)
-    invite_link = serializers.SerializerMethodField()
-
-    def get_invite_link(self, obj):
-        return f"/workspace-invitations/?invitation_id={obj.id}&email={obj.email}&slug={obj.workspace.slug}"
+    workspace = WorkSpaceSerializer(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = WorkspaceMemberInvite
@@ -108,7 +91,6 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
             "responded_at",
             "created_at",
             "updated_at",
-            "invite_link",
         ]
 
 
@@ -124,181 +106,3 @@ class WorkspaceUserPropertiesSerializer(BaseSerializer):
         model = WorkspaceUserProperties
         fields = "__all__"
         read_only_fields = ["workspace", "user"]
-
-
-class WorkspaceUserLinkSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserLink
-        fields = "__all__"
-        read_only_fields = ["workspace", "owner"]
-
-    def to_internal_value(self, data):
-        url = data.get("url", "")
-        if url and not url.startswith(("http://", "https://")):
-            data["url"] = "http://" + url
-
-        return super().to_internal_value(data)
-
-    def validate_url(self, value):
-        url_validator = URLValidator()
-        try:
-            url_validator(value)
-        except ValidationError:
-            raise serializers.ValidationError({"error": "Invalid URL format."})
-
-        return value
-
-    def create(self, validated_data):
-        # Filtering the WorkspaceUserLink with the given url to check if the link already exists.
-
-        url = validated_data.get("url")
-
-        workspace_user_link = WorkspaceUserLink.objects.filter(
-            url=url,
-            workspace_id=validated_data.get("workspace_id"),
-            owner_id=validated_data.get("owner_id"),
-        )
-
-        if workspace_user_link.exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this workspace and owner"}
-            )
-
-        return super().create(validated_data)
-
-    def update(self, instance, validated_data):
-        # Filtering the WorkspaceUserLink with the given url to check if the link already exists.
-
-        url = validated_data.get("url")
-
-        workspace_user_link = WorkspaceUserLink.objects.filter(
-            url=url, workspace_id=instance.workspace_id, owner=instance.owner
-        )
-
-        if workspace_user_link.exclude(pk=instance.id).exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this workspace and owner"}
-            )
-
-        return super().update(instance, validated_data)
-
-
-class IssueRecentVisitSerializer(serializers.ModelSerializer):
-    project_identifier = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "name",
-            "state",
-            "priority",
-            "assignees",
-            "type",
-            "sequence_id",
-            "project_id",
-            "project_identifier",
-        ]
-
-    def get_project_identifier(self, obj):
-        project = obj.project
-
-        return project.identifier if project else None
-
-
-class ProjectRecentVisitSerializer(serializers.ModelSerializer):
-    project_members = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Project
-        fields = ["id", "name", "logo_props", "project_members", "identifier"]
-
-    def get_project_members(self, obj):
-        members = ProjectMember.objects.filter(
-            project_id=obj.id, member__is_bot=False, is_active=True
-        ).values_list("member", flat=True)
-
-        return members
-
-
-class PageRecentVisitSerializer(serializers.ModelSerializer):
-    project_id = serializers.SerializerMethodField()
-    project_identifier = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Page
-        fields = [
-            "id",
-            "name",
-            "logo_props",
-            "project_id",
-            "owned_by",
-            "project_identifier",
-        ]
-
-    def get_project_id(self, obj):
-        return (
-            obj.project_id
-            if hasattr(obj, "project_id")
-            else obj.projects.values_list("id", flat=True).first()
-        )
-
-    def get_project_identifier(self, obj):
-        project = obj.projects.first()
-
-        return project.identifier if project else None
-
-
-def get_entity_model_and_serializer(entity_type):
-    entity_map = {
-        "issue": (Issue, IssueRecentVisitSerializer),
-        "page": (Page, PageRecentVisitSerializer),
-        "project": (Project, ProjectRecentVisitSerializer),
-    }
-    return entity_map.get(entity_type, (None, None))
-
-
-class WorkspaceRecentVisitSerializer(BaseSerializer):
-    entity_data = serializers.SerializerMethodField()
-
-    class Meta:
-        model = UserRecentVisit
-        fields = ["id", "entity_name", "entity_identifier", "entity_data", "visited_at"]
-        read_only_fields = ["workspace", "owner", "created_by", "updated_by"]
-
-    def get_entity_data(self, obj):
-        entity_name = obj.entity_name
-        entity_identifier = obj.entity_identifier
-
-        entity_model, entity_serializer = get_entity_model_and_serializer(entity_name)
-
-        if entity_model and entity_serializer:
-            try:
-                entity = entity_model.objects.get(pk=entity_identifier)
-
-                return entity_serializer(entity).data
-            except entity_model.DoesNotExist:
-                return None
-        return None
-
-
-class WorkspaceHomePreferenceSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceHomePreference
-        fields = ["key", "is_enabled", "sort_order"]
-        read_only_fields = ["workspace", "created_by", "updated_by"]
-
-
-class StickySerializer(BaseSerializer):
-    class Meta:
-        model = Sticky
-        fields = "__all__"
-        read_only_fields = ["workspace", "owner"]
-        extra_kwargs = {"name": {"required": False}}
-
-
-class WorkspaceUserPreferenceSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserPreference
-        fields = ["key", "is_pinned", "sort_order"]
-        read_only_fields = ["workspace", "created_by", "updated_by"]

apiserver/plane/app/urls/__init__.py

@@ -2,6 +2,7 @@ from .analytic import urlpatterns as analytic_urls
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
 from .cycle import urlpatterns as cycle_urls
+from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
 from .intake import urlpatterns as intake_urls
@@ -22,6 +23,7 @@ urlpatterns = [
     *analytic_urls,
     *asset_urls,
     *cycle_urls,
+    *dashboard_urls,
     *estimate_urls,
     *external_urls,
     *intake_urls,

apiserver/plane/app/urls/analytic.py

@@ -6,14 +6,7 @@ from plane.app.views import (
     AnalyticViewViewset,
     SavedAnalyticEndpoint,
     ExportAnalyticsEndpoint,
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
     DefaultAnalyticsEndpoint,
-    ProjectStatsEndpoint,
-    ProjectAdvanceAnalyticsEndpoint,
-    ProjectAdvanceAnalyticsStatsEndpoint,
-    ProjectAdvanceAnalyticsChartEndpoint,
 )
 
 
@@ -50,39 +43,4 @@ urlpatterns = [
         DefaultAnalyticsEndpoint.as_view(),
         name="default-analytics",
     ),
-    path(
-        "workspaces/<str:slug>/project-stats/",
-        ProjectStatsEndpoint.as_view(),
-        name="project-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics/",
-        AdvanceAnalyticsEndpoint.as_view(),
-        name="advance-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-stats/",
-        AdvanceAnalyticsStatsEndpoint.as_view(),
-        name="advance-analytics-stats",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-charts/",
-        AdvanceAnalyticsChartEndpoint.as_view(),
-        name="advance-analytics-chart",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics/",
-        ProjectAdvanceAnalyticsEndpoint.as_view(),
-        name="project-advance-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-stats/",
-        ProjectAdvanceAnalyticsStatsEndpoint.as_view(),
-        name="project-advance-analytics-stats",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-charts/",
-        ProjectAdvanceAnalyticsChartEndpoint.as_view(),
-        name="project-advance-analytics-chart",
-    ),
 ]

apiserver/plane/app/urls/dashboard.py

@@ -0,0 +1,23 @@
+from django.urls import path
+
+
+from plane.app.views import DashboardEndpoint, WidgetsEndpoint
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/dashboard/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "workspaces/<str:slug>/dashboard/<uuid:dashboard_id>/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "dashboard/<uuid:dashboard_id>/widgets/<uuid:widget_id>/",
+        WidgetsEndpoint.as_view(),
+        name="widgets",
+    ),
+]

apiserver/plane/app/urls/intake.py

@@ -1,11 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
-    IntakeViewSet,
-    IntakeIssueViewSet,
-    IntakeWorkItemDescriptionVersionEndpoint,
-)
+from plane.app.views import IntakeViewSet, IntakeIssueViewSet
 
 
 urlpatterns = [
@@ -57,14 +53,4 @@ urlpatterns = [
         ),
         name="inbox-issue",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-work-items/<uuid:work_item_id>/description-versions/",
-        IntakeWorkItemDescriptionVersionEndpoint.as_view(),
-        name="intake-work-item-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-work-items/<uuid:work_item_id>/description-versions/<uuid:pk>/",
-        IntakeWorkItemDescriptionVersionEndpoint.as_view(),
-        name="intake-work-item-versions",
-    ),
 ]

apiserver/plane/app/urls/issue.py

@@ -24,10 +24,6 @@ from plane.app.views import (
     IssueDetailEndpoint,
     IssueAttachmentV2Endpoint,
     IssueBulkUpdateDateEndpoint,
-    IssueVersionEndpoint,
-    WorkItemDescriptionVersionEndpoint,
-    IssueMetaEndpoint,
-    IssueDetailIdentifierEndpoint,
 )
 
 urlpatterns = [
@@ -260,34 +256,4 @@ urlpatterns = [
         IssueBulkUpdateDateEndpoint.as_view(),
         name="project-issue-dates",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/versions/",
-        IssueVersionEndpoint.as_view(),
-        name="issue-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/versions/<uuid:pk>/",
-        IssueVersionEndpoint.as_view(),
-        name="issue-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/work-items/<uuid:work_item_id>/description-versions/",
-        WorkItemDescriptionVersionEndpoint.as_view(),
-        name="work-item-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/work-items/<uuid:work_item_id>/description-versions/<uuid:pk>/",
-        WorkItemDescriptionVersionEndpoint.as_view(),
-        name="work-item-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/meta/",
-        IssueMetaEndpoint.as_view(),
-        name="issue-meta",
-    ),
-    path(
-        "workspaces/<str:slug>/work-items/<str:project_identifier>-<str:issue_identifier>/",
-        IssueDetailIdentifierEndpoint.as_view(),
-        name="issue-detail-identifier",
-    ),
 ]

apiserver/plane/app/urls/page.py

@@ -8,7 +8,6 @@ from plane.app.views import (
     SubPagesEndpoint,
     PagesDescriptionViewSet,
     PageVersionEndpoint,
-    PageDuplicateEndpoint,
 )
 
 
@@ -79,9 +78,4 @@ urlpatterns = [
         PageVersionEndpoint.as_view(),
         name="page-versions",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/duplicate/",
-        PageDuplicateEndpoint.as_view(),
-        name="page-duplicate",
-    ),
 ]

apiserver/plane/app/urls/project.py

@@ -23,11 +23,6 @@ urlpatterns = [
         ProjectViewSet.as_view({"get": "list", "post": "create"}),
         name="project",
     ),
-    path(
-        "workspaces/<str:slug>/projects/details/",
-        ProjectViewSet.as_view({"get": "list_detail"}),
-        name="project",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:pk>/",
         ProjectViewSet.as_view(

apiserver/plane/app/urls/workspace.py

@@ -27,11 +27,6 @@ from plane.app.views import (
     WorkspaceFavoriteEndpoint,
     WorkspaceFavoriteGroupEndpoint,
     WorkspaceDraftIssueViewSet,
-    QuickLinkViewSet,
-    UserRecentVisitViewSet,
-    WorkspaceHomePreferenceViewSet,
-    WorkspaceStickyViewSet,
-    WorkspaceUserPreferenceViewSet,
 )
 
 
@@ -218,56 +213,4 @@ urlpatterns = [
         WorkspaceDraftIssueViewSet.as_view({"post": "create_draft_to_issue"}),
         name="workspace-drafts-issues",
     ),
-    # quick link
-    path(
-        "workspaces/<str:slug>/quick-links/",
-        QuickLinkViewSet.as_view({"get": "list", "post": "create"}),
-        name="workspace-quick-links",
-    ),
-    path(
-        "workspaces/<str:slug>/quick-links/<uuid:pk>/",
-        QuickLinkViewSet.as_view(
-            {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
-        ),
-        name="workspace-quick-links",
-    ),
-    # Widgets
-    path(
-        "workspaces/<str:slug>/home-preferences/",
-        WorkspaceHomePreferenceViewSet.as_view(),
-        name="workspace-home-preference",
-    ),
-    path(
-        "workspaces/<str:slug>/home-preferences/<str:key>/",
-        WorkspaceHomePreferenceViewSet.as_view(),
-        name="workspace-home-preference",
-    ),
-    path(
-        "workspaces/<str:slug>/recent-visits/",
-        UserRecentVisitViewSet.as_view({"get": "list"}),
-        name="workspace-recent-visits",
-    ),
-    path(
-        "workspaces/<str:slug>/stickies/",
-        WorkspaceStickyViewSet.as_view({"get": "list", "post": "create"}),
-        name="workspace-sticky",
-    ),
-    path(
-        "workspaces/<str:slug>/stickies/<uuid:pk>/",
-        WorkspaceStickyViewSet.as_view(
-            {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
-        ),
-        name="workspace-sticky",
-    ),
-    # User Preference
-    path(
-        "workspaces/<str:slug>/sidebar-preferences/",
-        WorkspaceUserPreferenceViewSet.as_view(),
-        name="workspace-user-preference",
-    ),
-    path(
-        "workspaces/<str:slug>/sidebar-preferences/<str:key>/",
-        WorkspaceUserPreferenceViewSet.as_view(),
-        name="workspace-user-preference",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -41,14 +41,10 @@ from .workspace.base import (
 
 from .workspace.draft import WorkspaceDraftIssueViewSet
 
-from .workspace.home import WorkspaceHomePreferenceViewSet
-
 from .workspace.favorite import (
     WorkspaceFavoriteEndpoint,
     WorkspaceFavoriteGroupEndpoint,
 )
-from .workspace.recent_visit import UserRecentVisitViewSet
-from .workspace.user_preference import WorkspaceUserPreferenceViewSet
 
 from .workspace.member import (
     WorkSpaceMemberViewSet,
@@ -76,8 +72,6 @@ from .workspace.user import (
 from .workspace.estimate import WorkspaceEstimatesEndpoint
 from .workspace.module import WorkspaceModulesEndpoint
 from .workspace.cycle import WorkspaceCyclesEndpoint
-from .workspace.quick_link import QuickLinkViewSet
-from .workspace.sticky import WorkspaceStickyViewSet
 
 from .state.base import StateViewSet
 from .view.base import (
@@ -116,8 +110,6 @@ from .issue.base import (
     IssuePaginatedViewSet,
     IssueDetailEndpoint,
     IssueBulkUpdateDateEndpoint,
-    IssueMetaEndpoint,
-    IssueDetailIdentifierEndpoint,
 )
 
 from .issue.activity import IssueActivityEndpoint
@@ -144,8 +136,6 @@ from .issue.sub_issue import SubIssuesEndpoint
 
 from .issue.subscriber import IssueSubscriberViewSet
 
-from .issue.version import IssueVersionEndpoint, WorkItemDescriptionVersionEndpoint
-
 from .module.base import (
     ModuleViewSet,
     ModuleLinkViewSet,
@@ -165,7 +155,6 @@ from .page.base import (
     PageLogEndpoint,
     SubPagesEndpoint,
     PagesDescriptionViewSet,
-    PageDuplicateEndpoint,
 )
 from .page.version import PageVersionEndpoint
 
@@ -184,11 +173,7 @@ from .estimate.base import (
     EstimatePointEndpoint,
 )
 
-from .intake.base import (
-    IntakeViewSet,
-    IntakeIssueViewSet,
-    IntakeWorkItemDescriptionVersionEndpoint,
-)
+from .intake.base import IntakeViewSet, IntakeIssueViewSet
 
 from .analytic.base import (
     AnalyticsEndpoint,
@@ -196,19 +181,6 @@ from .analytic.base import (
     SavedAnalyticEndpoint,
     ExportAnalyticsEndpoint,
     DefaultAnalyticsEndpoint,
-    ProjectStatsEndpoint,
-)
-
-from .analytic.advance import (
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
-)
-
-from .analytic.project_analytics import (
-    ProjectAdvanceAnalyticsEndpoint,
-    ProjectAdvanceAnalyticsStatsEndpoint,
-    ProjectAdvanceAnalyticsChartEndpoint,
 )
 
 from .notification.base import (
@@ -226,6 +198,8 @@ from .webhook.base import (
     WebhookSecretRegenerateEndpoint,
 )
 
+from .dashboard.base import DashboardEndpoint, WidgetsEndpoint
+
 from .error_404 import custom_404_view
 
 from .notification.base import MarkAllReadNotificationViewSet

apiserver/plane/app/views/analytic/advance.py

@@ -1,366 +0,0 @@
-from rest_framework.response import Response
-from rest_framework import status
-from typing import Dict, List, Any
-from django.db.models import QuerySet, Q, Count
-from django.http import HttpRequest
-from django.db.models.functions import TruncMonth
-from django.utils import timezone
-from plane.app.views.base import BaseAPIView
-from plane.app.permissions import ROLE, allow_permission
-from plane.db.models import (
-    WorkspaceMember,
-    Project,
-    Issue,
-    Cycle,
-    Module,
-    IssueView,
-    ProjectPage,
-    Workspace,
-    CycleIssue,
-    ModuleIssue,
-    ProjectMember,
-)
-from plane.utils.build_chart import build_analytics_chart
-from plane.utils.date_utils import (
-    get_analytics_filters,
-)
-
-
-class AdvanceAnalyticsBaseView(BaseAPIView):
-    def initialize_workspace(self, slug: str, type: str) -> None:
-        self._workspace_slug = slug
-        self.filters = get_analytics_filters(
-            slug=slug,
-            type=type,
-            user=self.request.user,
-            date_filter=self.request.GET.get("date_filter", None),
-            project_ids=self.request.GET.get("project_ids", None),
-        )
-
-
-class AdvanceAnalyticsEndpoint(AdvanceAnalyticsBaseView):
-    def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:
-        def get_filtered_count() -> int:
-            if self.filters["analytics_date_range"]:
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["current"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["current"][
-                        "lte"
-                    ],
-                ).count()
-            return queryset.count()
-
-        def get_previous_count() -> int:
-            if self.filters["analytics_date_range"] and self.filters[
-                "analytics_date_range"
-            ].get("previous"):
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["previous"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["previous"][
-                        "lte"
-                    ],
-                ).count()
-            return 0
-
-        return {
-            "count": get_filtered_count(),
-            # "filter_count": get_previous_count(),
-        }
-
-    def get_overview_data(self) -> Dict[str, Dict[str, int]]:
-        members_query = WorkspaceMember.objects.filter(
-            workspace__slug=self._workspace_slug, is_active=True
-        )
-
-        if self.request.GET.get("project_ids", None):
-            project_ids = self.request.GET.get("project_ids", None)
-            project_ids = [str(project_id) for project_id in project_ids.split(",")]
-            members_query = ProjectMember.objects.filter(
-                project_id__in=project_ids, is_active=True
-            )
-
-        return {
-            "total_users": self.get_filtered_counts(members_query),
-            "total_admins": self.get_filtered_counts(
-                members_query.filter(role=ROLE.ADMIN.value)
-            ),
-            "total_members": self.get_filtered_counts(
-                members_query.filter(role=ROLE.MEMBER.value)
-            ),
-            "total_guests": self.get_filtered_counts(
-                members_query.filter(role=ROLE.GUEST.value)
-            ),
-            "total_projects": self.get_filtered_counts(
-                Project.objects.filter(**self.filters["project_filters"])
-            ),
-            "total_work_items": self.get_filtered_counts(
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-            ),
-            "total_cycles": self.get_filtered_counts(
-                Cycle.objects.filter(**self.filters["base_filters"])
-            ),
-            "total_intake": self.get_filtered_counts(
-                Issue.objects.filter(**self.filters["base_filters"]).filter(
-                    issue_intake__status__in=["-2", "0"]
-                )
-            ),
-        }
-
-    def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        return {
-            "total_work_items": self.get_filtered_counts(base_queryset),
-            "started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="started")
-            ),
-            "backlog_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="backlog")
-            ),
-            "un_started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="unstarted")
-            ),
-            "completed_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="completed")
-            ),
-        }
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="analytics")
-        tab = request.GET.get("tab", "overview")
-
-        if tab == "overview":
-            return Response(
-                self.get_overview_data(),
-                status=status.HTTP_200_OK,
-            )
-        elif tab == "work-items":
-            return Response(
-                self.get_work_items_stats(),
-                status=status.HTTP_200_OK,
-            )
-        return Response({"message": "Invalid tab"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):
-    def get_project_issues_stats(self) -> QuerySet:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            base_queryset = base_queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        return (
-            base_queryset.values("project_id", "project__name").annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        return (
-            base_queryset
-            .values("project_id", "project__name")
-            .annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "work-items")
-
-        if type == "work-items":
-            return Response(
-                self.get_work_items_stats(),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):
-    def project_chart(self) -> List[Dict[str, Any]]:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        date_filter = {}
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            date_filter = {
-                "created_at__date__gte": start_date,
-                "created_at__date__lte": end_date,
-            }
-
-        total_work_items = base_queryset.filter(**date_filter).count()
-        total_cycles = Cycle.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_modules = Module.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_intake = Issue.objects.filter(
-            issue_intake__isnull=False, **self.filters["base_filters"], **date_filter
-        ).count()
-        total_members = WorkspaceMember.objects.filter(
-            workspace__slug=self._workspace_slug, is_active=True, **date_filter
-        ).count()
-        total_pages = ProjectPage.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_views = IssueView.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-
-        data = {
-            "work_items": total_work_items,
-            "cycles": total_cycles,
-            "modules": total_modules,
-            "intake": total_intake,
-            "members": total_members,
-            "pages": total_pages,
-            "views": total_views,
-        }
-
-        return [
-            {
-                "key": key,
-                "name": key.replace("_", " ").title(),
-                "count": value or 0,
-            }
-            for key, value in data.items()
-        ]
-
-    def work_item_completion_chart(self) -> Dict[str, Any]:
-        # Get the base queryset
-        queryset = (
-            Issue.issue_objects.filter(**self.filters["base_filters"])
-            .select_related("workspace", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
-        )
-
-        workspace = Workspace.objects.get(slug=self._workspace_slug)
-        start_date = workspace.created_at.date().replace(day=1)
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            queryset = queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        # Annotate by month and count
-        monthly_stats = (
-            queryset.annotate(month=TruncMonth("created_at"))
-            .values("month")
-            .annotate(
-                created_count=Count("id"),
-                completed_count=Count("id", filter=Q(state__group="completed")),
-            )
-            .order_by("month")
-        )
-
-        # Create dictionary of month -> counts
-        stats_dict = {
-            stat["month"].strftime("%Y-%m-%d"): {
-                "created_count": stat["created_count"],
-                "completed_count": stat["completed_count"],
-            }
-            for stat in monthly_stats
-        }
-
-        # Generate monthly data (ensure months with 0 count are included)
-        data = []
-        # include the current date at the end
-        end_date = timezone.now().date()
-        last_month = end_date.replace(day=1)
-        current_month = start_date
-
-        while current_month <= last_month:
-            date_str = current_month.strftime("%Y-%m-%d")
-            stats = stats_dict.get(date_str, {"created_count": 0, "completed_count": 0})
-            data.append(
-                {
-                    "key": date_str,
-                    "name": date_str,
-                    "count": stats["created_count"],
-                    "completed_issues": stats["completed_count"],
-                    "created_issues": stats["created_count"],
-                }
-            )
-            # Move to next month
-            if current_month.month == 12:
-                current_month = current_month.replace(
-                    year=current_month.year + 1, month=1
-                )
-            else:
-                current_month = current_month.replace(month=current_month.month + 1)
-
-        schema = {
-            "completed_issues": "completed_issues",
-            "created_issues": "created_issues",
-        }
-
-        return {"data": data, "schema": schema}
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "projects")
-        group_by = request.GET.get("group_by", None)
-        x_axis = request.GET.get("x_axis", "PRIORITY")
-
-        if type == "projects":
-            return Response(self.project_chart(), status=status.HTTP_200_OK)
-
-        elif type == "custom-work-items":
-            queryset = (
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-                .select_related("workspace", "state", "parent")
-                .prefetch_related(
-                    "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-                )
-            )
-
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            return Response(
-                build_analytics_chart(queryset, x_axis, group_by),
-                status=status.HTTP_200_OK,
-            )
-
-        elif type == "work-items":
-            return Response(
-                self.work_item_completion_chart(),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)

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

@@ -3,7 +3,7 @@ from django.db.models import Count, F, Sum, Q
 from django.db.models.functions import ExtractMonth
 from django.utils import timezone
 from django.db.models.functions import Concat
-from django.db.models import Case, When, Value, OuterRef, Func
+from django.db.models import Case, When, Value
 from django.db import models
 
 # Third party imports
@@ -15,16 +15,7 @@ from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import AnalyticViewSerializer
 from plane.app.views.base import BaseAPIView, BaseViewSet
 from plane.bgtasks.analytic_plot_export import analytic_export_task
-from plane.db.models import (
-    AnalyticView,
-    Issue,
-    Workspace,
-    Project,
-    ProjectMember,
-    Cycle,
-    Module,
-)
-
+from plane.db.models import AnalyticView, Issue, Workspace
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
 from plane.app.permissions import allow_permission, ROLE
@@ -450,74 +441,3 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
             },
             status=status.HTTP_200_OK,
         )
-
-
-class ProjectStatsEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug):
-        fields = request.GET.get("fields", "").split(",")
-        project_ids = request.GET.get("project_ids", "")
-
-        valid_fields = {
-            "total_issues",
-            "completed_issues",
-            "total_members",
-            "total_cycles",
-            "total_modules",
-        }
-        requested_fields = set(filter(None, fields)) & valid_fields
-
-        if not requested_fields:
-            requested_fields = valid_fields
-
-        projects = Project.objects.filter(workspace__slug=slug)
-        if project_ids:
-            projects = projects.filter(id__in=project_ids.split(","))
-
-        annotations = {}
-        if "total_issues" in requested_fields:
-            annotations["total_issues"] = (
-                Issue.issue_objects.filter(project_id=OuterRef("pk"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "completed_issues" in requested_fields:
-            annotations["completed_issues"] = (
-                Issue.issue_objects.filter(
-                    project_id=OuterRef("pk"), state__group="completed"
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_cycles" in requested_fields:
-            annotations["total_cycles"] = (
-                Cycle.objects.filter(project_id=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_modules" in requested_fields:
-            annotations["total_modules"] = (
-                Module.objects.filter(project_id=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_members" in requested_fields:
-            annotations["total_members"] = (
-                ProjectMember.objects.filter(
-                    project_id=OuterRef("id"), member__is_bot=False, is_active=True
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        projects = projects.annotate(**annotations).values("id", *requested_fields)
-        return Response(projects, status=status.HTTP_200_OK)

apiserver/plane/app/views/analytic/project_analytics.py

@@ -1,421 +0,0 @@
-from rest_framework.response import Response
-from rest_framework import status
-from typing import Dict, Any
-from django.db.models import QuerySet, Q, Count
-from django.http import HttpRequest
-from django.db.models.functions import TruncMonth
-from django.utils import timezone
-from datetime import timedelta
-from plane.app.views.base import BaseAPIView
-from plane.app.permissions import ROLE, allow_permission
-from plane.db.models import (
-    Project,
-    Issue,
-    Cycle,
-    Module,
-    CycleIssue,
-    ModuleIssue,
-)
-from django.db import models
-from django.db.models import F, Case, When, Value
-from django.db.models.functions import Concat
-from plane.utils.build_chart import build_analytics_chart
-from plane.utils.date_utils import (
-    get_analytics_filters,
-)
-
-
-class ProjectAdvanceAnalyticsBaseView(BaseAPIView):
-    def initialize_workspace(self, slug: str, type: str) -> None:
-        self._workspace_slug = slug
-        self.filters = get_analytics_filters(
-            slug=slug,
-            type=type,
-            user=self.request.user,
-            date_filter=self.request.GET.get("date_filter", None),
-            project_ids=self.request.GET.get("project_ids", None),
-        )
-
-
-class ProjectAdvanceAnalyticsEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:
-        def get_filtered_count() -> int:
-            if self.filters["analytics_date_range"]:
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["current"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["current"][
-                        "lte"
-                    ],
-                ).count()
-            return queryset.count()
-
-        return {
-            "count": get_filtered_count(),
-        }
-
-    def get_work_items_stats(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Dict[str, int]]:
-        """
-        Returns work item stats for the workspace, or filtered by cycle_id or module_id if provided.
-        """
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        else:
-            base_queryset = Issue.issue_objects.filter(
-                **self.filters["base_filters"], project_id=project_id
-            )
-
-        return {
-            "total_work_items": self.get_filtered_counts(base_queryset),
-            "started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="started")
-            ),
-            "backlog_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="backlog")
-            ),
-            "un_started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="unstarted")
-            ),
-            "completed_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="completed")
-            ),
-        }
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="analytics")
-
-        # Optionally accept cycle_id or module_id as query params
-        cycle_id = request.GET.get("cycle_id", None)
-        module_id = request.GET.get("module_id", None)
-        return Response(
-            self.get_work_items_stats(
-                cycle_id=cycle_id, module_id=module_id, project_id=project_id
-            ),
-            status=status.HTTP_200_OK,
-        )
-
-
-class ProjectAdvanceAnalyticsStatsEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def get_project_issues_stats(self) -> QuerySet:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            base_queryset = base_queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        return (
-            base_queryset.values("project_id", "project__name")
-            .annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    def get_work_items_stats(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Dict[str, int]]:
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        else:
-            base_queryset = Issue.issue_objects.filter(
-                **self.filters["base_filters"], project_id=project_id
-            )
-        return (
-            base_queryset.annotate(display_name=F("assignees__display_name"))
-            .annotate(assignee_id=F("assignees__id"))
-            .annotate(avatar=F("assignees__avatar"))
-            .annotate(
-                avatar_url=Case(
-                    # If `avatar_asset` exists, use it to generate the asset URL
-                    When(
-                        assignees__avatar_asset__isnull=False,
-                        then=Concat(
-                            Value("/api/assets/v2/static/"),
-                            "assignees__avatar_asset",  # Assuming avatar_asset has an id or relevant field
-                            Value("/"),
-                        ),
-                    ),
-                    # If `avatar_asset` is None, fall back to using `avatar` field directly
-                    When(
-                        assignees__avatar_asset__isnull=True, then="assignees__avatar"
-                    ),
-                    default=Value(None),
-                    output_field=models.CharField(),
-                )
-            )
-            .values("display_name", "assignee_id", "avatar_url")
-            .annotate(
-                cancelled_work_items=Count(
-                    "id", filter=Q(state__group="cancelled"), distinct=True
-                ),
-                completed_work_items=Count(
-                    "id", filter=Q(state__group="completed"), distinct=True
-                ),
-                backlog_work_items=Count(
-                    "id", filter=Q(state__group="backlog"), distinct=True
-                ),
-                un_started_work_items=Count(
-                    "id", filter=Q(state__group="unstarted"), distinct=True
-                ),
-                started_work_items=Count(
-                    "id", filter=Q(state__group="started"), distinct=True
-                ),
-            )
-            .order_by("display_name")
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "work-items")
-
-        if type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-            return Response(
-                self.get_work_items_stats(
-                    project_id=project_id, cycle_id=cycle_id, module_id=module_id
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class ProjectAdvanceAnalyticsChartEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def work_item_completion_chart(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Any]:
-        # Get the base queryset
-        queryset = (
-            Issue.issue_objects.filter(**self.filters["base_filters"])
-            .filter(project_id=project_id)
-            .select_related("workspace", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
-        )
-
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            cycle = Cycle.objects.filter(id=cycle_id).first()
-            if cycle and cycle.start_date:
-                start_date = cycle.start_date.date()
-                end_date = cycle.end_date.date()
-            else:
-                return {"data": [], "schema": {}}
-            queryset = cycle_issues
-
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            module = Module.objects.filter(id=module_id).first()
-            if module and module.start_date:
-                start_date = module.start_date
-                end_date = module.target_date
-            else:
-                return {"data": [], "schema": {}}
-            queryset = module_issues
-
-        else:
-            project = Project.objects.filter(id=project_id).first()
-            if project.created_at:
-                start_date = project.created_at.date().replace(day=1)
-            else:
-                return {"data": [], "schema": {}}
-
-        if cycle_id or module_id:
-            # Get daily stats with optimized query
-            daily_stats = (
-                queryset.values("created_at__date")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count(
-                        "id", filter=Q(issue__state__group="completed")
-                    ),
-                )
-                .order_by("created_at__date")
-            )
-
-            # Create a dictionary of existing stats with summed counts
-            stats_dict = {
-                stat["created_at__date"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in daily_stats
-            }
-
-            # Generate data for all days in the range
-            data = []
-            current_date = start_date
-            while current_date <= end_date:
-                date_str = current_date.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"] + stats["completed_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                current_date += timedelta(days=1)
-        else:
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            # Annotate by month and count
-            monthly_stats = (
-                queryset.annotate(month=TruncMonth("created_at"))
-                .values("month")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count("id", filter=Q(state__group="completed")),
-                )
-                .order_by("month")
-            )
-
-            # Create dictionary of month -> counts
-            stats_dict = {
-                stat["month"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in monthly_stats
-            }
-
-            # Generate monthly data (ensure months with 0 count are included)
-            data = []
-            # include the current date at the end
-            end_date = timezone.now().date()
-            last_month = end_date.replace(day=1)
-            current_month = start_date
-
-            while current_month <= last_month:
-                date_str = current_month.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                # Move to next month
-                if current_month.month == 12:
-                    current_month = current_month.replace(
-                        year=current_month.year + 1, month=1
-                    )
-                else:
-                    current_month = current_month.replace(month=current_month.month + 1)
-
-        schema = {
-            "completed_issues": "completed_issues",
-            "created_issues": "created_issues",
-        }
-
-        return {"data": data, "schema": schema}
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "projects")
-        group_by = request.GET.get("group_by", None)
-        x_axis = request.GET.get("x_axis", "PRIORITY")
-        cycle_id = request.GET.get("cycle_id", None)
-        module_id = request.GET.get("module_id", None)
-
-        if type == "custom-work-items":
-            queryset = (
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-                .filter(project_id=project_id)
-                .select_related("workspace", "state", "parent")
-                .prefetch_related(
-                    "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-                )
-            )
-
-            # Apply cycle/module filters if present
-            if cycle_id is not None:
-                cycle_issues = CycleIssue.objects.filter(
-                    **self.filters["base_filters"], cycle_id=cycle_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=cycle_issues)
-
-            elif module_id is not None:
-                module_issues = ModuleIssue.objects.filter(
-                    **self.filters["base_filters"], module_id=module_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=module_issues)
-
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            return Response(
-                build_analytics_chart(queryset, x_axis, group_by),
-                status=status.HTTP_200_OK,
-            )
-
-        elif type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-
-            return Response(
-                self.work_item_completion_chart(
-                    project_id=project_id, cycle_id=cycle_id, module_id=module_id
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)

apiserver/plane/app/views/api.py

@@ -9,11 +9,11 @@ from rest_framework import status
 from .base import BaseAPIView
 from plane.db.models import APIToken, Workspace
 from plane.app.serializers import APITokenSerializer, APITokenReadSerializer
-from plane.app.permissions import WorkspaceEntityPermission
+from plane.app.permissions import WorkspaceOwnerPermission
 
 
 class ApiTokenEndpoint(BaseAPIView):
-    permission_classes = [WorkspaceEntityPermission]
+    permission_classes = [WorkspaceOwnerPermission]
 
     def post(self, request, slug):
         label = request.data.get("label", str(uuid4().hex))
@@ -68,7 +68,7 @@ class ApiTokenEndpoint(BaseAPIView):
 
 
 class ServiceApiTokenEndpoint(BaseAPIView):
-    permission_classes = [WorkspaceEntityPermission]
+    permission_classes = [WorkspaceOwnerPermission]
 
     def post(self, request, slug):
         workspace = Workspace.objects.get(slug=slug)

apiserver/plane/app/views/asset/v2.py

@@ -5,7 +5,6 @@ import uuid
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.utils import timezone
-from django.db import IntegrityError
 
 # Third party imports
 from rest_framework import status
@@ -137,7 +136,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
         if type not in allowed_types:
             return Response(
                 {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                     "status": False,
                 },
                 status=status.HTTP_400_BAD_REQUEST,
@@ -351,7 +350,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
         if type not in allowed_types:
             return Response(
                 {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                     "status": False,
                 },
                 status=status.HTTP_400_BAD_REQUEST,
@@ -552,7 +551,7 @@ class ProjectAssetEndpoint(BaseAPIView):
         if type not in allowed_types:
             return Response(
                 {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                     "status": False,
                 },
                 status=status.HTTP_400_BAD_REQUEST,
@@ -680,30 +679,15 @@ class ProjectBulkAssetEndpoint(BaseAPIView):
             [self.save_project_cover(asset, project_id) for asset in assets]
 
         if asset.entity_type == FileAsset.EntityTypeContext.ISSUE_DESCRIPTION:
-            # For some cases, the bulk api is called after the issue is deleted creating
-            # an integrity error
-            try:
-                assets.update(issue_id=entity_id, project_id=project_id)
-            except IntegrityError:
-                pass
+            assets.update(issue_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.COMMENT_DESCRIPTION:
-            # For some cases, the bulk api is called after the comment is deleted
-            # creating an integrity error
-            try:
-                assets.update(comment_id=entity_id)
-            except IntegrityError:
-                pass
+            assets.update(comment_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.PAGE_DESCRIPTION:
             assets.update(page_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.DRAFT_ISSUE_DESCRIPTION:
-            # For some cases, the bulk api is called after the draft issue is deleted
-            # creating an integrity error
-            try:
-                assets.update(draft_issue_id=entity_id)
-            except IntegrityError:
-                pass
+            assets.update(draft_issue_id=entity_id)
 
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -47,14 +47,18 @@ from plane.db.models import (
     User,
     Project,
     ProjectMember,
-    UserRecentVisit,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.utils.host import base_host
+
+# Module imports
 from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.webhook_task import model_activity
-from plane.utils.timezone_converter import convert_to_utc, user_timezone_converter
+from plane.utils.timezone_converter import (
+    convert_utc_to_project_timezone,
+    convert_to_utc,
+    user_timezone_converter,
+)
 
 
 class CycleViewSet(BaseViewSet):
@@ -117,7 +121,6 @@ class CycleViewSet(BaseViewSet):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -130,20 +133,6 @@ class CycleViewSet(BaseViewSet):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group__in=["cancelled"],
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -154,7 +143,10 @@ class CycleViewSet(BaseViewSet):
                         & Q(end_date__gte=current_time_in_utc),
                         then=Value("CURRENT"),
                     ),
-                    When(start_date__gt=current_time_in_utc, then=Value("UPCOMING")),
+                    When(
+                        start_date__gt=current_time_in_utc,
+                        then=Value("UPCOMING"),
+                    ),
                     When(end_date__lt=current_time_in_utc, then=Value("COMPLETED")),
                     When(
                         Q(start_date__isnull=True) & Q(end_date__isnull=True),
@@ -229,7 +221,6 @@ class CycleViewSet(BaseViewSet):
                 "is_favorite",
                 "total_issues",
                 "completed_issues",
-                "cancelled_issues",
                 "assignee_ids",
                 "status",
                 "version",
@@ -261,7 +252,6 @@ class CycleViewSet(BaseViewSet):
             # meta fields
             "is_favorite",
             "total_issues",
-            "cancelled_issues",
             "completed_issues",
             "assignee_ids",
             "status",
@@ -269,7 +259,7 @@ class CycleViewSet(BaseViewSet):
             "created_by",
         )
         datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(data, datetime_fields, project_timezone)
+        data = user_timezone_converter(data, datetime_fields, request.user.user_timezone)
         return Response(data, status=status.HTTP_200_OK)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
@@ -281,9 +271,7 @@ class CycleViewSet(BaseViewSet):
             request.data.get("start_date", None) is not None
             and request.data.get("end_date", None) is not None
         ):
-            serializer = CycleWriteSerializer(
-                data=request.data, context={"project_id": project_id}
-            )
+            serializer = CycleWriteSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(project_id=project_id, owned_by=request.user)
                 cycle = (
@@ -318,15 +306,6 @@ class CycleViewSet(BaseViewSet):
                     .first()
                 )
 
-                # Fetch the project timezone
-                project = Project.objects.get(id=self.kwargs.get("project_id"))
-                project_timezone = project.timezone
-
-                datetime_fields = ["start_date", "end_date"]
-                cycle = user_timezone_converter(
-                    cycle, datetime_fields, project_timezone
-                )
-
                 # Send the model activity
                 model_activity.delay(
                     model_name="cycle",
@@ -335,7 +314,7 @@ class CycleViewSet(BaseViewSet):
                     current_instance=None,
                     actor_id=request.user.id,
                     slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                 )
                 return Response(cycle, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -379,9 +358,7 @@ class CycleViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-        serializer = CycleWriteSerializer(
-            cycle, data=request.data, partial=True, context={"project_id": project_id}
-        )
+        serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             cycle = queryset.values(
@@ -411,13 +388,6 @@ class CycleViewSet(BaseViewSet):
                 "created_by",
             ).first()
 
-            # Fetch the project timezone
-            project = Project.objects.get(id=self.kwargs.get("project_id"))
-            project_timezone = project.timezone
-
-            datetime_fields = ["start_date", "end_date"]
-            cycle = user_timezone_converter(cycle, datetime_fields, project_timezone)
-
             # Send the model activity
             model_activity.delay(
                 model_name="cycle",
@@ -426,7 +396,7 @@ class CycleViewSet(BaseViewSet):
                 current_instance=current_instance,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
 
             return Response(cycle, status=status.HTTP_200_OK)
@@ -486,11 +456,8 @@ class CycleViewSet(BaseViewSet):
             )
 
         queryset = queryset.first()
-        # Fetch the project timezone
-        project = Project.objects.get(id=self.kwargs.get("project_id"))
-        project_timezone = project.timezone
         datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(data, datetime_fields, project_timezone)
+        data = user_timezone_converter(data, datetime_fields, request.user.user_timezone)
 
         recent_visited_task.delay(
             slug=slug,
@@ -539,7 +506,7 @@ class CycleViewSet(BaseViewSet):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         # TODO: Soft delete the cycle break the onetoone relationship with cycle issue
         cycle.delete()
@@ -551,13 +518,6 @@ class CycleViewSet(BaseViewSet):
             entity_identifier=pk,
             project_id=project_id,
         ).delete()
-        # Delete the cycle from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="cycle",
-        ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -573,13 +533,8 @@ class CycleDateCheckEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        start_date = convert_to_utc(
-            date=str(start_date), project_id=project_id, is_start_date=True
-        )
-        end_date = convert_to_utc(
-            date=str(end_date),
-            project_id=project_id,
-        )
+        start_date = convert_to_utc(str(start_date), project_id, is_start_date=True)
+        end_date = convert_to_utc(str(end_date), project_id)
 
         # Check if any cycle intersects in the given interval
         cycles = Cycle.objects.filter(
@@ -663,7 +618,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -728,7 +682,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 )
             )
         )
-        old_cycle = old_cycle.first()
 
         estimate_type = Project.objects.filter(
             workspace__slug=slug,
@@ -847,7 +800,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             )
 
             estimate_completion_chart = burndown_plot(
-                queryset=old_cycle,
+                queryset=old_cycle.first(),
                 slug=slug,
                 project_id=project_id,
                 plot_type="points",
@@ -994,7 +947,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
 
         # Pass the new_cycle queryset to burndown_plot
         completion_chart = burndown_plot(
-            queryset=old_cycle,
+            queryset=old_cycle.first(),
             slug=slug,
             project_id=project_id,
             plot_type="issues",
@@ -1006,12 +959,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
         ).first()
 
         current_cycle.progress_snapshot = {
-            "total_issues": old_cycle.total_issues,
-            "completed_issues": old_cycle.completed_issues,
-            "cancelled_issues": old_cycle.cancelled_issues,
-            "started_issues": old_cycle.started_issues,
-            "unstarted_issues": old_cycle.unstarted_issues,
-            "backlog_issues": old_cycle.backlog_issues,
+            "total_issues": old_cycle.first().total_issues,
+            "completed_issues": old_cycle.first().completed_issues,
+            "cancelled_issues": old_cycle.first().cancelled_issues,
+            "started_issues": old_cycle.first().started_issues,
+            "unstarted_issues": old_cycle.first().unstarted_issues,
+            "backlog_issues": old_cycle.first().backlog_issues,
             "distribution": {
                 "labels": label_distribution_data,
                 "assignees": assignee_distribution_data,
@@ -1076,7 +1029,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -1119,13 +1072,6 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
 class CycleProgressEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.filter(
-            workspace__slug=slug, project_id=project_id, id=cycle_id
-        ).first()
-        if not cycle:
-            return Response(
-                {"error": "Cycle not found"}, status=status.HTTP_404_NOT_FOUND
-            )
         aggregate_estimates = (
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
@@ -1176,60 +1122,53 @@ class CycleProgressEndpoint(BaseAPIView):
                 ),
             )
         )
-        if cycle.progress_snapshot:
-            backlog_issues = cycle.progress_snapshot.get("backlog_issues", 0)
-            unstarted_issues = cycle.progress_snapshot.get("unstarted_issues", 0)
-            started_issues = cycle.progress_snapshot.get("started_issues", 0)
-            cancelled_issues = cycle.progress_snapshot.get("cancelled_issues", 0)
-            completed_issues = cycle.progress_snapshot.get("completed_issues", 0)
-            total_issues = cycle.progress_snapshot.get("total_issues", 0)
-        else:
-            backlog_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="backlog",
-            ).count()
 
-            unstarted_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="unstarted",
-            ).count()
+        backlog_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="backlog",
+        ).count()
 
-            started_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="started",
-            ).count()
+        unstarted_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="unstarted",
+        ).count()
 
-            cancelled_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="cancelled",
-            ).count()
+        started_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="started",
+        ).count()
 
-            completed_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="completed",
-            ).count()
+        cancelled_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="cancelled",
+        ).count()
 
-            total_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-            ).count()
+        completed_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="completed",
+        ).count()
+
+        total_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+        ).count()
 
         return Response(
             {
@@ -1290,25 +1229,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # this will tell whether the issues were transferred to the new cycle
-        """ 
-        if the issues were transferred to the new cycle, then the progress_snapshot will be present
-        return the progress_snapshot data in the analytics for each date
-            
-        else issues were not transferred to the new cycle then generate the stats from the cycle isssue bridge tables
-        """
-
-        if cycle.progress_snapshot:
-            distribution = cycle.progress_snapshot.get("distribution", {})
-            return Response(
-                {
-                    "labels": distribution.get("labels", []),
-                    "assignees": distribution.get("assignees", []),
-                    "completion_chart": distribution.get("completion_chart", {}),
-                },
-                status=status.HTTP_200_OK,
-            )
-
         estimate_type = Project.objects.filter(
             workspace__slug=slug,
             pk=project_id,

apiserver/plane/app/views/cycle/issue.py

@@ -27,7 +27,6 @@ from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
 from plane.app.permissions import allow_permission, ROLE
-from plane.utils.host import base_host
 
 
 class CycleIssueViewSet(BaseViewSet):
@@ -292,7 +291,7 @@ class CycleIssueViewSet(BaseViewSet):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
@@ -318,7 +317,7 @@ class CycleIssueViewSet(BaseViewSet):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         cycle_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -0,0 +1,806 @@
+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import (
+    Case,
+    CharField,
+    Count,
+    Exists,
+    F,
+    Func,
+    IntegerField,
+    JSONField,
+    OuterRef,
+    Prefetch,
+    Q,
+    Subquery,
+    UUIDField,
+    Value,
+    When,
+)
+from django.db.models.functions import Coalesce
+from django.utils import timezone
+from rest_framework import status
+
+# Third Party imports
+from rest_framework.response import Response
+
+from plane.app.serializers import (
+    DashboardSerializer,
+    IssueActivitySerializer,
+    IssueSerializer,
+    WidgetSerializer,
+)
+from plane.db.models import (
+    Dashboard,
+    DashboardWidget,
+    Issue,
+    IssueActivity,
+    FileAsset,
+    IssueLink,
+    IssueRelation,
+    Project,
+    Widget,
+    WorkspaceMember,
+    CycleIssue,
+)
+from plane.utils.issue_filters import issue_filters
+
+# Module imports
+from .. import BaseAPIView
+
+
+def dashboard_overview_stats(self, request, slug):
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+            assignees__in=[request.user],
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    pending_issues_count = (
+        Issue.issue_objects.filter(
+            ~Q(state__group__in=["completed", "cancelled"]),
+            target_date__lt=timezone.now().date(),
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+            assignees__in=[request.user],
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    created_issues_count = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            created_by_id=request.user.id,
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    completed_issues_count = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+            state__group="completed",
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    return Response(
+        {
+            "assigned_issues_count": assigned_issues,
+            "pending_issues_count": pending_issues_count,
+            "completed_issues_count": completed_issues_count,
+            "created_issues_count": created_issues_count,
+        },
+        status=status.HTTP_200_OK,
+    )
+
+
+def dashboard_assigned_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            assignees__in=[request.user],
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .prefetch_related(
+            Prefetch(
+                "issue_relation",
+                queryset=IssueRelation.objects.select_related(
+                    "related_issue"
+                ).select_related("issue"),
+            )
+        )
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+    )
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        assigned_issues = assigned_issues.filter(created_by=request.user)
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    assigned_issues = assigned_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = assigned_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = assigned_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    completed_issues, many=True, expand=self.expand
+                ).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    overdue_issues, many=True, expand=self.expand
+                ).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    upcoming_issues, many=True, expand=self.expand
+                ).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_created_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    created_issues = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            created_by=request.user,
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+        .order_by("created_at")
+    )
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    created_issues = created_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = created_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = created_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(completed_issues, many=True).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(overdue_issues, many=True).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(upcoming_issues, many=True).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_issues_by_state_groups(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_state_groups = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("state__group")
+        .annotate(count=Count("id"))
+    )
+
+    # default state
+    all_groups = {state: 0 for state in state_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_state_groups:
+        all_groups[entry["state__group"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"state": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_issues_by_priority(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_priority = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("priority")
+        .annotate(count=Count("id"))
+    )
+
+    # default priority
+    all_groups = {priority: 0 for priority in priority_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_priority:
+        all_groups[entry["priority"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"priority": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_recent_activity(self, request, slug):
+    queryset = IssueActivity.objects.filter(
+        ~Q(field__in=["comment", "vote", "reaction", "draft"]),
+        workspace__slug=slug,
+        project__project_projectmember__member=request.user,
+        project__project_projectmember__is_active=True,
+        project__archived_at__isnull=True,
+        actor=request.user,
+    ).select_related("actor", "workspace", "issue", "project")[:8]
+
+    return Response(
+        IssueActivitySerializer(queryset, many=True).data, status=status.HTTP_200_OK
+    )
+
+
+def dashboard_recent_projects(self, request, slug):
+    project_ids = (
+        IssueActivity.objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            actor=request.user,
+        )
+        .values_list("project_id", flat=True)
+        .distinct()
+    )
+
+    # Extract project IDs from the recent projects
+    unique_project_ids = set(project_id for project_id in project_ids)
+
+    # Fetch additional projects only if needed
+    if len(unique_project_ids) < 4:
+        additional_projects = Project.objects.filter(
+            project_projectmember__member=request.user,
+            project_projectmember__is_active=True,
+            archived_at__isnull=True,
+            workspace__slug=slug,
+        ).exclude(id__in=unique_project_ids)
+
+        # Append additional project IDs to the existing list
+        unique_project_ids.update(additional_projects.values_list("id", flat=True))
+
+    return Response(list(unique_project_ids)[:4], status=status.HTTP_200_OK)
+
+
+def dashboard_recent_collaborators(self, request, slug):
+    project_members_with_activities = (
+        WorkspaceMember.objects.filter(workspace__slug=slug, is_active=True)
+        .annotate(
+            active_issue_count=Count(
+                Case(
+                    When(
+                        member__issue_assignee__issue__state__group__in=[
+                            "unstarted",
+                            "started",
+                        ],
+                        member__issue_assignee__issue__workspace__slug=slug,
+                        member__issue_assignee__issue__project__project_projectmember__member=request.user,
+                        member__issue_assignee__issue__project__project_projectmember__is_active=True,
+                        then=F("member__issue_assignee__issue__id"),
+                    ),
+                    distinct=True,
+                    output_field=IntegerField(),
+                ),
+                distinct=True,
+            ),
+            user_id=F("member_id"),
+        )
+        .values("user_id", "active_issue_count")
+        .order_by("-active_issue_count")
+        .distinct()
+    )
+    return Response((project_members_with_activities), status=status.HTTP_200_OK)
+
+
+class DashboardEndpoint(BaseAPIView):
+    def create(self, request, slug):
+        serializer = DashboardSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_204_NO_CONTENT)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def get(self, request, slug, dashboard_id=None):
+        if not dashboard_id:
+            dashboard_type = request.GET.get("dashboard_type", None)
+            if dashboard_type == "home":
+                dashboard, created = Dashboard.objects.get_or_create(
+                    type_identifier=dashboard_type,
+                    owned_by=request.user,
+                    is_default=True,
+                )
+
+                if created:
+                    widgets_to_fetch = [
+                        "overview_stats",
+                        "assigned_issues",
+                        "created_issues",
+                        "issues_by_state_groups",
+                        "issues_by_priority",
+                        "recent_activity",
+                        "recent_projects",
+                        "recent_collaborators",
+                    ]
+
+                    updated_dashboard_widgets = []
+                    for widget_key in widgets_to_fetch:
+                        widget = Widget.objects.filter(key=widget_key).values_list(
+                            "id", flat=True
+                        )
+                        if widget:
+                            updated_dashboard_widgets.append(
+                                DashboardWidget(
+                                    widget_id=widget, dashboard_id=dashboard.id
+                                )
+                            )
+
+                    DashboardWidget.objects.bulk_create(
+                        updated_dashboard_widgets, batch_size=100
+                    )
+
+                widgets = (
+                    Widget.objects.annotate(
+                        is_visible=Exists(
+                            DashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                is_visible=True,
+                            )
+                        )
+                    )
+                    .annotate(
+                        dashboard_filters=Subquery(
+                            DashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                filters__isnull=False,
+                            )
+                            .exclude(filters={})
+                            .values("filters")[:1]
+                        )
+                    )
+                    .annotate(
+                        widget_filters=Case(
+                            When(
+                                dashboard_filters__isnull=False,
+                                then=F("dashboard_filters"),
+                            ),
+                            default=F("filters"),
+                            output_field=JSONField(),
+                        )
+                    )
+                )
+                return Response(
+                    {
+                        "dashboard": DashboardSerializer(dashboard).data,
+                        "widgets": WidgetSerializer(widgets, many=True).data,
+                    },
+                    status=status.HTTP_200_OK,
+                )
+            return Response(
+                {"error": "Please specify a valid dashboard type"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        widget_key = request.GET.get("widget_key", "overview_stats")
+
+        WIDGETS_MAPPER = {
+            "overview_stats": dashboard_overview_stats,
+            "assigned_issues": dashboard_assigned_issues,
+            "created_issues": dashboard_created_issues,
+            "issues_by_state_groups": dashboard_issues_by_state_groups,
+            "issues_by_priority": dashboard_issues_by_priority,
+            "recent_activity": dashboard_recent_activity,
+            "recent_projects": dashboard_recent_projects,
+            "recent_collaborators": dashboard_recent_collaborators,
+        }
+
+        func = WIDGETS_MAPPER.get(widget_key)
+        if func is not None:
+            response = func(self, request=request, slug=slug)
+            if isinstance(response, Response):
+                return response
+
+        return Response(
+            {"error": "Please specify a valid widget key"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+
+class WidgetsEndpoint(BaseAPIView):
+    def patch(self, request, dashboard_id, widget_id):
+        dashboard_widget = DashboardWidget.objects.filter(
+            widget_id=widget_id, dashboard_id=dashboard_id
+        ).first()
+        dashboard_widget.is_visible = request.data.get(
+            "is_visible", dashboard_widget.is_visible
+        )
+        dashboard_widget.sort_order = request.data.get(
+            "sort_order", dashboard_widget.sort_order
+        )
+        dashboard_widget.filters = request.data.get("filters", dashboard_widget.filters)
+        dashboard_widget.save()
+        return Response({"message": "successfully updated"}, status=status.HTTP_200_OK)

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

@@ -1,182 +1,71 @@
-# Python import
-import os
-from typing import List, Dict, Tuple
-
-# Third party import
-from openai import OpenAI
+# Python imports
 import requests
+import os
 
-from rest_framework import status
+# Third party imports
+from openai import OpenAI
 from rest_framework.response import Response
+from rest_framework import status
 
-# Module import
-from plane.app.permissions import ROLE, allow_permission
-from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
-from plane.db.models import Project, Workspace
-from plane.license.utils.instance_value import get_configuration_value
-from plane.utils.exception_logger import log_exception
+# Django imports
 
+# Module imports
 from ..base import BaseAPIView
-
-
-class LLMProvider:
-    """Base class for LLM provider configurations"""
-
-    name: str = ""
-    models: List[str] = []
-    default_model: str = ""
-
-    @classmethod
-    def get_config(cls) -> Dict[str, str | List[str]]:
-        return {
-            "name": cls.name,
-            "models": cls.models,
-            "default_model": cls.default_model,
-        }
-
-
-class OpenAIProvider(LLMProvider):
-    name = "OpenAI"
-    models = ["gpt-3.5-turbo", "gpt-4o-mini", "gpt-4o", "o1-mini", "o1-preview"]
-    default_model = "gpt-4o-mini"
-
-
-class AnthropicProvider(LLMProvider):
-    name = "Anthropic"
-    models = [
-        "claude-3-5-sonnet-20240620",
-        "claude-3-haiku-20240307",
-        "claude-3-opus-20240229",
-        "claude-3-sonnet-20240229",
-        "claude-2.1",
-        "claude-2",
-        "claude-instant-1.2",
-        "claude-instant-1",
-    ]
-    default_model = "claude-3-sonnet-20240229"
-
-
-class GeminiProvider(LLMProvider):
-    name = "Gemini"
-    models = ["gemini-pro", "gemini-1.5-pro-latest", "gemini-pro-vision"]
-    default_model = "gemini-pro"
-
-
-SUPPORTED_PROVIDERS = {
-    "openai": OpenAIProvider,
-    "anthropic": AnthropicProvider,
-    "gemini": GeminiProvider,
-}
-
-
-def get_llm_config() -> Tuple[str | None, str | None, str | None]:
-    """
-    Helper to get LLM configuration values, returns:
-        - api_key, model, provider
-    """
-    api_key, provider_key, model = get_configuration_value(
-        [
-            {
-                "key": "LLM_API_KEY",
-                "default": os.environ.get("LLM_API_KEY", None),
-            },
-            {
-                "key": "LLM_PROVIDER",
-                "default": os.environ.get("LLM_PROVIDER", "openai"),
-            },
-            {
-                "key": "LLM_MODEL",
-                "default": os.environ.get("LLM_MODEL", None),
-            },
-        ]
-    )
-
-    provider = SUPPORTED_PROVIDERS.get(provider_key.lower())
-    if not provider:
-        log_exception(ValueError(f"Unsupported provider: {provider_key}"))
-        return None, None, None
-
-    if not api_key:
-        log_exception(ValueError(f"Missing API key for provider: {provider.name}"))
-        return None, None, None
-
-    # If no model specified, use provider's default
-    if not model:
-        model = provider.default_model
-
-    # Validate model is supported by provider
-    if model not in provider.models:
-        log_exception(
-            ValueError(
-                f"Model {model} not supported by {provider.name}. "
-                f"Supported models: {', '.join(provider.models)}"
-            )
-        )
-        return None, None, None
-
-    return api_key, model, provider_key
-
-
-def get_llm_response(
-    task, prompt, api_key: str, model: str, provider: str
-) -> Tuple[str | None, str | None]:
-    """Helper to get LLM completion response"""
-    final_text = task + "\n" + prompt
-    try:
-        # For Gemini, prepend provider name to model
-        if provider.lower() == "gemini":
-            model = f"gemini/{model}"
-
-        client = OpenAI(api_key=api_key)
-        chat_completion = client.chat.completions.create(
-            model=model, messages=[{"role": "user", "content": final_text}]
-        )
-        text = chat_completion.choices[0].message.content
-        return text, None
-    except Exception as e:
-        log_exception(e)
-        error_type = e.__class__.__name__
-        if error_type == "AuthenticationError":
-            return None, f"Invalid API key for {provider}"
-        elif error_type == "RateLimitError":
-            return None, f"Rate limit exceeded for {provider}"
-        else:
-            return None, f"Error occurred while generating response from {provider}"
+from plane.app.permissions import allow_permission, ROLE
+from plane.db.models import Workspace, Project
+from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.license.utils.instance_value import get_configuration_value
 
 
 class GPTIntegrationEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id):
-        api_key, model, provider = get_llm_config()
+        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"),
+                },
+            ]
+        )
 
-        if not api_key or not model or not provider:
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
             return Response(
-                {"error": "LLM provider API key and model are required"},
+                {"error": "OpenAI API key and engine is required"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        prompt = request.data.get("prompt", False)
         task = request.data.get("task", False)
+
         if not task:
             return Response(
                 {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
+        final_text = task + "\n" + prompt
+
+        client = OpenAI(api_key=OPENAI_API_KEY)
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE, messages=[{"role": "user", "content": final_text}]
         )
-        if not text and error:
-            return Response(
-                {"error": "An internal error has occurred."},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
 
         workspace = Workspace.objects.get(slug=slug)
         project = Project.objects.get(pk=project_id)
 
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
         return Response(
             {
                 "response": text,
-                "response_html": text.replace("\n", "<br/>"),
+                "response_html": text_html,
                 "project_detail": ProjectLiteSerializer(project).data,
                 "workspace_detail": WorkspaceLiteSerializer(workspace).data,
             },
@@ -187,35 +76,47 @@ class GPTIntegrationEndpoint(BaseAPIView):
 class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
     @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def post(self, request, slug):
-        api_key, model, provider = get_llm_config()
+        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"),
+                },
+            ]
+        )
 
-        if not api_key or not model or not provider:
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
             return Response(
-                {"error": "LLM provider API key and model are required"},
+                {"error": "OpenAI API key and engine is required"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        prompt = request.data.get("prompt", False)
         task = request.data.get("task", False)
+
         if not task:
             return Response(
                 {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
-        )
-        if not text and error:
-            return Response(
-                {"error": "An internal error has occurred."},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
+        final_text = task + "\n" + prompt
 
+        client = OpenAI(api_key=OPENAI_API_KEY)
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE, messages=[{"role": "user", "content": final_text}]
+        )
+
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
         return Response(
-            {
-                "response": text,
-                "response_html": text.replace("\n", "<br/>"),
-            },
-            status=status.HTTP_200_OK,
+            {"response": text, "response_html": text_html}, status=status.HTTP_200_OK
         )
 
 

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

@@ -27,24 +27,16 @@ from plane.db.models import (
     Project,
     ProjectMember,
     CycleIssue,
-    IssueDescriptionVersion,
 )
 from plane.app.serializers import (
     IssueCreateSerializer,
-    IssueDetailSerializer,
+    IssueSerializer,
     IntakeSerializer,
     IntakeIssueSerializer,
     IntakeIssueDetailSerializer,
-    IssueDescriptionVersionDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.bgtasks.issue_description_version_task import issue_description_version_task
-from plane.app.views.base import BaseAPIView
-from plane.utils.timezone_converter import user_timezone_converter
-from plane.utils.global_paginator import paginate
-from plane.utils.host import base_host
-from plane.db.models.intake import SourceType
 
 
 class IntakeViewSet(BaseViewSet):
@@ -95,7 +87,7 @@ class IntakeIssueViewSet(BaseViewSet):
     serializer_class = IntakeIssueSerializer
     model = IntakeIssue
 
-    filterset_fields = ["status"]
+    filterset_fields = ["statulls"]
 
     def get_queryset(self):
         return (
@@ -182,19 +174,14 @@ class IntakeIssueViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):
-        intake = Intake.objects.filter(
+        intake_id = Intake.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
-        if not intake:
-            return Response(
-                {"error": "Intake not found"}, status=status.HTTP_404_NOT_FOUND
-            )
-
         project = Project.objects.get(pk=project_id)
         filters = issue_filters(request.GET, "GET", "issue__")
         intake_issue = (
             IntakeIssue.objects.filter(
-                intake_id=intake.id, project_id=project_id, **filters
+                intake_id=intake_id.id, project_id=project_id, **filters
             )
             .select_related("issue")
             .prefetch_related("issue__labels")
@@ -226,7 +213,7 @@ class IntakeIssueViewSet(BaseViewSet):
                 workspace__slug=slug,
                 project_id=project_id,
                 member=request.user,
-                role=ROLE.GUEST.value,
+                role=5,
                 is_active=True,
             ).exists()
             and not project.guest_view_all_features
@@ -279,7 +266,7 @@ class IntakeIssueViewSet(BaseViewSet):
                 intake_id=intake_id.id,
                 project_id=project_id,
                 issue_id=serializer.data["id"],
-                source=SourceType.IN_APP,
+                source=request.data.get("source", "IN-APP"),
             )
             # Create an Issue Activity
             issue_activity.delay(
@@ -291,16 +278,9 @@ class IntakeIssueViewSet(BaseViewSet):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
                 intake=str(intake_issue.id),
             )
-            # updated issue description version
-            issue_description_version_task.delay(
-                updated_issue=json.dumps(request.data, cls=DjangoJSONEncoder),
-                issue_id=str(serializer.data["id"]),
-                user_id=request.user.id,
-                is_creating=True,
-            )
             intake_issue = (
                 IntakeIssue.objects.select_related("issue")
                 .prefetch_related("issue__labels", "issue__assignees")
@@ -400,15 +380,13 @@ class IntakeIssueViewSet(BaseViewSet):
                     ),
                     "description": issue_data.get("description", issue.description),
                 }
-            current_instance = json.dumps(
-                IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder
-            )
 
             issue_serializer = IssueCreateSerializer(
-                issue, data=issue_data, partial=True, context={"project_id": project_id}
+                issue, data=issue_data, partial=True
             )
 
             if issue_serializer.is_valid():
+                current_instance = issue
                 # Log all the updates
                 requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
                 if issue is not None:
@@ -418,18 +396,15 @@ class IntakeIssueViewSet(BaseViewSet):
                         actor_id=str(request.user.id),
                         issue_id=str(issue.id),
                         project_id=str(project_id),
-                        current_instance=current_instance,
+                        current_instance=json.dumps(
+                            IssueSerializer(current_instance).data,
+                            cls=DjangoJSONEncoder,
+                        ),
                         epoch=int(timezone.now().timestamp()),
                         notification=True,
-                        origin=base_host(request=request, is_app=True),
+                        origin=request.META.get("HTTP_ORIGIN"),
                         intake=str(intake_issue.id),
                     )
-                    # updated issue description version
-                    issue_description_version_task.delay(
-                        updated_issue=current_instance,
-                        issue_id=str(pk),
-                        user_id=request.user.id,
-                    )
                 issue_serializer.save()
             else:
                 return Response(
@@ -487,7 +462,7 @@ class IntakeIssueViewSet(BaseViewSet):
                     current_instance=current_instance,
                     epoch=int(timezone.now().timestamp()),
                     notification=False,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                     intake=(intake_issue.id),
                 )
 
@@ -569,7 +544,7 @@ class IntakeIssueViewSet(BaseViewSet):
                 workspace__slug=slug,
                 project_id=project_id,
                 member=request.user,
-                role=ROLE.GUEST.value,
+                role=5,
                 is_active=True,
             ).exists()
             and not project.guest_view_all_features
@@ -577,7 +552,7 @@ class IntakeIssueViewSet(BaseViewSet):
         ):
             return Response(
                 {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
             )
         issue = IntakeIssueDetailSerializer(intake_issue).data
         return Response(issue, status=status.HTTP_200_OK)
@@ -604,80 +579,3 @@ class IntakeIssueViewSet(BaseViewSet):
 
         intake_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class IntakeWorkItemDescriptionVersionEndpoint(BaseAPIView):
-    def process_paginated_result(self, fields, results, timezone):
-        paginated_data = results.values(*fields)
-
-        datetime_fields = ["created_at", "updated_at"]
-        paginated_data = user_timezone_converter(
-            paginated_data, datetime_fields, timezone
-        )
-
-        return paginated_data
-
-    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, work_item_id, pk=None):
-        project = Project.objects.get(pk=project_id)
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=work_item_id
-        )
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=ROLE.GUEST.value,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        if pk:
-            issue_description_version = IssueDescriptionVersion.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=work_item_id,
-                pk=pk,
-            )
-
-            serializer = IssueDescriptionVersionDetailSerializer(
-                issue_description_version
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        cursor = request.GET.get("cursor", None)
-
-        required_fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-
-        issue_description_versions_queryset = IssueDescriptionVersion.objects.filter(
-            workspace__slug=slug, project_id=project_id, issue_id=work_item_id
-        )
-
-        paginated_data = paginate(
-            base_queryset=issue_description_versions_queryset,
-            queryset=issue_description_versions_queryset,
-            cursor=cursor,
-            on_result=lambda results: self.process_paginated_result(
-                required_fields, results, request.user.user_timezone
-            ),
-        )
-        return Response(paginated_data, status=status.HTTP_200_OK)

apiserver/plane/app/views/issue/activity.py

@@ -14,7 +14,7 @@ from rest_framework import status
 from .. import BaseAPIView
 from plane.app.serializers import IssueActivitySerializer, IssueCommentSerializer
 from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
-from plane.db.models import IssueActivity, IssueComment, CommentReaction, IntakeIssue
+from plane.db.models import IssueActivity, IssueComment, CommentReaction
 
 
 class IssueActivityEndpoint(BaseAPIView):
@@ -57,22 +57,13 @@ class IssueActivityEndpoint(BaseAPIView):
                 )
             )
         )
+        issue_activities = IssueActivitySerializer(issue_activities, many=True).data
+        issue_comments = IssueCommentSerializer(issue_comments, many=True).data
 
         if request.GET.get("activity_type", None) == "issue-property":
-            issue_activities = issue_activities.prefetch_related(
-                Prefetch(
-                    "issue__issue_intake",
-                    queryset=IntakeIssue.objects.only(
-                        "source_email", "source", "extra"
-                    ),
-                    to_attr="source_data",
-                )
-            )
-            issue_activities = IssueActivitySerializer(issue_activities, many=True).data
             return Response(issue_activities, status=status.HTTP_200_OK)
 
         if request.GET.get("activity_type", None) == "issue-comment":
-            issue_comments = IssueCommentSerializer(issue_comments, many=True).data
             return Response(issue_comments, status=status.HTTP_200_OK)
 
         result_list = sorted(

apiserver/plane/app/views/issue/archive.py

@@ -37,7 +37,6 @@ from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
 from plane.app.permissions import allow_permission, ROLE
 from plane.utils.error_codes import ERROR_CODES
-from plane.utils.host import base_host
 
 # Module imports
 from .. import BaseViewSet, BaseAPIView
@@ -260,7 +259,7 @@ class IssueArchiveViewSet(BaseViewSet):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue.archived_at = timezone.now().date()
         issue.save()
@@ -288,7 +287,7 @@ class IssueArchiveViewSet(BaseViewSet):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue.archived_at = None
         issue.save()
@@ -334,7 +333,7 @@ class BulkArchiveIssuesEndpoint(BaseAPIView):
                 ),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             issue.archived_at = timezone.now().date()
             bulk_archive_issues.append(issue)

apiserver/plane/app/views/issue/attachment.py

@@ -21,7 +21,6 @@ from plane.bgtasks.issue_activities_task import issue_activity
 from plane.app.permissions import allow_permission, ROLE
 from plane.settings.storage import S3Storage
 from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
-from plane.utils.host import base_host
 
 
 class IssueAttachmentEndpoint(BaseAPIView):
@@ -49,7 +48,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
                 current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -68,7 +67,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -121,12 +120,10 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
 
         # Get the presigned URL
         storage = S3Storage(request=request)
-
         # Generate a presigned URL to share an S3 object
         presigned_url = storage.generate_presigned_post(
             object_name=asset_key, file_type=type, file_size=size_limit
         )
-
         # Return the presigned URL
         return Response(
             {
@@ -156,7 +153,7 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -214,7 +211,7 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
                 current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
 
             # Update the attachment

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

@@ -44,8 +44,6 @@ from plane.db.models import (
     Project,
     ProjectMember,
     CycleIssue,
-    UserRecentVisit,
-    ModuleIssue,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -61,7 +59,6 @@ from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.utils.global_paginator import paginate
 from plane.bgtasks.webhook_task import model_activity
 from plane.bgtasks.issue_description_version_task import issue_description_version_task
-from plane.utils.host import base_host
 
 
 class IssueListEndpoint(BaseAPIView):
@@ -380,7 +377,7 @@ class IssueViewSet(BaseViewSet):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             issue = (
                 issue_queryset_grouper(
@@ -430,7 +427,7 @@ class IssueViewSet(BaseViewSet):
                 current_instance=None,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             # updated issue description version
             issue_description_version_task.delay(
@@ -549,7 +546,7 @@ class IssueViewSet(BaseViewSet):
             )
 
         """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
         the requesting user then dont show the issue
         """
 
@@ -566,7 +563,7 @@ class IssueViewSet(BaseViewSet):
         ):
             return Response(
                 {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
             )
 
         recent_visited_task.delay(
@@ -633,13 +630,11 @@ class IssueViewSet(BaseViewSet):
             )
 
         current_instance = json.dumps(
-            IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder
+            IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
 
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueCreateSerializer(
-            issue, data=request.data, partial=True, context={"project_id": project_id}
-        )
+        serializer = IssueCreateSerializer(issue, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             issue_activity.delay(
@@ -651,7 +646,7 @@ class IssueViewSet(BaseViewSet):
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             model_activity.delay(
                 model_name="issue",
@@ -660,7 +655,7 @@ class IssueViewSet(BaseViewSet):
                 current_instance=current_instance,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             # updated issue description version
             issue_description_version_task.delay(
@@ -676,13 +671,6 @@ class IssueViewSet(BaseViewSet):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
 
         issue.delete()
-        # delete the issue from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="issue",
-        ).delete(soft=False)
         issue_activity.delay(
             type="issue.activity.deleted",
             requested_data=json.dumps({"issue_id": str(pk)}),
@@ -692,8 +680,7 @@ class IssueViewSet(BaseViewSet):
             current_instance={},
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
-            subscriber=False,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -741,13 +728,6 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
 
         total_issues = len(issues)
 
-        # First, delete all related cycle issues
-        CycleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Then, delete all related module issues
-        ModuleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Finally, delete the issues themselves
         issues.delete()
 
         return Response(
@@ -1035,17 +1015,9 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):
         """
         Validate that start date is before target date.
         """
-        from datetime import datetime
-
         start = new_start or current_start
         target = new_target or current_target
 
-        # Convert string dates to datetime objects if they're strings
-        if isinstance(start, str):
-            start = datetime.strptime(start, "%Y-%m-%d").date()
-        if isinstance(target, str):
-            target = datetime.strptime(target, "%Y-%m-%d").date()
-
         if start and target and start > target:
             return False
         return True
@@ -1116,188 +1088,3 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):
         return Response(
             {"message": "Issues updated successfully"}, status=status.HTTP_200_OK
         )
-
-
-class IssueMetaEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="PROJECT")
-    def get(self, request, slug, project_id, issue_id):
-        issue = Issue.issue_objects.only("sequence_id", "project__identifier").get(
-            id=issue_id, project_id=project_id, workspace__slug=slug
-        )
-        return Response(
-            {
-                "sequence_id": issue.sequence_id,
-                "project_identifier": issue.project.identifier,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-
-class IssueDetailIdentifierEndpoint(BaseAPIView):
-    def strict_str_to_int(self, s):
-        if not s.isdigit() and not (s.startswith("-") and s[1:].isdigit()):
-            raise ValueError("Invalid integer string")
-        return int(s)
-
-    def get(self, request, slug, project_identifier, issue_identifier):
-        # Check if the issue identifier is a valid integer
-        try:
-            issue_identifier = self.strict_str_to_int(issue_identifier)
-        except ValueError:
-            return Response(
-                {"error": "Invalid issue identifier"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Fetch the project
-        project = Project.objects.get(
-            identifier__iexact=project_identifier, workspace__slug=slug
-        )
-
-        # Check if the user is a member of the project
-        if not ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project.id,
-            member=request.user,
-            is_active=True,
-        ).exists():
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        # Fetch the issue
-        issue = (
-            Issue.issue_objects.filter(project_id=project.id)
-            .filter(workspace__slug=slug)
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(issue=OuterRef("id")).values("cycle_id")[
-                        :1
-                    ]
-                )
-            )
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=FileAsset.objects.filter(
-                    issue_id=OuterRef("id"),
-                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(sequence_id=issue_identifier)
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True)
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("issue", "actor"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_link",
-                    queryset=IssueLink.objects.select_related("created_by"),
-                )
-            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project.id,
-                        issue__sequence_id=issue_identifier,
-                        subscriber=request.user,
-                    )
-                )
-            )
-        ).first()
-
-        # Check if the issue exists
-        if not issue:
-            return Response(
-                {"error": "The required object does not exist."},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        """
-        if the role is guest and guest_view_all_features is false and owned by is not
-        the requesting user then dont show the issue
-        """
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project.id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        recent_visited_task.delay(
-            slug=slug,
-            entity_name="issue",
-            entity_identifier=str(issue.id),
-            user_id=str(request.user.id),
-            project_id=str(project.id),
-        )
-
-        # Serialize the issue
-        serializer = IssueDetailSerializer(issue, expand=self.expand)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/app/views/issue/comment.py

@@ -5,7 +5,6 @@ import json
 from django.utils import timezone
 from django.db.models import Exists
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db import IntegrityError
 
 # Third Party imports
 from rest_framework.response import Response
@@ -17,7 +16,6 @@ from plane.app.serializers import IssueCommentSerializer, CommentReactionSeriali
 from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import IssueComment, ProjectMember, CommentReaction, Project, Issue
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.host import base_host
 
 
 class IssueCommentViewSet(BaseViewSet):
@@ -88,7 +86,7 @@ class IssueCommentViewSet(BaseViewSet):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -106,13 +104,7 @@ class IssueCommentViewSet(BaseViewSet):
             issue_comment, data=request.data, partial=True
         )
         if serializer.is_valid():
-            if (
-                "comment_html" in request.data
-                and request.data["comment_html"] != issue_comment.comment_html
-            ):
-                serializer.save(edited_at=timezone.now())
-            else:
-                serializer.save()
+            serializer.save()
             issue_activity.delay(
                 type="comment.activity.updated",
                 requested_data=requested_data,
@@ -122,7 +114,7 @@ class IssueCommentViewSet(BaseViewSet):
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -145,7 +137,7 @@ class IssueCommentViewSet(BaseViewSet):
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -172,32 +164,24 @@ class CommentReactionViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def create(self, request, slug, project_id, comment_id):
-        try:
-            serializer = CommentReactionSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id,
-                    actor_id=request.user.id,
-                    comment_id=comment_id,
-                )
-                issue_activity.delay(
-                    type="comment_reaction.activity.created",
-                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                    actor_id=str(request.user.id),
-                    issue_id=None,
-                    project_id=str(project_id),
-                    current_instance=None,
-                    epoch=int(timezone.now().timestamp()),
-                    notification=True,
-                    origin=base_host(request=request, is_app=True),
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError:
-            return Response(
-                {"error": "Reaction already exists for the user"},
-                status=status.HTTP_400_BAD_REQUEST,
+        serializer = CommentReactionSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                project_id=project_id, actor_id=request.user.id, comment_id=comment_id
             )
+            issue_activity.delay(
+                type="comment_reaction.activity.created",
+                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+                actor_id=str(request.user.id),
+                issue_id=None,
+                project_id=str(project_id),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def destroy(self, request, slug, project_id, comment_id, reaction_code):
@@ -223,7 +207,7 @@ class CommentReactionViewSet(BaseViewSet):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         comment_reaction.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/issue/label.py

@@ -35,9 +35,7 @@ class LabelViewSet(BaseViewSet):
             .order_by("sort_order")
         )
 
-    @invalidate_cache(
-        path="/api/workspaces/:slug/labels/", url_params=True, user=False, multiple=True
-    )
+    @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
     def create(self, request, slug, project_id):
         try:
@@ -55,20 +53,6 @@ class LabelViewSet(BaseViewSet):
     @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
     def partial_update(self, request, *args, **kwargs):
-        # Check if the label name is unique within the project
-        if (
-            "name" in request.data
-            and Label.objects.filter(
-                project_id=kwargs["project_id"], name=request.data["name"]
-            )
-            .exclude(pk=kwargs["pk"])
-            .exists()
-        ):
-            return Response(
-                {"error": "Label with the same name already exists in the project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        # call the parent method to perform the update
         return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
@@ -88,7 +72,7 @@ class BulkCreateIssueLabelsEndpoint(BaseAPIView):
                 Label(
                     name=label.get("name", "Migrated"),
                     description=label.get("description", "Migrated Issue"),
-                    color=f"#{random.randint(0, 0xFFFFFF + 1):06X}",
+                    color=f"#{random.randint(0, 0xFFFFFF+1):06X}",
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     created_by=request.user,

apiserver/plane/app/views/issue/link.py

@@ -15,7 +15,6 @@ from plane.app.serializers import IssueLinkSerializer
 from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import IssueLink
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.host import base_host
 
 
 class IssueLinkViewSet(BaseViewSet):
@@ -53,7 +52,7 @@ class IssueLinkViewSet(BaseViewSet):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -78,7 +77,7 @@ class IssueLinkViewSet(BaseViewSet):
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -99,7 +98,7 @@ class IssueLinkViewSet(BaseViewSet):
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue_link.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/issue/reaction.py

@@ -15,7 +15,6 @@ from plane.app.serializers import IssueReactionSerializer
 from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import IssueReaction
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.host import base_host
 
 
 class IssueReactionViewSet(BaseViewSet):
@@ -54,7 +53,7 @@ class IssueReactionViewSet(BaseViewSet):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -79,7 +78,7 @@ class IssueReactionViewSet(BaseViewSet):
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue_reaction.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/issue/relation.py

@@ -27,7 +27,6 @@ from plane.db.models import (
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_relation_mapper import get_actual_relation
-from plane.utils.host import base_host
 
 
 class IssueRelationViewSet(BaseViewSet):
@@ -254,7 +253,7 @@ class IssueRelationViewSet(BaseViewSet):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         if relation_type in ["blocking", "start_after", "finish_after"]:
@@ -269,19 +268,27 @@ class IssueRelationViewSet(BaseViewSet):
             )
 
     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)
 
-        issue_relations = IssueRelation.objects.filter(
-            workspace__slug=slug,
-        ).filter(
-            Q(issue_id=related_issue, related_issue_id=issue_id)
-            | Q(issue_id=issue_id, related_issue_id=related_issue)
-        )
-        issue_relations = issue_relations.first()
+        if relation_type in ["blocking", "start_after", "finish_after"]:
+            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,
+            )
         current_instance = json.dumps(
-            IssueRelationSerializer(issue_relations).data, cls=DjangoJSONEncoder
+            IssueRelationSerializer(issue_relation).data, cls=DjangoJSONEncoder
         )
-        issue_relations.delete()
+        issue_relation.delete()
         issue_activity.delay(
             type="issue_relation.activity.deleted",
             requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
@@ -291,6 +298,6 @@ class IssueRelationViewSet(BaseViewSet):
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
             notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/issue/sub_issue.py

@@ -22,8 +22,6 @@ from plane.db.models import Issue, IssueLink, FileAsset, CycleIssue
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.timezone_converter import user_timezone_converter
 from collections import defaultdict
-from plane.utils.host import base_host
-from plane.utils.order_queryset import order_issue_queryset
 
 
 class SubIssuesEndpoint(BaseAPIView):
@@ -104,15 +102,6 @@ class SubIssuesEndpoint(BaseAPIView):
             .order_by("-created_at")
         )
 
-        # Ordering
-        order_by_param = request.GET.get("order_by", "-created_at")
-        group_by = request.GET.get("group_by", False)
-
-        if order_by_param:
-            sub_issues, order_by_param = order_issue_queryset(
-                sub_issues, order_by_param
-            )
-
         # create's a dict with state group name with their respective issue id's
         result = defaultdict(list)
         for sub_issue in sub_issues:
@@ -149,26 +138,6 @@ class SubIssuesEndpoint(BaseAPIView):
         sub_issues = user_timezone_converter(
             sub_issues, datetime_fields, request.user.user_timezone
         )
-        # Grouping
-        if group_by:
-            result_dict = defaultdict(list)
-
-            for issue in sub_issues:
-                if group_by == "assignees__ids":
-                    if issue["assignee_ids"]:
-                        assignee_ids = issue["assignee_ids"]
-                        for assignee_id in assignee_ids:
-                            result_dict[str(assignee_id)].append(issue)
-                    elif issue["assignee_ids"] == []:
-                        result_dict["None"].append(issue)
-
-                elif group_by:
-                    result_dict[str(issue[group_by])].append(issue)
-
-            return Response(
-                {"sub_issues": result_dict, "state_distribution": result},
-                status=status.HTTP_200_OK,
-            )
         return Response(
             {"sub_issues": sub_issues, "state_distribution": result},
             status=status.HTTP_200_OK,
@@ -207,7 +176,7 @@ class SubIssuesEndpoint(BaseAPIView):
                 current_instance=json.dumps({"parent": str(sub_issue_id)}),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             for sub_issue_id in sub_issue_ids
         ]

apiserver/plane/app/views/issue/version.py

@@ -1,148 +0,0 @@
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-
-# Module imports
-from plane.db.models import (
-    IssueVersion,
-    IssueDescriptionVersion,
-    Project,
-    ProjectMember,
-    Issue,
-)
-from ..base import BaseAPIView
-from plane.app.serializers import (
-    IssueVersionDetailSerializer,
-    IssueDescriptionVersionDetailSerializer,
-)
-from plane.app.permissions import allow_permission, ROLE
-from plane.utils.global_paginator import paginate
-from plane.utils.timezone_converter import user_timezone_converter
-
-
-class IssueVersionEndpoint(BaseAPIView):
-    def process_paginated_result(self, fields, results, timezone):
-        paginated_data = results.values(*fields)
-
-        datetime_fields = ["created_at", "updated_at"]
-        paginated_data = user_timezone_converter(
-            paginated_data, datetime_fields, timezone
-        )
-
-        return paginated_data
-
-    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, issue_id, pk=None):
-        if pk:
-            issue_version = IssueVersion.objects.get(
-                workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
-            )
-
-            serializer = IssueVersionDetailSerializer(issue_version)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        cursor = request.GET.get("cursor", None)
-
-        required_fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-
-        issue_versions_queryset = IssueVersion.objects.filter(
-            workspace__slug=slug, project_id=project_id, issue_id=issue_id
-        )
-
-        paginated_data = paginate(
-            base_queryset=issue_versions_queryset,
-            queryset=issue_versions_queryset,
-            cursor=cursor,
-            on_result=lambda results: self.process_paginated_result(
-                required_fields, results, request.user.user_timezone
-            ),
-        )
-
-        return Response(paginated_data, status=status.HTTP_200_OK)
-
-
-class WorkItemDescriptionVersionEndpoint(BaseAPIView):
-    def process_paginated_result(self, fields, results, timezone):
-        paginated_data = results.values(*fields)
-
-        datetime_fields = ["created_at", "updated_at"]
-        paginated_data = user_timezone_converter(
-            paginated_data, datetime_fields, timezone
-        )
-
-        return paginated_data
-
-    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, work_item_id, pk=None):
-        project = Project.objects.get(pk=project_id)
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=work_item_id
-        )
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=ROLE.GUEST.value,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        if pk:
-            issue_description_version = IssueDescriptionVersion.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=work_item_id,
-                pk=pk,
-            )
-
-            serializer = IssueDescriptionVersionDetailSerializer(
-                issue_description_version
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        cursor = request.GET.get("cursor", None)
-
-        required_fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-
-        issue_description_versions_queryset = IssueDescriptionVersion.objects.filter(
-            workspace__slug=slug, project_id=project_id, issue_id=work_item_id
-        ).order_by("-created_at")
-        paginated_data = paginate(
-            base_queryset=issue_description_versions_queryset,
-            queryset=issue_description_versions_queryset,
-            cursor=cursor,
-            on_result=lambda results: self.process_paginated_result(
-                required_fields, results, request.user.user_timezone
-            ),
-        )
-        return Response(paginated_data, status=status.HTTP_200_OK)

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

@@ -54,14 +54,12 @@ from plane.db.models import (
     ModuleLink,
     ModuleUserProperties,
     Project,
-    UserRecentVisit,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.utils.timezone_converter import user_timezone_converter
 from plane.bgtasks.webhook_task import model_activity
 from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.utils.host import base_host
 
 
 class ModuleViewSet(BaseViewSet):
@@ -377,7 +375,7 @@ class ModuleViewSet(BaseViewSet):
                 current_instance=None,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             datetime_fields = ["created_at", "updated_at"]
             module = user_timezone_converter(
@@ -711,31 +709,23 @@ class ModuleViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def partial_update(self, request, slug, project_id, pk):
-        module_queryset = self.get_queryset().filter(pk=pk)
+        module = self.get_queryset().filter(pk=pk)
 
-        current_module = module_queryset.first()
-
-        if not current_module:
-            return Response(
-                {"error": "Module not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        if current_module.archived_at:
+        if module.first().archived_at:
             return Response(
                 {"error": "Archived module cannot be updated"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         current_instance = json.dumps(
-            ModuleSerializer(current_module).data, cls=DjangoJSONEncoder
+            ModuleSerializer(module.first()).data, cls=DjangoJSONEncoder
         )
         serializer = ModuleWriteSerializer(
-            current_module, data=request.data, partial=True
+            module.first(), data=request.data, partial=True
         )
 
         if serializer.is_valid():
             serializer.save()
-            module = module_queryset.values(
+            module = module.values(
                 # Required fields
                 "id",
                 "workspace_id",
@@ -777,7 +767,7 @@ class ModuleViewSet(BaseViewSet):
                 current_instance=current_instance,
                 actor_id=request.user.id,
                 slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
 
             datetime_fields = ["created_at", "updated_at"]
@@ -804,7 +794,7 @@ class ModuleViewSet(BaseViewSet):
                 current_instance=json.dumps({"module_name": str(module.name)}),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             for issue in module_issues
         ]
@@ -818,13 +808,6 @@ class ModuleViewSet(BaseViewSet):
             entity_identifier=pk,
             project_id=project_id,
         ).delete()
-        # delete the module from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="module",
-        ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)