[WEB-2043] chore: updated permissions for delete operation (#5231 )

* chore: added permission for delete operation * chore: added permission for external apis * chore: condition changes * chore: minor changes
fix: revoked issue height change (#5238 )
2024-07-26 16:42:51 +05:30 · 2024-07-26 13:38:26 +05:30 · 2024-07-25 20:35:51 +05:30 · 2024-07-25 16:28:03 +05:30 · 2024-07-25 15:17:20 +05:30 · 2024-07-25 15:16:14 +05:30
669 changed files with 16196 additions and 5621 deletions
@@ -2,7 +2,7 @@ name: Bug report
 description: Create a bug report to help us improve Plane
 title: "[bug]: "
 labels: [🐛bug]
-assignees: [srinivaspendem, pushya22]
+assignees: [vihar, pushya22]
 body:
 - type: markdown
  attributes:
@@ -2,7 +2,7 @@ name: Feature request
 description: Suggest a feature to improve Plane
 title: "[feature]: "
 labels: [✨feature]
-assignees: [srinivaspendem, pushya22]
+assignees: [vihar, pushya22]
 body:
 - type: markdown
  attributes:
@@ -2,6 +2,11 @@ name: Build AIO Base Image

 on:
  workflow_dispatch:
+    inputs:
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: ''

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -22,27 +27,29 @@ jobs:
      - id: set_env_variables
        name: Set Environment Variables
        run: |
+          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
+
+          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+            echo "IMAGE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
+          elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
+          else
+            echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
+          fi
+
+
          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
-            echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
          else
            echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-
-            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
-              echo "TARGET_BRANCH=preview" >> $GITHUB_OUTPUT
-              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
-            else
-              echo "TARGET_BRANCH=develop" >> $GITHUB_OUTPUT
-              echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
-            fi
          fi

      - id: checkout_files
@@ -54,7 +61,6 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
-      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -96,7 +102,6 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
-      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -13,6 +13,10 @@ on:
        type: boolean
        required: false
        default: false
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: ''
  release:
    types: [released, prereleased]

@@ -27,6 +31,7 @@ jobs:
    runs-on: ubuntu-latest
    outputs:
      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
+      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
      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 }}
@@ -52,7 +57,9 @@ jobs:
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT

-            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+            if [ "${{ github.event_name}}" == "workflow_dispatch" ] && [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+              echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+            elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
              echo "AIO_BASE_TAG=preview" >> $GITHUB_OUTPUT
            else
              echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
@@ -72,6 +79,9 @@ jobs:
            echo "DO_SLIM_BUILD=false" >> $GITHUB_OUTPUT
          fi

+          FLAT_BRANCH_NAME=$(echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9]/-/g')
+          echo "FLAT_BRANCH_NAME=$FLAT_BRANCH_NAME" >> $GITHUB_OUTPUT
+
      - id: checkout_files
        name: Checkout Files
        uses: actions/checkout@v4
@@ -83,7 +93,7 @@ jobs:
    env:
      BUILD_TYPE: full
      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.flat_branch_name }}
      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -126,7 +136,7 @@ jobs:
          tags: ${{ env.AIO_IMAGE_TAGS }}
          push: true
          build-args: |
-            BUILD_TAG=${{ env.AIO_BASE_TAG }}
+            BASE_TAG=${{ env.AIO_BASE_TAG }}
            BUILD_TYPE=${{env.BUILD_TYPE}}
          cache-from: type=gha
          cache-to: type=gha,mode=max
@@ -143,7 +153,7 @@ jobs:
    env:
      BUILD_TYPE: slim
      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.flat_branch_name }}
      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -186,7 +196,7 @@ jobs:
          tags: ${{ env.AIO_IMAGE_TAGS }}
          push: true
          build-args: |
-            BUILD_TAG=${{ env.AIO_BASE_TAG }}
+            BASE_TAG=${{ env.AIO_BASE_TAG }}
            BUILD_TYPE=${{env.BUILD_TYPE}}
          cache-from: type=gha
          cache-to: type=gha,mode=max
@@ -2,6 +2,11 @@ name: Feature Preview

 on:
  workflow_dispatch:
+    inputs:
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: 'preview'

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -29,7 +34,12 @@ jobs:
          echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
          echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
          echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-          echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
+
+          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+            echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+          else
+            echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
+          fi

          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT

@@ -1,6 +1,5 @@
 # Environment Variables

-
 Environment variables are distributed in various files. Please refer them carefully.

 ## {PROJECT_FOLDER}/.env
@@ -9,17 +8,13 @@ File is available in the project root folder

 ```
 # Database Settings
-PGUSER="plane"
-PGPASSWORD="plane"
-PGHOST="plane-db"
-PGDATABASE="plane"
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
-
+POSTGRES_USER="plane"
+POSTGRES_PASSWORD="plane"
+POSTGRES_DB="plane"
+PGDATA="/var/lib/postgresql/data"
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
-REDIS_URL="redis://${REDIS_HOST}:6379/"
-
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -29,63 +24,39 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
-
 # GPT settings
 OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
 GPT_ENGINE="gpt-3.5-turbo" # deprecated
-
+# Settings related to Docker
+DOCKERIZED=1  # deprecated
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
-
 # Nginx Configuration
 NGINX_PORT=80
 ```

-
-
-## {PROJECT_FOLDER}/web/.env.example
-
-
-
-```
-# Public boards deploy URL
-NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
-```
-
 ## {PROJECT_FOLDER}/apiserver/.env

-
-
 ```
 # Backend
 # 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
-PGUSER="plane"
-PGPASSWORD="plane"
-PGHOST="plane-db"
-PGDATABASE="plane"
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
-
+POSTGRES_USER="plane"
+POSTGRES_PASSWORD="plane"
+POSTGRES_HOST="plane-db"
+POSTGRES_DB="plane"
+POSTGRES_PORT=5432
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
-
-# Email Settings
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-EMAIL_PORT=587
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
-EMAIL_USE_TLS="1"
-EMAIL_USE_SSL="0"
-
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -95,35 +66,25 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
-
-# GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
-OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-3.5-turbo" # deprecated
-
 # Settings related to Docker
-DOCKERIZED=1  # Deprecated
-
-# Github
-GITHUB_CLIENT_SECRET="" # For fetching release notes
-
+DOCKERIZED=1 # deprecated
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
-
 # Nginx Configuration
 NGINX_PORT=80
-
-
-# SignUps
-ENABLE_SIGNUP="1"
-
-# Email Redirection URL
+# Email redirections and minio domain settings
 WEB_URL="http://localhost"
+# Gunicorn Workers
+GUNICORN_WORKERS=2
+# Base URLs
+ADMIN_BASE_URL=
+SPACE_BASE_URL=
+APP_BASE_URL=
+SECRET_KEY="gxoytl7dmnc1y37zahah820z5iq3iozu38cnfjtu3yaau9cd9z"
 ```

 ## Updates

- The environment variable NEXT_PUBLIC_API_BASE_URL has been removed from both the web and space projects.
 - The naming convention for containers and images has been updated.
 - The plane-worker image will no longer be maintained, as it has been merged with plane-backend.
 - The Tiptap pro-extension dependency has been removed, eliminating the need for Tiptap API keys.
@@ -10,6 +10,7 @@ import { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
+  CodeBlock,
  ConfirmDiscardModal,
  ControllerInput,
  CopyField,
@@ -102,7 +103,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
      url: originURL,
      description: (
        <>
-          We will auto-generate this. Paste this into the Authorized origin URL field{" "}
+          We will auto-generate this. Paste this into the{" "}
+          <CodeBlock darkerShade>Authorized origin URL</CodeBlock> field{" "}
          <a
            tabIndex={-1}
            href="https://github.com/settings/applications/new"
@@ -121,7 +123,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
      url: `${originURL}/auth/github/callback/`,
      description: (
        <>
-          We will auto-generate this. Paste this into your Authorized Callback URI field{" "}
+          We will auto-generate this. Paste this into your{" "}
+          <CodeBlock darkerShade>Authorized Callback URI</CodeBlock> field{" "}
          <a
            tabIndex={-1}
            href="https://github.com/settings/applications/new"
@@ -143,8 +146,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
      .then((response = []) => {
        setToast({
          type: TOAST_TYPE.SUCCESS,
-          title: "Success",
-          message: "Github Configuration Settings updated successfully",
+          title: "Done!",
+          message: "Your GitHub authentication is configured. You should test it now.",
        });
        reset({
          GITHUB_CLIENT_ID: response.find((item) => item.key === "GITHUB_CLIENT_ID")?.value,
@@ -170,8 +173,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
      />
      <div className="flex flex-col gap-8">
        <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
-            <div className="pt-2 text-xl font-medium">Configuration</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
+            <div className="pt-2.5 text-xl font-medium">GitHub-provided details for Plane</div>
            {GITHUB_FORM_FIELDS.map((field) => (
              <ControllerInput
                key={field.key}
@@ -201,8 +204,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
            </div>
          </div>
          <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Service provider details</div>
+            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Plane-provided details for GitHub</div>
              {GITHUB_SERVICE_FIELD.map((field) => (
                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
              ))}
@@ -93,7 +93,7 @@ const InstanceGithubAuthenticationPage = observer(() => {
            withBorder={false}
          />
        </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
          {formattedConfig ? (
            <InstanceGithubConfigForm config={formattedConfig} />
          ) : (
@@ -8,6 +8,7 @@ import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
+  CodeBlock,
  ConfirmDiscardModal,
  ControllerInput,
  CopyField,
@@ -54,7 +55,7 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
      label: "Host",
      description: (
        <>
-          This is the <b>GitLab host</b> to use for login, <b>including scheme</b>.
+          This is either https://gitlab.com or the <CodeBlock>domain.tld</CodeBlock> where you host GitLab.
        </>
      ),
      placeholder: "https://gitlab.com",
@@ -116,7 +117,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
      url: `${originURL}/auth/gitlab/callback/`,
      description: (
        <>
-          We will auto-generate this. Paste this into the <b>Redirect URI</b> field of your{" "}
+          We will auto-generate this. Paste this into the{" "}
+          <CodeBlock darkerShade>Redirect URI</CodeBlock> field of your{" "}
          <a
            tabIndex={-1}
            href="https://docs.gitlab.com/ee/integration/oauth_provider.html"
@@ -139,8 +141,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
      .then((response = []) => {
        setToast({
          type: TOAST_TYPE.SUCCESS,
-          title: "Success",
-          message: "GitLab Configuration Settings updated successfully",
+          title: "Done!",
+          message: "Your GitLab authentication is configured. You should test it now.",
        });
        reset({
          GITLAB_HOST: response.find((item) => item.key === "GITLAB_HOST")?.value,
@@ -167,8 +169,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
      />
      <div className="flex flex-col gap-8">
        <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
-            <div className="pt-2 text-xl font-medium">Configuration</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
+            <div className="pt-2.5 text-xl font-medium">GitLab-provided details for Plane</div>
            {GITLAB_FORM_FIELDS.map((field) => (
              <ControllerInput
                key={field.key}
@@ -198,8 +200,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
            </div>
          </div>
          <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Service provider details</div>
+            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Plane-provided details for GitLab</div>
              {GITLAB_SERVICE_FIELD.map((field) => (
                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
              ))}
@@ -80,7 +80,7 @@ const InstanceGitlabAuthenticationPage = observer(() => {
            withBorder={false}
          />
        </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
          {formattedConfig ? (
            <InstanceGitlabConfigForm config={formattedConfig} />
          ) : (
@@ -9,6 +9,7 @@ import { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
+  CodeBlock,
  ConfirmDiscardModal,
  ControllerInput,
  CopyField,
@@ -101,7 +102,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
      url: originURL,
      description: (
        <p>
-          We will auto-generate this. Paste this into your Authorized JavaScript origins field. For this OAuth client{" "}
+          We will auto-generate this. Paste this into your{" "}
+          <CodeBlock darkerShade>Authorized JavaScript origins</CodeBlock> field. For this OAuth client{" "}
          <a
            href="https://console.cloud.google.com/apis/credentials/oauthclient"
            target="_blank"
@@ -119,7 +121,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
      url: `${originURL}/auth/google/callback/`,
      description: (
        <p>
-          We will auto-generate this. Paste this into your Authorized Redirect URI field. For this OAuth client{" "}
+          We will auto-generate this. Paste this into your <CodeBlock darkerShade>Authorized Redirect URI</CodeBlock>{" "}
+          field. For this OAuth client{" "}
          <a
            href="https://console.cloud.google.com/apis/credentials/oauthclient"
            target="_blank"
@@ -140,8 +143,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
      .then((response = []) => {
        setToast({
          type: TOAST_TYPE.SUCCESS,
-          title: "Success",
-          message: "Google Configuration Settings updated successfully",
+          title: "Done!",
+          message: "Your Google authentication is configured. You should test it now.",
        });
        reset({
          GOOGLE_CLIENT_ID: response.find((item) => item.key === "GOOGLE_CLIENT_ID")?.value,
@@ -167,8 +170,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
      />
      <div className="flex flex-col gap-8">
        <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
-            <div className="pt-2 text-xl font-medium">Configuration</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
+            <div className="pt-2.5 text-xl font-medium">Google-provided details for Plane</div>
            {GOOGLE_FORM_FIELDS.map((field) => (
              <ControllerInput
                key={field.key}
@@ -198,8 +201,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
            </div>
          </div>
          <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Service provider details</div>
+            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Plane-provided details for Google</div>
              {GOOGLE_SERVICE_DETAILS.map((field) => (
                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
              ))}
@@ -81,7 +81,7 @@ const InstanceGoogleAuthenticationPage = observer(() => {
            withBorder={false}
          />
        </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
          {formattedConfig ? (
            <InstanceGoogleConfigForm config={formattedConfig} />
          ) : (
@@ -1,84 +1,48 @@
 import { observer } from "mobx-react";
 import Image from "next/image";
 import { useTheme } from "next-themes";
-import { KeyRound, Mails } from "lucide-react";
 // types
-import { TInstanceAuthenticationMethodKeys, TInstanceAuthenticationModes } from "@plane/types";
-// components
 import {
-  AuthenticationMethodCard,
-  EmailCodesConfiguration,
-  GithubConfiguration,
-  GitlabConfiguration,
-  GoogleConfiguration,
-  PasswordLoginConfiguration,
-} from "@/components/authentication";
+  TGetBaseAuthenticationModeProps,
+  TInstanceAuthenticationMethodKeys,
+  TInstanceAuthenticationModes,
+} from "@plane/types";
+// components
+import { AuthenticationMethodCard } from "@/components/authentication";
 // helpers
-import { resolveGeneralTheme } from "@/helpers/common.helper";
+import { UpgradeButton } from "@/components/common/upgrade-button";
+import { getBaseAuthenticationModes } from "@/helpers/authentication.helper";
 // images
-import githubLightModeImage from "@/public/logos/github-black.png";
-import githubDarkModeImage from "@/public/logos/github-white.png";
-import GitlabLogo from "@/public/logos/gitlab-logo.svg";
-import GoogleLogo from "@/public/logos/google-logo.svg";
+import OIDCLogo from "@/public/logos/oidc-logo.svg";
+import SAMLLogo from "@/public/logos/saml-logo.svg";

 export type TAuthenticationModeProps = {
  disabled: boolean;
  updateConfig: (key: TInstanceAuthenticationMethodKeys, value: string) => void;
 };

-export type TGetAuthenticationModeProps = {
-  disabled: boolean;
-  updateConfig: (key: TInstanceAuthenticationMethodKeys, value: string) => void;
-  resolvedTheme: string | undefined;
-};
-
 // Authentication methods
-export const getAuthenticationModes: (props: TGetAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
+export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
  disabled,
  updateConfig,
  resolvedTheme,
 }) => [
+    ...getBaseAuthenticationModes({ disabled, updateConfig, resolvedTheme }),
    {
-    key: "unique-codes",
-    name: "Unique codes",
-    description: "Log in or sign up for Plane using codes sent via email. You need to have set up SMTP to use this method.",
-      icon: <Mails className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
-      config: <EmailCodesConfiguration disabled={disabled} updateConfig={updateConfig} />,
+      key: "oidc",
+      name: "OIDC",
+      description: "Authenticate your users via the OpenID Connect protocol.",
+      icon: <Image src={OIDCLogo} height={22} width={22} alt="OIDC Logo" />,
+      config: <UpgradeButton />,
+      unavailable: true,
    },
    {
-      key: "passwords-login",
-      name: "Passwords",
-      description: "Allow members to create accounts with passwords and use it with their email addresses to sign in.",
-      icon: <KeyRound className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
-      config: <PasswordLoginConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "google",
-      name: "Google",
-      description: "Allow members to log in or sign up for Plane with their Google accounts.",
-      icon: <Image src={GoogleLogo} height={20} width={20} alt="Google Logo" />,
-      config: <GoogleConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "github",
-      name: "GitHub",
-      description: "Allow members to log in or sign up for Plane with their GitHub accounts.",
-      icon: (
-        <Image
-          src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}
-          height={20}
-          width={20}
-          alt="GitHub Logo"
-        />
-      ),
-      config: <GithubConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "gitlab",
-      name: "GitLab",
-      description: "Allow members to login or sign up to plane with their GitLab accounts.",
-      icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,
-      config: <GitlabConfiguration disabled={disabled} updateConfig={updateConfig} />,
+      key: "saml",
+      name: "SAML",
+      description: "Authenticate your users via the Security Assertion Markup Language protocol.",
+      icon: <Image src={SAMLLogo} height={22} width={22} alt="SAML Logo" className="pl-0.5" />,
+      config: <UpgradeButton />,
+      unavailable: true,
    },
  ];

@@ -97,6 +61,7 @@ export const AuthenticationModes: React.FC<TAuthenticationModeProps> = observer(
          icon={method.icon}
          config={method.config}
          disabled={disabled}
+          unavailable={method.unavailable}
        />
      ))}
    </>
@@ -41,10 +41,10 @@ export const InstanceSidebar: FC<IInstanceSidebar> = observer(() => {
    <div
      className={`inset-y-0 z-20 flex h-full flex-shrink-0 flex-grow-0 flex-col border-r border-custom-sidebar-border-200 bg-custom-sidebar-background-100 duration-300
        fixed md:relative
-        ${isSidebarCollapsed ? "-ml-[280px]" : ""}
-        sm:${isSidebarCollapsed ? "-ml-[280px]" : ""}
-        md:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[280px]"}
-        lg:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[280px]"}
+        ${isSidebarCollapsed ? "-ml-[290px]" : ""}
+        sm:${isSidebarCollapsed ? "-ml-[290px]" : ""}
+        md:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[290px]"}
+        lg:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[290px]"}
      `}
    >
      <div ref={ref} className="flex h-full w-full flex-1 flex-col">
@@ -11,10 +11,11 @@ type Props = {
  config: JSX.Element;
  disabled?: boolean;
  withBorder?: boolean;
+  unavailable?: boolean;
 };

 export const AuthenticationMethodCard: FC<Props> = (props) => {
-  const { name, description, icon, config, disabled = false, withBorder = true } = props;
+  const { name, description, icon, config, disabled = false, withBorder = true, unavailable = false } = props;

  return (
    <div
@@ -22,7 +23,11 @@ export const AuthenticationMethodCard: FC<Props> = (props) => {
        "px-4 py-3 border border-custom-border-200": withBorder,
      })}
    >
-      <div className="flex grow items-center gap-4">
+      <div
+        className={cn("flex grow items-center gap-4", {
+          "opacity-50": unavailable,
+        })}
+      >
        <div className="shrink-0">
          <div className="flex h-10 w-10 items-center justify-center rounded-full bg-custom-background-80">{icon}</div>
        </div>
@@ -0,0 +1,21 @@
+import { cn } from "@/helpers/common.helper";
+
+type TProps = {
+  children: React.ReactNode;
+  className?: string;
+  darkerShade?: boolean;
+};
+
+export const CodeBlock = ({ children, className, darkerShade }: TProps) => (
+  <span
+    className={cn(
+      "px-0.5 text-xs text-custom-text-300 bg-custom-background-90 font-semibold rounded-md border border-custom-border-100",
+      {
+        "text-custom-text-200 bg-custom-background-80 border-custom-border-200": darkerShade,
+      },
+      className
+    )}
+  >
+    {children}
+  </span>
+);
@@ -38,7 +38,7 @@ export const ControllerInput: React.FC<Props> = (props) => {
  return (
    <div className="flex flex-col gap-1">
      <h4 className="text-sm text-custom-text-300">
-        {label} {!required && "(optional)"}
+        {label}
      </h4>
      <div className="relative">
        <Controller
@@ -80,7 +80,7 @@ export const ControllerInput: React.FC<Props> = (props) => {
            </button>
          ))}
      </div>
-      {description && <p className="text-xs text-custom-text-300">{description}</p>}
+      {description && <p className="pt-0.5 text-xs text-custom-text-300">{description}</p>}
    </div>
  );
 };
@@ -7,3 +7,5 @@ export * from "./banner";
 export * from "./empty-state";
 export * from "./logo-spinner";
 export * from "./page-header";
+export * from "./code-block";
+export * from "./upgrade-button";
@@ -0,0 +1,16 @@
+"use client";
+
+import React from "react";
+// icons
+import { SquareArrowOutUpRight } from "lucide-react";
+// ui
+import { getButtonStyling } from "@plane/ui";
+// helpers
+import { cn } from "@/helpers/common.helper";
+
+export const UpgradeButton: React.FC = () => (
+  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+    Available on One
+    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
+  </a>
+);
@@ -1,7 +1,24 @@
 import { ReactNode } from "react";
+import Image from "next/image";
 import Link from "next/link";
+import { KeyRound, Mails } from "lucide-react";
+// types
+import { TGetBaseAuthenticationModeProps, TInstanceAuthenticationModes } from "@plane/types";
+// components
+import {
+  EmailCodesConfiguration,
+  GithubConfiguration,
+  GitlabConfiguration,
+  GoogleConfiguration,
+  PasswordLoginConfiguration,
+} from "@/components/authentication";
 // helpers
-import { SUPPORT_EMAIL } from "./common.helper";
+import { SUPPORT_EMAIL, resolveGeneralTheme } from "@/helpers/common.helper";
+// images
+import githubLightModeImage from "@/public/logos/github-black.png";
+import githubDarkModeImage from "@/public/logos/github-white.png";
+import GitlabLogo from "@/public/logos/gitlab-logo.svg";
+import GoogleLogo from "@/public/logos/google-logo.svg";

 export enum EPageTypes {
  PUBLIC = "PUBLIC",
@@ -134,3 +151,53 @@ export const authErrorHandler = (

  return undefined;
 };
+
+export const getBaseAuthenticationModes: (props: TGetBaseAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
+  disabled,
+  updateConfig,
+  resolvedTheme,
+}) => [
+    {
+      key: "unique-codes",
+      name: "Unique codes",
+      description:
+        "Log in or sign up for Plane using codes sent via email. You need to have set up SMTP to use this method.",
+      icon: <Mails className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
+      config: <EmailCodesConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "passwords-login",
+      name: "Passwords",
+      description: "Allow members to create accounts with passwords and use it with their email addresses to sign in.",
+      icon: <KeyRound className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
+      config: <PasswordLoginConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "google",
+      name: "Google",
+      description: "Allow members to log in or sign up for Plane with their Google accounts.",
+      icon: <Image src={GoogleLogo} height={20} width={20} alt="Google Logo" />,
+      config: <GoogleConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "github",
+      name: "GitHub",
+      description: "Allow members to log in or sign up for Plane with their GitHub accounts.",
+      icon: (
+        <Image
+          src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}
+          height={20}
+          width={20}
+          alt="GitHub Logo"
+        />
+      ),
+      config: <GithubConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "gitlab",
+      name: "GitLab",
+      description: "Allow members to log in or sign up to plane with their GitLab accounts.",
+      icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,
+      config: <GitlabConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+  ];
@@ -1,6 +1,6 @@
 {
  "name": "admin",
-  "version": "0.21.0",
+  "version": "0.22.0",
  "private": true,
  "scripts": {
    "dev": "turbo run develop",
@@ -14,6 +14,7 @@
    "@headlessui/react": "^1.7.19",
    "@plane/types": "*",
    "@plane/ui": "*",
+    "@plane/constants": "*",
    "@tailwindcss/typography": "^0.5.9",
    "@types/lodash": "^4.17.0",
    "autoprefixer": "10.4.14",
@@ -46,4 +47,4 @@
    "tsconfig": "*",
    "typescript": "^5.4.2"
  }
-}
+}
@@ -0,0 +1,11 @@
+<svg width="92" height="84" viewBox="0 0 92 84" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3695_11896)">
+<path d="M83.0398 32.6876C74.2901 27.2397 62.0735 23.8553 48.7013 23.8553C21.7918 23.8553 0 37.3101 0 53.9016C0 69.0898 18.1598 81.554 41.685 83.7001V74.9504C25.8364 72.9693 13.95 64.3022 13.95 53.9016C13.95 42.0977 29.4684 32.44 48.7013 32.44C58.2765 32.44 66.9436 34.8338 73.217 38.7134L64.3022 44.2439H92.1197V27.0746L83.0398 32.6876Z" fill="#CCCCCC"/>
+<path d="M41.6846 8.99736V74.9504V83.7002L55.6346 74.9504V0L41.6846 8.99736Z" fill="#FF6200"/>
+</g>
+<defs>
+<clipPath id="clip0_3695_11896">
+<rect width="92" height="84" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -0,0 +1,17 @@
+<svg width="700" height="650" viewBox="0 0 700 650" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3262_5767)">
+<mask id="mask0_3262_5767" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="700" height="650">
+<path d="M700 0H0V650H700V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_3262_5767)">
+<path d="M337.682 0L360.832 20.5C377.982 35.7 395.182 50.85 412.132 66.25C521.982 166 614.982 278.25 684.982 407.45C688.582 414.05 691.832 420.85 695.082 427.6L699.982 437.75L694.582 440.6L690.532 434.85L680.032 419.9L672.682 409.2C621.732 335.25 570.682 261.2 500.582 201.95C479.373 183.995 455.969 168.807 430.932 156.75C380.232 132.5 335.132 142.2 296.432 182C259.632 219.85 240.532 266.85 223.282 314.65C221.032 320.8 218.682 326.9 216.332 333L212.232 343.75L203.632 341C208.632 323.6 213.232 306.1 217.832 288.55C228.332 248.8 238.832 209.05 253.432 170.75C268.932 129.95 288.532 90.6 308.082 51.25C316.532 34.2 324.982 17.15 333.082 0H337.682Z" fill="#C22E33"/>
+<path d="M372.382 491.1C291.082 529.6 94.3829 569.3 1.08287 559.1C-14.1671 478.8 135.482 102.5 208.982 45.5L204.232 56.4C202.115 61.531 199.813 66.5842 197.332 71.55L194.032 78C156.032 151.1 118.082 224.3 98.6329 304.5C91.6287 332.124 87.8038 360.458 87.2328 388.95C86.7328 455.95 128.432 501.55 198.082 504.4C231.582 505.75 265.432 502.25 299.232 498.7C313.932 497.2 328.582 495.65 343.232 494.5C348.632 494.1 353.932 493.45 360.832 492.55L372.382 491.15V491.1Z" fill="#C22E33"/>
+<path d="M141.233 639.05C118.983 640.75 96.733 642.45 74.583 644.45C279.433 663.95 476.083 630.6 670.083 562.25C606.833 450.75 521.583 362.7 422.483 286.15C423.783 291.05 426.683 294.6 429.533 298.1L431.933 301.1C440.433 312.4 449.333 323.5 458.283 334.6C478.733 360.05 499.183 385.5 514.583 413.5C553.483 484.5 532.383 545.9 456.183 578.3C406.083 599.65 351.333 614.2 297.183 622.9C245.683 631.1 193.433 635.05 141.233 639.05Z" fill="#C22E33"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_3262_5767">
+<rect width="700" height="650" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -1,4 +1,4 @@
 {
  "name": "plane-api",
-  "version": "0.21.0"
+  "version": "0.22.0"
 }
@@ -13,9 +13,9 @@ class CycleSerializer(BaseSerializer):
    started_issues = serializers.IntegerField(read_only=True)
    unstarted_issues = serializers.IntegerField(read_only=True)
    backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimates = serializers.IntegerField(read_only=True)
-    completed_estimates = serializers.IntegerField(read_only=True)
-    started_estimates = serializers.IntegerField(read_only=True)
+    total_estimates = serializers.FloatField(read_only=True)
+    completed_estimates = serializers.FloatField(read_only=True)
+    started_estimates = serializers.FloatField(read_only=True)

    def validate(self, data):
        if (
@@ -55,7 +55,6 @@ class IssueSerializer(BaseSerializer):
            "project",
            "created_by",
            "updated_by",
-            "created_at",
            "updated_at",
        ]
        exclude = [
@@ -131,7 +130,10 @@ class IssueSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

-        issue = Issue.objects.create(**validated_data, project_id=project_id)
+        issue = Issue.objects.create(
+            **validated_data,
+            project_id=project_id,
+        )

        # Issue Audit Users
        created_by_id = issue.created_by_id
@@ -312,10 +314,14 @@ class IssueLinkSerializer(BaseSerializer):
        return IssueLink.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=instance.issue_id,
-        ).exclude(pk=instance.id).exists():
+        if (
+            IssueLink.objects.filter(
+                url=validated_data.get("url"),
+                issue_id=instance.issue_id,
+            )
+            .exclude(pk=instance.id)
+            .exists()
+        ):
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
            )
@@ -4,6 +4,7 @@ from .issue import urlpatterns as issue_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .inbox import urlpatterns as inbox_patterns
+from .member import urlpatterns as member_patterns

 urlpatterns = [
    *project_patterns,
@@ -12,4 +13,5 @@ urlpatterns = [
    *cycle_patterns,
    *module_patterns,
    *inbox_patterns,
+    *member_patterns,
 ]
@@ -7,6 +7,7 @@ from plane.api.views import (
    IssueCommentAPIEndpoint,
    IssueActivityAPIEndpoint,
    WorkspaceIssueAPIEndpoint,
+    IssueAttachmentEndpoint,
 )

 urlpatterns = [
@@ -65,4 +66,9 @@ urlpatterns = [
        IssueActivityAPIEndpoint.as_view(),
        name="activity",
    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
+        IssueAttachmentEndpoint.as_view(),
+        name="attachment",
+    ),
 ]
@@ -0,0 +1,13 @@
+from django.urls import path
+
+from plane.api.views import (
+    WorkspaceMemberAPIEndpoint,
+)
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/members/",
+        WorkspaceMemberAPIEndpoint.as_view(),
+        name="users",
+    ),
+]
@@ -9,6 +9,7 @@ from .issue import (
    IssueLinkAPIEndpoint,
    IssueCommentAPIEndpoint,
    IssueActivityAPIEndpoint,
+    IssueAttachmentEndpoint,
 )

 from .cycle import (
@@ -24,4 +25,6 @@ from .module import (
    ModuleArchiveUnarchiveAPIEndpoint,
 )

+from .member import WorkspaceMemberAPIEndpoint
+
 from .inbox import InboxIssueAPIEndpoint
@@ -12,7 +12,7 @@ from django.db.models import (
    OuterRef,
    Q,
    Sum,
-    IntegerField,
+    FloatField,
 )
 from django.db.models.functions import Cast

@@ -34,6 +34,7 @@ from plane.db.models import (
    Project,
    IssueAttachment,
    IssueLink,
+    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot

@@ -363,14 +364,28 @@ class CycleAPIEndpoint(BaseAPIView):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    def delete(self, request, slug, project_id, pk):
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
+        if cycle.owned_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the cycle"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        cycle_issues = list(
            CycleIssue.objects.filter(
                cycle_id=self.kwargs.get("pk")
            ).values_list("issue", flat=True)
        )
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )

        issue_activity.delay(
            type="cycle.activity.deleted",
@@ -393,7 +408,6 @@ class CycleAPIEndpoint(BaseAPIView):


 class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
-
    permission_classes = [
        ProjectEntityPermission,
    ]
@@ -647,17 +661,6 @@ class CycleIssueAPIEndpoint(BaseAPIView):
            workspace__slug=slug, project_id=project_id, pk=cycle_id
        )

-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
-            return Response(
-                {
-                    "error": "The Cycle has already been completed so no new issues can be added"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
        issues = Issue.objects.filter(
            pk__in=issues, workspace__slug=slug, project_id=project_id
        ).values_list("id", flat=True)
@@ -867,12 +870,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                .values("display_name", "assignee_id", "avatar")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -882,7 +885,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -921,12 +924,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                .values("label_name", "color", "label_id")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -936,7 +939,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -1140,12 +1143,38 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
        )

        updated_cycles = []
+        update_cycle_issue_activity = []
        for cycle_issue in cycle_issues:
            cycle_issue.cycle_id = new_cycle_id
            updated_cycles.append(cycle_issue)
+            update_cycle_issue_activity.append(
+                {
+                    "old_cycle_id": str(cycle_id),
+                    "new_cycle_id": str(new_cycle_id),
+                    "issue_id": str(cycle_issue.issue_id),
+                }
+            )

        cycle_issues = CycleIssue.objects.bulk_update(
            updated_cycles, ["cycle_id"], batch_size=100
        )

+        # Capture Issue Activity
+        issue_activity.delay(
+            type="cycle.activity.created",
+            requested_data=json.dumps({"cycles_list": []}),
+            actor_id=str(self.request.user.id),
+            issue_id=None,
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=json.dumps(
+                {
+                    "updated_cycle_issues": update_cycle_issue_activity,
+                    "created_cycle_issues": "[]",
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
+
        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -3,8 +3,11 @@ import json

 # Django improts
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Q
 from django.utils import timezone
+from django.db.models import Q, Value, UUIDField
+from django.db.models.functions import Coalesce
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField

 # Third party imports
 from rest_framework import status
@@ -149,7 +152,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            description_html=request.data.get("issue", {}).get(
                "description_html", "<p></p>"
            ),
-            priority=request.data.get("issue", {}).get("priority", "low"),
+            priority=request.data.get("issue", {}).get("priority", "none"),
            project_id=project_id,
            state=state,
        )
@@ -224,8 +227,27 @@ class InboxIssueAPIEndpoint(BaseAPIView):
        issue_data = request.data.pop("issue", False)

        if bool(issue_data):
-            issue = Issue.objects.get(
-                pk=issue_id, workspace__slug=slug, project_id=project_id
+            issue = Issue.objects.annotate(
+                label_ids=Coalesce(
+                    ArrayAgg(
+                        "labels__id",
+                        distinct=True,
+                        filter=~Q(labels__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                assignee_ids=Coalesce(
+                    ArrayAgg(
+                        "assignees__id",
+                        distinct=True,
+                        filter=~Q(assignees__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+            ).get(
+                pk=issue_id,
+                workspace__slug=slug,
+                project_id=project_id,
            )
            # Only allow guests and viewers to edit name and description
            if project_member.role <= 10:
@@ -368,29 +390,26 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            inbox_id=inbox.id,
        )

-        # Get the project member
-        project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            is_active=True,
-        )
-
-        # Check the inbox issue created
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-            request.user.id
-        ):
-            return Response(
-                {"error": "You cannot delete inbox issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
        # Check the issue status
        if inbox_issue.status in [-2, -1, 0, 2]:
            # Delete the issue also
-            Issue.objects.filter(
+            issue = Issue.objects.filter(
                workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).delete()
+            ).first()
+            if issue.created_by_id != request.user.id and (
+                not ProjectMember.objects.filter(
+                    workspace__slug=slug,
+                    member=request.user,
+                    role=20,
+                    project_id=project_id,
+                    is_active=True,
+                ).exists()
+            ):
+                return Response(
+                    {"error": "Only admin or creator can delete the issue"},
+                    status=status.HTTP_403_FORBIDDEN,
+                )
+            issue.delete()

        inbox_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -22,9 +22,11 @@ from django.utils import timezone
 # 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 (
+    IssueAttachmentSerializer,
    IssueActivitySerializer,
    IssueCommentSerializer,
    IssueLinkSerializer,
@@ -307,6 +309,14 @@ class IssueAPIEndpoint(BaseAPIView):
                )

            serializer.save()
+            # Refetch the issue
+            issue = Issue.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                pk=serializer.data["id"],
+            ).first()
+            issue.created_at = request.data.get("created_at")
+            issue.save(update_fields=["created_at"])

            # Track the issue
            issue_activity.delay(
@@ -379,6 +389,19 @@ class IssueAPIEndpoint(BaseAPIView):
        issue = Issue.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
+        if issue.created_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the issue"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
@@ -874,3 +897,83 @@ class IssueActivityAPIEndpoint(BaseAPIView):
                expand=self.expand,
            ).data,
        )
+
+
+class IssueAttachmentEndpoint(BaseAPIView):
+    serializer_class = IssueAttachmentSerializer
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = IssueAttachment
+    parser_classes = (MultiPartParser, FormParser)
+
+    def post(self, request, slug, project_id, issue_id):
+        serializer = IssueAttachmentSerializer(data=request.data)
+        if (
+            request.data.get("external_id")
+            and request.data.get("external_source")
+            and IssueAttachment.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"),
+            ).exists()
+        ):
+            issue_attachment = IssueAttachment.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                external_id=request.data.get("external_id"),
+                external_source=request.data.get("external_source"),
+            ).first()
+            return Response(
+                {
+                    "error": "Issue attachment with the same external id and external source already exists",
+                    "id": str(issue_attachment.id),
+                },
+                status=status.HTTP_409_CONFLICT,
+            )
+
+        if serializer.is_valid():
+            serializer.save(project_id=project_id, issue_id=issue_id)
+            issue_activity.delay(
+                type="attachment.activity.created",
+                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=json.dumps(
+                    serializer.data,
+                    cls=DjangoJSONEncoder,
+                ),
+                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)
+
+    def delete(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = IssueAttachment.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"),
+        )
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def get(self, request, slug, project_id, issue_id):
+        issue_attachments = IssueAttachment.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)
@@ -0,0 +1,147 @@
+# Python imports
+import uuid
+
+# Django imports
+from django.contrib.auth.hashers import make_password
+from django.core.validators import validate_email
+from django.core.exceptions import ValidationError
+
+# Third Party imports
+from rest_framework.response import Response
+from rest_framework import status
+
+# Module imports
+from .base import BaseAPIView
+from plane.api.serializers import UserLiteSerializer
+from plane.db.models import (
+    User,
+    Workspace,
+    Project,
+    WorkspaceMember,
+    ProjectMember,
+)
+
+
+# API endpoint to get and insert users inside the workspace
+class WorkspaceMemberAPIEndpoint(BaseAPIView):
+    # Get all the users that are present inside the workspace
+    def get(self, request, slug):
+        # Check if the workspace exists
+        if not Workspace.objects.filter(slug=slug).exists():
+            return Response(
+                {"error": "Provided workspace does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Get the workspace members that are present inside the workspace
+        workspace_members = WorkspaceMember.objects.filter(
+            workspace__slug=slug
+        )
+
+        # Get all the users that are present inside the workspace
+        users = UserLiteSerializer(
+            User.objects.filter(
+                id__in=workspace_members.values_list("member_id", flat=True)
+            ),
+            many=True,
+        ).data
+
+        return Response(users, status=status.HTTP_200_OK)
+
+    # Insert a new user inside the workspace, and assign the user to the project
+    def post(self, request, slug):
+        # Check if user with email already exists, and send bad request if it's
+        # not present, check for workspace and valid project mandat
+        # ------------------- Validation -------------------
+        if (
+            request.data.get("email") is None
+            or request.data.get("display_name") is None
+            or request.data.get("project_id") is None
+        ):
+            return Response(
+                {
+                    "error": "Expected email, display_name, workspace_slug, project_id, one or more of the fields are missing."
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        email = request.data.get("email")
+
+        try:
+            validate_email(email)
+        except ValidationError:
+            return Response(
+                {"error": "Invalid email provided"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        workspace = Workspace.objects.filter(slug=slug).first()
+        project = Project.objects.filter(
+            pk=request.data.get("project_id")
+        ).first()
+
+        if not all([workspace, project]):
+            return Response(
+                {"error": "Provided workspace or project does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Check if user exists
+        user = User.objects.filter(email=email).first()
+        workspace_member = None
+        project_member = None
+
+        if user:
+            # Check if user is part of the workspace
+            workspace_member = WorkspaceMember.objects.filter(
+                workspace=workspace, member=user
+            ).first()
+            if workspace_member:
+                # Check if user is part of the project
+                project_member = ProjectMember.objects.filter(
+                    project=project, member=user
+                ).first()
+                if project_member:
+                    return Response(
+                        {
+                            "error": "User is already part of the workspace and project"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+
+        # If user does not exist, create the user
+        if not user:
+            user = User.objects.create(
+                email=email,
+                display_name=request.data.get("display_name"),
+                first_name=request.data.get("first_name", ""),
+                last_name=request.data.get("last_name", ""),
+                username=uuid.uuid4().hex,
+                password=make_password(uuid.uuid4().hex),
+                is_password_autoset=True,
+                is_active=False,
+            )
+            user.save()
+
+        # Create a workspace member for the user if not already a member
+        if not workspace_member:
+            workspace_member = WorkspaceMember.objects.create(
+                workspace=workspace,
+                member=user,
+                role=request.data.get("role", 10),
+            )
+            workspace_member.save()
+
+        # Create a project member for the user if not already a member
+        if not project_member:
+            project_member = ProjectMember.objects.create(
+                project=project,
+                member=user,
+                role=request.data.get("role", 10),
+            )
+            project_member.save()
+
+        # Serialize the user and return the response
+        user_data = UserLiteSerializer(user).data
+
+        return Response(user_data, status=status.HTTP_201_CREATED)
@@ -27,6 +27,7 @@ from plane.db.models import (
    ModuleIssue,
    ModuleLink,
    Project,
+    ProjectMember,
 )

 from .base import BaseAPIView
@@ -265,6 +266,20 @@ class ModuleAPIEndpoint(BaseAPIView):
        module = Module.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
+        if module.created_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the module"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        module_issues = list(
            ModuleIssue.objects.filter(module_id=pk).values_list(
                "issue", flat=True
@@ -19,7 +19,7 @@ from plane.app.permissions import ProjectBasePermission
 from plane.db.models import (
    Cycle,
    Inbox,
-    IssueProperty,
+    IssueUserProperty,
    Module,
    Project,
    DeployBoard,
@@ -165,7 +165,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                    role=20,
                )
                # Also create the issue property for the user
-                _ = IssueProperty.objects.create(
+                _ = IssueUserProperty.objects.create(
                    project_id=serializer.data["id"],
                    user=request.user,
                )
@@ -179,7 +179,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                        role=20,
                    )
                    # Also create the issue property for the user
-                    IssueProperty.objects.create(
+                    IssueUserProperty.objects.create(
                        project_id=serializer.data["id"],
                        user_id=serializer.data["project_lead"],
                    )
@@ -240,6 +240,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                    .filter(pk=serializer.data["id"])
                    .first()
                )
+
                # Model activity
                model_activity.delay(
                    model_name="project",
@@ -50,7 +50,7 @@ from .issue import (
    IssueCreateSerializer,
    IssueActivitySerializer,
    IssueCommentSerializer,
-    IssuePropertySerializer,
+    IssueUserPropertySerializer,
    IssueAssigneeSerializer,
    LabelSerializer,
    IssueSerializer,
@@ -91,6 +91,7 @@ from .page import (
    PageLogSerializer,
    SubPageSerializer,
    PageDetailSerializer,
+    PageVersionSerializer,
 )

 from .estimate import (
@@ -17,7 +17,7 @@ from plane.db.models import (
    Issue,
    IssueActivity,
    IssueComment,
-    IssueProperty,
+    IssueUserProperty,
    IssueAssignee,
    IssueSubscriber,
    IssueLabel,
@@ -135,7 +135,11 @@ class IssueCreateSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

-        issue = Issue.objects.create(**validated_data, project_id=project_id)
+        # Create Issue
+        issue = Issue.objects.create(
+            **validated_data,
+            project_id=project_id,
+        )

        # Issue Audit Users
        created_by_id = issue.created_by_id
@@ -248,9 +252,9 @@ class IssueActivitySerializer(BaseSerializer):
        fields = "__all__"


-class IssuePropertySerializer(BaseSerializer):
+class IssueUserPropertySerializer(BaseSerializer):
    class Meta:
-        model = IssueProperty
+        model = IssueUserProperty
        fields = "__all__"
        read_only_fields = [
            "user",
@@ -459,10 +463,14 @@ class IssueLinkSerializer(BaseSerializer):
        return IssueLink.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=instance.issue_id,
-        ).exclude(pk=instance.id).exists():
+        if (
+            IssueLink.objects.filter(
+                url=validated_data.get("url"),
+                issue_id=instance.issue_id,
+            )
+            .exclude(pk=instance.id)
+            .exists()
+        ):
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
            )
@@ -509,7 +517,7 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
            "attributes",
            "issue_id",
            "updated_at",
-            "updated_by_id",
+            "updated_by",
        ]
        read_only_fields = fields

@@ -177,8 +177,8 @@ class ModuleSerializer(DynamicBaseSerializer):
    started_issues = serializers.IntegerField(read_only=True)
    unstarted_issues = serializers.IntegerField(read_only=True)
    backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimate_points = serializers.IntegerField(read_only=True)
-    completed_estimate_points = serializers.IntegerField(read_only=True)
+    total_estimate_points = serializers.FloatField(read_only=True)
+    completed_estimate_points = serializers.FloatField(read_only=True)

    class Meta:
        model = Module
@@ -222,10 +222,10 @@ class ModuleSerializer(DynamicBaseSerializer):
 class ModuleDetailSerializer(ModuleSerializer):
    link_module = ModuleLinkSerializer(read_only=True, many=True)
    sub_issues = serializers.IntegerField(read_only=True)
-    backlog_estimate_points = serializers.IntegerField(read_only=True)
-    unstarted_estimate_points = serializers.IntegerField(read_only=True)
-    started_estimate_points = serializers.IntegerField(read_only=True)
-    cancelled_estimate_points = serializers.IntegerField(read_only=True)
+    backlog_estimate_points = serializers.FloatField(read_only=True)
+    unstarted_estimate_points = serializers.FloatField(read_only=True)
+    started_estimate_points = serializers.FloatField(read_only=True)
+    cancelled_estimate_points = serializers.FloatField(read_only=True)

    class Meta(ModuleSerializer.Meta):
        fields = ModuleSerializer.Meta.fields + ["link_module", "sub_issues", "backlog_estimate_points", "unstarted_estimate_points", "started_estimate_points", "cancelled_estimate_points"]
@@ -3,11 +3,16 @@ from .base import BaseSerializer
 from .user import UserLiteSerializer
 from plane.db.models import Notification, UserNotificationPreference

+# Third Party imports
+from rest_framework import serializers
+

 class NotificationSerializer(BaseSerializer):
    triggered_by_details = UserLiteSerializer(
        read_only=True, source="triggered_by"
    )
+    is_inbox_issue = serializers.BooleanField(read_only=True)
+    is_mentioned_notification = serializers.BooleanField(read_only=True)

    class Meta:
        model = Notification
@@ -10,6 +10,7 @@ from plane.db.models import (
    Label,
    ProjectPage,
    Project,
+    PageVersion,
 )


@@ -161,3 +162,13 @@ class PageLogSerializer(BaseSerializer):
            "workspace",
            "page",
        ]
+
+
+class PageVersionSerializer(BaseSerializer):
+    class Meta:
+        model = PageVersion
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "page",
+        ]
@@ -23,7 +23,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
        ]

    def create(self, validated_data):
-        query_params = validated_data.get("query_data", {})
+        query_params = validated_data.get("filters", {})
        if bool(query_params):
            validated_data["query"] = issue_filters(query_params, "POST")
        else:
@@ -31,7 +31,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
        return IssueView.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        query_params = validated_data.get("query_data", {})
+        query_params = validated_data.get("filters", {})
        if bool(query_params):
            validated_data["query"] = issue_filters(query_params, "POST")
        else:
@@ -15,6 +15,7 @@ from plane.db.models import (
    WorkspaceTheme,
    WorkspaceUserProperties,
 )
+from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS


 class WorkSpaceSerializer(DynamicBaseSerializer):
@@ -22,22 +23,11 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
    total_members = serializers.IntegerField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)

-    def validated(self, data):
-        if data.get("slug") in [
-            "404",
-            "accounts",
-            "api",
-            "create-workspace",
-            "god-mode",
-            "installations",
-            "invitations",
-            "onboarding",
-            "profile",
-            "spaces",
-            "workspace-invitations",
-            "password",
-        ]:
-            raise serializers.ValidationError({"slug": "Slug is not valid"})
+    def validate_slug(self, value):
+        # Check if the slug is restricted
+        if value in RESTRICTED_WORKSPACE_SLUGS:
+            raise serializers.ValidationError("Slug is not valid")
+        return value

    class Meta:
        model = Workspace
@@ -233,13 +233,13 @@ urlpatterns = [
        name="project-issue-comment-reactions",
    ),
    ## End Comment Reactions
-    ## IssueProperty
+    ## IssueUserProperty
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
        IssueUserDisplayPropertyEndpoint.as_view(),
        name="project-issue-display-properties",
    ),
-    ## IssueProperty End
+    ## IssueUserProperty End
    ## Issue Archives
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-issues/",
@@ -7,6 +7,7 @@ from plane.app.views import (
    PageLogEndpoint,
    SubPagesEndpoint,
    PagesDescriptionViewSet,
+    PageVersionEndpoint,
 )


@@ -65,6 +66,16 @@ urlpatterns = [
        ),
        name="project-pages-lock-unlock",
    ),
+    # private and public page
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/access/",
+        PageViewSet.as_view(
+            {
+                "post": "access",
+            }
+        ),
+        name="project-pages-access",
+    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/",
        PageLogEndpoint.as_view(),
@@ -90,4 +101,14 @@ urlpatterns = [
        ),
        name="page-description",
    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/",
+        PageVersionEndpoint.as_view(),
+        name="page-versions",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/<uuid:pk>/",
+        PageVersionEndpoint.as_view(),
+        name="page-versions",
+    ),
 ]
@@ -179,6 +179,7 @@ from .page.base import (
    SubPagesEndpoint,
    PagesDescriptionViewSet,
 )
+from .page.version import PageVersionEndpoint

 from .search.base import GlobalSearchEndpoint
 from .search.issue import IssueSearchEndpoint
@@ -19,7 +19,7 @@ from django.db.models import (
    When,
    Subquery,
    Sum,
-    IntegerField,
+    FloatField,
 )
 from django.db.models.functions import Coalesce, Cast
 from django.utils import timezone
@@ -47,6 +47,7 @@ from plane.db.models import (
    Label,
    User,
    Project,
+    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot

@@ -86,7 +87,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("backlog_estimate_point")[:1]
@@ -100,7 +101,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("unstarted_estimate_point")[:1]
@@ -114,7 +115,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                started_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("started_estimate_point")[:1]
@@ -128,7 +129,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("cancelled_estimate_point")[:1]
@@ -142,7 +143,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("completed_estimate_points")[:1]
@@ -155,7 +156,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                total_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("total_estimate_points")[:1]
@@ -287,37 +288,37 @@ class CycleViewSet(BaseViewSet):
            .annotate(
                backlog_estimate_points=Coalesce(
                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                unstarted_estimate_points=Coalesce(
                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                started_estimate_points=Coalesce(
                    Subquery(started_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                cancelled_estimate_points=Coalesce(
                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                completed_estimate_points=Coalesce(
                    Subquery(completed_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                total_estimate_points=Coalesce(
                    Subquery(total_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .order_by("-is_favorite", "name")
@@ -395,12 +396,12 @@ class CycleViewSet(BaseViewSet):
                        .values("display_name", "assignee_id", "avatar")
                        .annotate(
                            total_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField())
+                                Cast("estimate_point__value", FloatField())
                            )
                        )
                        .annotate(
                            completed_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField()),
+                                Cast("estimate_point__value", FloatField()),
                                filter=Q(
                                    completed_at__isnull=False,
                                    archived_at__isnull=True,
@@ -410,7 +411,7 @@ class CycleViewSet(BaseViewSet):
                        )
                        .annotate(
                            pending_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField()),
+                                Cast("estimate_point__value", FloatField()),
                                filter=Q(
                                    completed_at__isnull=True,
                                    archived_at__isnull=True,
@@ -433,12 +434,12 @@ class CycleViewSet(BaseViewSet):
                        .values("label_name", "color", "label_id")
                        .annotate(
                            total_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField())
+                                Cast("estimate_point__value", FloatField())
                            )
                        )
                        .annotate(
                            completed_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField()),
+                                Cast("estimate_point__value", FloatField()),
                                filter=Q(
                                    completed_at__isnull=False,
                                    archived_at__isnull=True,
@@ -448,7 +449,7 @@ class CycleViewSet(BaseViewSet):
                        )
                        .annotate(
                            pending_estimates=Sum(
-                                Cast("estimate_point__value", IntegerField()),
+                                Cast("estimate_point__value", FloatField()),
                                filter=Q(
                                    completed_at__isnull=True,
                                    archived_at__isnull=True,
@@ -465,14 +466,14 @@ class CycleViewSet(BaseViewSet):
                    }

                    if data[0]["start_date"] and data[0]["end_date"]:
-                        data[0]["estimate_distribution"]["completion_chart"] = (
-                            burndown_plot(
-                                queryset=queryset.first(),
-                                slug=slug,
-                                project_id=project_id,
-                                plot_type="points",
-                                cycle_id=data[0]["id"],
-                            )
+                        data[0]["estimate_distribution"][
+                            "completion_chart"
+                        ] = burndown_plot(
+                            queryset=queryset.first(),
+                            slug=slug,
+                            project_id=project_id,
+                            plot_type="points",
+                            cycle_id=data[0]["id"],
                        )

                assignee_distribution = (
@@ -645,6 +646,8 @@ class CycleViewSet(BaseViewSet):
                        "progress_snapshot",
                        "logo_props",
                        # meta fields
+                        "completed_estimate_points",
+                        "total_estimate_points",
                        "is_favorite",
                        "cancelled_issues",
                        "total_issues",
@@ -654,6 +657,7 @@ class CycleViewSet(BaseViewSet):
                        "backlog_issues",
                        "assignee_ids",
                        "status",
+                        "created_by",
                    )
                    .first()
                )
@@ -739,6 +743,8 @@ class CycleViewSet(BaseViewSet):
                "progress_snapshot",
                "logo_props",
                # meta fields
+                "completed_estimate_points",
+                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -748,6 +754,7 @@ class CycleViewSet(BaseViewSet):
                "backlog_issues",
                "assignee_ids",
                "status",
+                "created_by",
            ).first()

            # Send the model activity
@@ -800,6 +807,8 @@ class CycleViewSet(BaseViewSet):
                "sub_issues",
                "logo_props",
                # meta fields
+                "completed_estimate_points",
+                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -836,12 +845,12 @@ class CycleViewSet(BaseViewSet):
                .values("display_name", "assignee_id", "avatar")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -851,7 +860,7 @@ class CycleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -874,12 +883,12 @@ class CycleViewSet(BaseViewSet):
                .values("label_name", "color", "label_id")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -889,7 +898,7 @@ class CycleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -1031,14 +1040,28 @@ class CycleViewSet(BaseViewSet):
        )

    def destroy(self, request, slug, project_id, pk):
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
+        if cycle.owned_by_id != request.user.id and not (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or owner can delete the cycle"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        cycle_issues = list(
            CycleIssue.objects.filter(
                cycle_id=self.kwargs.get("pk")
            ).values_list("issue", flat=True)
        )
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )

        issue_activity.delay(
            type="cycle.activity.deleted",
@@ -1234,12 +1257,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                .values("display_name", "assignee_id", "avatar")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -1249,7 +1272,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -1288,12 +1311,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                .values("label_name", "color", "label_id")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    )
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -1303,7 +1326,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -1507,14 +1530,40 @@ class TransferCycleIssueEndpoint(BaseAPIView):
        )

        updated_cycles = []
+        update_cycle_issue_activity = []
        for cycle_issue in cycle_issues:
            cycle_issue.cycle_id = new_cycle_id
            updated_cycles.append(cycle_issue)
+            update_cycle_issue_activity.append(
+                {
+                    "old_cycle_id": str(cycle_id),
+                    "new_cycle_id": str(new_cycle_id),
+                    "issue_id": str(cycle_issue.issue_id),
+                }
+            )

        cycle_issues = CycleIssue.objects.bulk_update(
            updated_cycles, ["cycle_id"], batch_size=100
        )

+        # Capture Issue Activity
+        issue_activity.delay(
+            type="cycle.activity.created",
+            requested_data=json.dumps({"cycles_list": []}),
+            actor_id=str(self.request.user.id),
+            issue_id=None,
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=json.dumps(
+                {
+                    "updated_cycle_issues": update_cycle_issue_activity,
+                    "created_cycle_issues": "[]",
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
+
        return Response({"message": "Success"}, status=status.HTTP_200_OK)


@@ -542,6 +542,7 @@ def dashboard_recent_collaborators(self, request, slug):
            project__project_projectmember__member=request.user,
            project__project_projectmember__is_active=True,
            project__archived_at__isnull=True,
+            is_active=True,
        )
        .annotate(
            num_activities=Coalesce(
@@ -41,6 +41,7 @@ class ExportIssuesEndpoint(BaseAPIView):
                project=project_ids,
                initiated_by=request.user,
                provider=provider,
+                type="issue_exports",
            )

            issue_export_task.delay(
@@ -65,7 +66,8 @@ class ExportIssuesEndpoint(BaseAPIView):

    def get(self, request, slug):
        exporter_history = ExporterHistory.objects.filter(
-            workspace__slug=slug
+            workspace__slug=slug,
+            type="issue_exports",
        ).select_related("workspace", "initiated_by")

        if request.GET.get("per_page", False) and request.GET.get(
@@ -553,28 +553,27 @@ class InboxIssueViewSet(BaseViewSet):
            project_id=project_id,
            inbox_id=inbox_id,
        )
-        # Get the project member
-        project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            is_active=True,
-        )
-
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-            request.user.id
-        ):
-            return Response(
-                {"error": "You cannot delete inbox issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

        # Check the issue status
        if inbox_issue.status in [-2, -1, 0, 2]:
            # Delete the issue also
-            Issue.objects.filter(
+            issue = Issue.objects.filter(
                workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).delete()
+            ).first()
+            if issue.created_by_id != request.user.id and (
+                not ProjectMember.objects.filter(
+                    workspace__slug=slug,
+                    member=request.user,
+                    role=20,
+                    project_id=project_id,
+                    is_active=True,
+                ).exists()
+            ):
+                return Response(
+                    {"error": "Only admin or creator can delete the issue"},
+                    status=status.HTTP_403_FORBIDDEN,
+                )
+            issue.delete()

        inbox_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -32,7 +32,7 @@ from plane.app.permissions import (
 from plane.app.serializers import (
    IssueCreateSerializer,
    IssueDetailSerializer,
-    IssuePropertySerializer,
+    IssueUserPropertySerializer,
    IssueSerializer,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -40,10 +40,11 @@ from plane.db.models import (
    Issue,
    IssueAttachment,
    IssueLink,
-    IssueProperty,
+    IssueUserProperty,
    IssueReaction,
    IssueSubscriber,
    Project,
+    ProjectMember,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -481,7 +482,38 @@ class IssueViewSet(BaseViewSet):
        return Response(serializer.data, status=status.HTTP_200_OK)

    def partial_update(self, request, slug, project_id, pk=None):
-        issue = self.get_queryset().filter(pk=pk).first()
+        issue = (
+            self.get_queryset()
+            .annotate(
+                label_ids=Coalesce(
+                    ArrayAgg(
+                        "labels__id",
+                        distinct=True,
+                        filter=~Q(labels__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                assignee_ids=Coalesce(
+                    ArrayAgg(
+                        "assignees__id",
+                        distinct=True,
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                module_ids=Coalesce(
+                    ArrayAgg(
+                        "issue_module__module_id",
+                        distinct=True,
+                        filter=~Q(issue_module__module_id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+            )
+            .filter(pk=pk)
+            .first()
+        )

        if not issue:
            return Response(
@@ -518,6 +550,20 @@ class IssueViewSet(BaseViewSet):
        issue = Issue.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
+        if issue.created_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the issue"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        issue.delete()
        issue_activity.delay(
            type="issue.activity.deleted",
@@ -539,7 +585,7 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
    ]

    def patch(self, request, slug, project_id):
-        issue_property = IssueProperty.objects.get(
+        issue_property = IssueUserProperty.objects.get(
            user=request.user,
            project_id=project_id,
        )
@@ -554,14 +600,14 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
            "display_properties", issue_property.display_properties
        )
        issue_property.save()
-        serializer = IssuePropertySerializer(issue_property)
+        serializer = IssueUserPropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

    def get(self, request, slug, project_id):
-        issue_property, _ = IssueProperty.objects.get_or_create(
+        issue_property, _ = IssueUserProperty.objects.get_or_create(
            user=request.user, project_id=project_id
        )
-        serializer = IssuePropertySerializer(issue_property)
+        serializer = IssueUserPropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_200_OK)


@@ -571,6 +617,19 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
    ]

    def delete(self, request, slug, project_id):
+        if ProjectMember.objects.filter(
+            workspace__slug=slug,
+            member=request.user,
+            role=20,
+            project_id=project_id,
+            is_active=True,
+        ).exists():
+
+            return Response(
+                {"error": "Only admin can perform this action"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        issue_ids = request.data.get("issue_ids", [])

        if not len(issue_ids):
@@ -40,6 +40,7 @@ from plane.db.models import (
    IssueReaction,
    IssueSubscriber,
    Project,
+    ProjectMember,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -380,6 +381,19 @@ class IssueDraftViewSet(BaseViewSet):
        issue = Issue.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
+        if issue.created_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the issue"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
        issue.delete()
        issue_activity.delay(
            type="issue_draft.activity.deleted",
@@ -3,8 +3,11 @@ import json

 # Django imports
 from django.utils import timezone
-from django.db.models import Q
+from django.db.models import Q, OuterRef, F, Func, UUIDField, Value, CharField
 from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models.functions import Coalesce
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField

 # Third Party imports
 from rest_framework.response import Response
@@ -20,6 +23,9 @@ from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
    Project,
    IssueRelation,
+    Issue,
+    IssueAttachment,
+    IssueLink,
 )
 from plane.bgtasks.issue_activites_task import issue_activity

@@ -31,24 +37,6 @@ class IssueRelationViewSet(BaseViewSet):
        ProjectEntityPermission,
    ]

-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(issue_id=self.kwargs.get("issue_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
-            )
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("issue")
-            .distinct()
-        )
-
    def list(self, request, slug, project_id, issue_id):
        issue_relations = (
            IssueRelation.objects.filter(
@@ -61,56 +49,146 @@ class IssueRelationViewSet(BaseViewSet):
            .order_by("-created_at")
            .distinct()
        )
-
+        # get all blocking issues
        blocking_issues = issue_relations.filter(
            relation_type="blocked_by", related_issue_id=issue_id
-        )
+        ).values_list("issue_id", flat=True)
+
+        # get all blocked by issues
        blocked_by_issues = issue_relations.filter(
            relation_type="blocked_by", issue_id=issue_id
-        )
+        ).values_list("related_issue_id", flat=True)
+
+        # get all duplicate issues
        duplicate_issues = issue_relations.filter(
            issue_id=issue_id, relation_type="duplicate"
-        )
+        ).values_list("related_issue_id", flat=True)
+
+        # get all relates to issues
        duplicate_issues_related = issue_relations.filter(
            related_issue_id=issue_id, relation_type="duplicate"
-        )
+        ).values_list("issue_id", flat=True)
+
+        # get all relates to issues
        relates_to_issues = issue_relations.filter(
            issue_id=issue_id, relation_type="relates_to"
-        )
+        ).values_list("related_issue_id", flat=True)
+
+        # get all relates to issues
        relates_to_issues_related = issue_relations.filter(
            related_issue_id=issue_id, relation_type="relates_to"
-        )
+        ).values_list("issue_id", flat=True)

-        blocked_by_issues_serialized = IssueRelationSerializer(
-            blocked_by_issues, many=True
-        ).data
-        duplicate_issues_serialized = IssueRelationSerializer(
-            duplicate_issues, many=True
-        ).data
-        relates_to_issues_serialized = IssueRelationSerializer(
-            relates_to_issues, many=True
-        ).data
+        queryset = (
+            Issue.issue_objects
+            .filter(workspace__slug=slug)
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .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(labels__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                assignee_ids=Coalesce(
+                    ArrayAgg(
+                        "assignees__id",
+                        distinct=True,
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+            )
+        ).distinct()

-        # revere relation for blocked by issues
-        blocking_issues_serialized = RelatedIssueSerializer(
-            blocking_issues, many=True
-        ).data
-        # reverse relation for duplicate issues
-        duplicate_issues_related_serialized = RelatedIssueSerializer(
-            duplicate_issues_related, many=True
-        ).data
-        # reverse relation for related issues
-        relates_to_issues_related_serialized = RelatedIssueSerializer(
-            relates_to_issues_related, many=True
-        ).data
+        # Fields
+        fields = [
+            "id",
+            "name",
+            "state_id",
+            "sort_order",
+            "priority",
+            "sequence_id",
+            "project_id",
+            "label_ids",
+            "assignee_ids",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+            "relation_type",
+        ]

        response_data = {
-            "blocking": blocking_issues_serialized,
-            "blocked_by": blocked_by_issues_serialized,
-            "duplicate": duplicate_issues_serialized
-            + duplicate_issues_related_serialized,
-            "relates_to": relates_to_issues_serialized
-            + relates_to_issues_related_serialized,
+            "blocking": queryset.filter(pk__in=blocking_issues)
+            .annotate(
+                relation_type=Value("blocking", output_field=CharField())
+            )
+            .values(*fields),
+            "blocked_by": queryset.filter(pk__in=blocked_by_issues)
+            .annotate(
+                relation_type=Value("blocked_by", output_field=CharField())
+            )
+            .values(*fields),
+            "duplicate": queryset.filter(pk__in=duplicate_issues)
+            .annotate(
+                relation_type=Value(
+                    "duplicate",
+                    output_field=CharField(),
+                )
+            )
+            .values(*fields)
+            | queryset.filter(pk__in=duplicate_issues_related)
+            .annotate(
+                relation_type=Value(
+                    "duplicate",
+                    output_field=CharField(),
+                )
+            )
+            .values(*fields),
+            "relates_to": queryset.filter(pk__in=relates_to_issues)
+            .annotate(
+                relation_type=Value(
+                    "relates_to",
+                    output_field=CharField(),
+                )
+            )
+            .values(*fields)
+            | queryset.filter(pk__in=relates_to_issues_related)
+            .annotate(
+                relation_type=Value(
+                    "relates_to",
+                    output_field=CharField(),
+                )
+            )
+            .values(*fields),
        }

        return Response(response_data, status=status.HTTP_200_OK)
@@ -99,6 +99,7 @@ class SubIssuesEndpoint(BaseAPIView):
                ),
            )
            .annotate(state_group=F("state__group"))
+            .order_by("-created_at")
        )

        # create's a dict with state group name with their respective issue id's
@@ -17,6 +17,7 @@ from django.db.models import (
    UUIDField,
    Value,
    Sum,
+    FloatField,
 )
 from django.db.models.functions import Coalesce, Cast
 from django.core.serializers.json import DjangoJSONEncoder
@@ -47,6 +48,7 @@ from plane.db.models import (
    ModuleLink,
    ModuleUserProperties,
    Project,
+    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.utils.user_timezone_converter import user_timezone_converter
@@ -138,7 +140,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("completed_estimate_points")[:1]
@@ -152,7 +154,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                total_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("total_estimate_points")[:1]
@@ -166,7 +168,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("backlog_estimate_point")[:1]
@@ -180,7 +182,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("unstarted_estimate_point")[:1]
@@ -194,7 +196,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                started_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("started_estimate_point")[:1]
@@ -208,7 +210,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
+                    Cast("estimate_point__value", FloatField())
                )
            )
            .values("cancelled_estimate_point")[:1]
@@ -270,37 +272,37 @@ class ModuleViewSet(BaseViewSet):
            .annotate(
                backlog_estimate_points=Coalesce(
                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                unstarted_estimate_points=Coalesce(
                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                started_estimate_points=Coalesce(
                    Subquery(started_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                cancelled_estimate_points=Coalesce(
                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                completed_estimate_points=Coalesce(
                    Subquery(completed_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
                total_estimate_points=Coalesce(
                    Subquery(total_estimate_point),
-                    Value(0, output_field=IntegerField()),
+                    Value(0, output_field=FloatField()),
                ),
            )
            .annotate(
@@ -475,12 +477,12 @@ class ModuleViewSet(BaseViewSet):
                )
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    ),
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -490,7 +492,7 @@ class ModuleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -513,12 +515,12 @@ class ModuleViewSet(BaseViewSet):
                .values("label_name", "color", "label_id")
                .annotate(
                    total_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField())
+                        Cast("estimate_point__value", FloatField())
                    ),
                )
                .annotate(
                    completed_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=False,
                            archived_at__isnull=True,
@@ -528,7 +530,7 @@ class ModuleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", IntegerField()),
+                        Cast("estimate_point__value", FloatField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -736,6 +738,21 @@ class ModuleViewSet(BaseViewSet):
        module = Module.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
+
+        if module.created_by_id != request.user.id and (
+            not ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or creator can delete the module"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        module_issues = list(
            ModuleIssue.objects.filter(module_id=pk).values_list(
                "issue", flat=True
@@ -1,5 +1,5 @@
 # Django imports
-from django.db.models import Exists, OuterRef, Q
+from django.db.models import Exists, OuterRef, Q, Case, When, BooleanField
 from django.utils import timezone

 # Third party imports
@@ -45,12 +45,28 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        archived = request.GET.get("archived", "false")
        read = request.GET.get("read", None)
        type = request.GET.get("type", "all")
+        mentioned = request.GET.get("mentioned", False)
        q_filters = Q()

+        inbox_issue = Issue.objects.filter(
+            pk=OuterRef("entity_identifier"),
+            issue_inbox__status__in=[0, 2, -2],
+            workspace__slug=self.kwargs.get("slug"),
+        )
+
        notifications = (
            Notification.objects.filter(
                workspace__slug=slug, receiver_id=request.user.id
            )
+            .filter(entity_name="issue")
+            .annotate(is_inbox_issue=Exists(inbox_issue))
+            .annotate(
+                is_mentioned_notification=Case(
+                    When(sender__icontains="mentioned", then=True),
+                    default=False,
+                    output_field=BooleanField(),
+                )
+            )
            .select_related("workspace", "project", "triggered_by", "receiver")
            .order_by("snoozed_till", "-created_at")
        )
@@ -78,6 +94,13 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        if read == "true":
            notifications = notifications.filter(read_at__isnull=False)

+        if mentioned:
+            notifications = notifications.filter(sender__icontains="mentioned")
+        else:
+            notifications = notifications.exclude(
+                sender__icontains="mentioned"
+            )
+
        type = type.split(",")
        # Subscribed issues
        if "subscribed" in type:
@@ -202,46 +225,35 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
 class UnreadNotificationEndpoint(BaseAPIView):
    def get(self, request, slug):
        # Watching Issues Count
-        subscribed_issues_count = Notification.objects.filter(
-            workspace__slug=slug,
-            receiver_id=request.user.id,
-            read_at__isnull=True,
-            archived_at__isnull=True,
-            snoozed_till__isnull=True,
-            entity_identifier__in=IssueSubscriber.objects.filter(
-                workspace__slug=slug, subscriber_id=request.user.id
-            ).values_list("issue_id", flat=True),
-        ).count()
+        unread_notifications_count = (
+            Notification.objects.filter(
+                workspace__slug=slug,
+                receiver_id=request.user.id,
+                read_at__isnull=True,
+                archived_at__isnull=True,
+                snoozed_till__isnull=True,
+            )
+            .exclude(sender__icontains="mentioned")
+            .count()
+        )

-        # My Issues Count
-        my_issues_count = Notification.objects.filter(
+        mention_notifications_count = Notification.objects.filter(
            workspace__slug=slug,
            receiver_id=request.user.id,
            read_at__isnull=True,
            archived_at__isnull=True,
            snoozed_till__isnull=True,
-            entity_identifier__in=IssueAssignee.objects.filter(
-                workspace__slug=slug, assignee_id=request.user.id
-            ).values_list("issue_id", flat=True),
-        ).count()
-
-        # Created Issues Count
-        created_issues_count = Notification.objects.filter(
-            workspace__slug=slug,
-            receiver_id=request.user.id,
-            read_at__isnull=True,
-            archived_at__isnull=True,
-            snoozed_till__isnull=True,
-            entity_identifier__in=Issue.objects.filter(
-                workspace__slug=slug, created_by=request.user
-            ).values_list("pk", flat=True),
+            sender__icontains="mentioned",
        ).count()

        return Response(
            {
-                "subscribed_issues": subscribed_issues_count,
-                "my_issues": my_issues_count,
-                "created_issues": created_issues_count,
+                "total_unread_notifications_count": int(
+                    unread_notifications_count
+                ),
+                "mention_unread_notifications_count": int(
+                    mention_notifications_count
+                ),
            },
            status=status.HTTP_200_OK,
        )
@@ -38,6 +38,7 @@ from plane.db.models import (
 from ..base import BaseAPIView, BaseViewSet

 from plane.bgtasks.page_transaction_task import page_transaction
+from plane.bgtasks.page_version_task import page_version


 def unarchive_archive_page_and_descendants(page_id, archived_at):
@@ -215,8 +216,14 @@ class PageViewSet(BaseViewSet):
                status=status.HTTP_404_NOT_FOUND,
            )
        else:
+            issue_ids = PageLog.objects.filter(
+                page_id=pk, entity_name="issue"
+            ).values_list("entity_identifier", flat=True)
+            data = PageDetailSerializer(page).data
+            data["issue_ids"] = issue_ids
            return Response(
-                PageDetailSerializer(page).data, status=status.HTTP_200_OK
+                data,
+                status=status.HTTP_200_OK,
            )

    def lock(self, request, slug, project_id, pk):
@@ -238,6 +245,28 @@ class PageViewSet(BaseViewSet):

        return Response(status=status.HTTP_204_NO_CONTENT)

+    def access(self, request, slug, project_id, pk):
+        access = request.data.get("access", 0)
+        page = Page.objects.filter(
+            pk=pk, workspace__slug=slug, projects__id=project_id
+        ).first()
+
+        # Only update access if the page owner is the requesting user
+        if (
+            page.access != request.data.get("access", page.access)
+            and page.owned_by_id != request.user.id
+        ):
+            return Response(
+                {
+                    "error": "Access cannot be updated since this page is owned by someone else"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        page.access = access
+        page.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
        pages = PageSerializer(queryset, many=True).data
@@ -304,6 +333,20 @@ class PageViewSet(BaseViewSet):
            pk=pk, workspace__slug=slug, projects__id=project_id
        )

+        if not page.owned_by_id != request.user.id and not (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or owner can delete the page"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        # only the owner and admin can delete the page
        if (
            ProjectMember.objects.filter(
@@ -463,6 +506,12 @@ class PagesDescriptionViewSet(BaseViewSet):
            .first()
        )

+        if page is None:
+            return Response(
+                {"error": "Page not found"},
+                status=404,
+            )
+
        if page.is_locked:
            return Response(
                {"error": "Page is locked"},
@@ -475,16 +524,38 @@ class PagesDescriptionViewSet(BaseViewSet):
                status=472,
            )

+        # Serialize the existing instance
+        existing_instance = json.dumps(
+            {
+                "description_html": page.description_html,
+            },
+            cls=DjangoJSONEncoder,
+        )
+
+        # Get the base64 data from the request
        base64_data = request.data.get("description_binary")

+        # If base64 data is provided
        if base64_data:
            # Decode the base64 data to bytes
            new_binary_data = base64.b64decode(base64_data)
-
+            # capture the page transaction
+            if request.data.get("description_html"):
+                page_transaction.delay(
+                    new_value=request.data,
+                    old_value=existing_instance,
+                    page_id=pk,
+                )
            # Store the updated binary data
            page.description_binary = new_binary_data
            page.description_html = request.data.get("description_html")
            page.save()
+            # Return a success response
+            page_version.delay(
+                page_id=page.id,
+                existing_instance=existing_instance,
+                user_id=request.user.id,
+            )
            return Response({"message": "Updated successfully"})
        else:
            return Response({"error": "No binary data provided"})
@@ -0,0 +1,37 @@
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.db.models import PageVersion
+from ..base import BaseAPIView
+from plane.app.permissions import ProjectEntityPermission
+from plane.app.serializers import PageVersionSerializer
+
+
+class PageVersionEndpoint(BaseAPIView):
+
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get(self, request, slug, project_id, page_id, pk=None):
+        # Check if pk is provided
+        if pk:
+            # Return a single page version
+            page_version = PageVersion.objects.get(
+                workspace__slug=slug,
+                page_id=page_id,
+                pk=pk,
+            )
+            # Serialize the page version
+            serializer = PageVersionSerializer(page_version)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        # Return all page versions
+        page_versions = PageVersion.objects.filter(
+            workspace__slug=slug,
+            page_id=page_id,
+        )
+        # Serialize the page versions
+        serializer = PageVersionSerializer(page_versions, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
@@ -39,7 +39,7 @@ from plane.db.models import (
    Cycle,
    Inbox,
    DeployBoard,
-    IssueProperty,
+    IssueUserProperty,
    Issue,
    Module,
    Project,
@@ -266,7 +266,7 @@ class ProjectViewSet(BaseViewSet):
                    role=20,
                )
                # Also create the issue property for the user
-                _ = IssueProperty.objects.create(
+                _ = IssueUserProperty.objects.create(
                    project_id=serializer.data["id"],
                    user=request.user,
                )
@@ -280,7 +280,7 @@ class ProjectViewSet(BaseViewSet):
                        role=20,
                    )
                    # Also create the issue property for the user
-                    IssueProperty.objects.create(
+                    IssueUserProperty.objects.create(
                        project_id=serializer.data["id"],
                        user_id=serializer.data["project_lead"],
                    )
@@ -342,6 +342,7 @@ class ProjectViewSet(BaseViewSet):
                    .first()
                )

+                # Create the model activity
                model_activity.delay(
                    model_name="project",
                    model_id=str(project.id),
@@ -25,7 +25,7 @@ from plane.db.models import (
    ProjectMemberInvite,
    User,
    WorkspaceMember,
-    IssueProperty,
+    IssueUserProperty,
 )


@@ -179,9 +179,9 @@ class UserProjectInvitationsViewset(BaseViewSet):
            ignore_conflicts=True,
        )

-        IssueProperty.objects.bulk_create(
+        IssueUserProperty.objects.bulk_create(
            [
-                IssueProperty(
+                IssueUserProperty(
                    project_id=project_id,
                    user=request.user,
                    workspace=workspace,
@@ -22,7 +22,7 @@ from plane.db.models import (
    ProjectMember,
    Workspace,
    TeamMember,
-    IssueProperty,
+    IssueUserProperty,
 )
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
 from plane.utils.host import base_host
@@ -136,7 +136,7 @@ class ProjectMemberViewSet(BaseViewSet):
            )
            # Create a new issue property
            bulk_issue_props.append(
-                IssueProperty(
+                IssueUserProperty(
                    user_id=member.get("member_id"),
                    project_id=project_id,
                    workspace_id=project.workspace_id,
@@ -150,7 +150,7 @@ class ProjectMemberViewSet(BaseViewSet):
            ignore_conflicts=True,
        )

-        _ = IssueProperty.objects.bulk_create(
+        _ = IssueUserProperty.objects.bulk_create(
            bulk_issue_props, batch_size=10, ignore_conflicts=True
        )

@@ -323,7 +323,7 @@ class AddTeamToProjectEndpoint(BaseAPIView):
                )
            )
            issue_props.append(
-                IssueProperty(
+                IssueUserProperty(
                    project_id=project_id,
                    user_id=member,
                    workspace=workspace,
@@ -335,7 +335,7 @@ class AddTeamToProjectEndpoint(BaseAPIView):
            project_members, batch_size=10, ignore_conflicts=True
        )

-        _ = IssueProperty.objects.bulk_create(
+        _ = IssueUserProperty.objects.bulk_create(
            issue_props, batch_size=10, ignore_conflicts=True
        )

@@ -1,5 +1,4 @@
 # Python imports
-import re

 # Django imports
 from django.db.models import Q
@@ -11,13 +10,7 @@ from rest_framework.response import Response
 # Module imports
 from .base import BaseAPIView
 from plane.db.models import (
-    Workspace,
-    Project,
    Issue,
-    Cycle,
-    Module,
-    Page,
-    IssueView,
 )
 from plane.utils.issue_search import search_issues

@@ -37,6 +37,9 @@ from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
 from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
 from plane.utils.host import base_host
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_cookie


 class UserEndpoint(BaseViewSet):
@@ -47,6 +50,8 @@ class UserEndpoint(BaseViewSet):
        return self.request.user

    @cache_response(60 * 60)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
    def retrieve(self, request):
        serialized_data = UserMeSerializer(request.user).data
        return Response(
@@ -55,6 +60,8 @@ class UserEndpoint(BaseViewSet):
        )

    @cache_response(60 * 60)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
    def retrieve_user_settings(self, request):
        serialized_data = UserMeSettingsSerializer(request.user).data
        return Response(serialized_data, status=status.HTTP_200_OK)
@@ -79,6 +86,9 @@ class UserEndpoint(BaseViewSet):
        return super().partial_update(request, *args, **kwargs)

    @invalidate_cache(path="/api/users/me/")
+    @invalidate_cache(
+        path="/api/users/me/workspaces/", multiple=True, user=False
+    )
    def deactivate(self, request):
        # Check all workspace user is active
        user = self.get_object()
@@ -288,6 +298,8 @@ class AccountEndpoint(BaseAPIView):


 class ProfileEndpoint(BaseAPIView):
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
    def get(self, request):
        profile = Profile.objects.get(user=request.user)
        serializer = ProfileSerializer(profile)
@@ -116,6 +116,20 @@ class WorkspaceViewViewSet(BaseViewSet):
            pk=pk,
            workspace__slug=slug,
        )
+        if not (
+            WorkspaceMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                is_active=True,
+            ).exists()
+            and workspace_view.owned_by_id != request.user.id
+        ):
+            return Response(
+                {"error": "You do not have permission to delete this view"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
        workspace_member = WorkspaceMember.objects.filter(
            workspace__slug=slug,
            member=request.user,
@@ -412,14 +426,16 @@ class IssueViewViewSet(BaseViewSet):
            project_id=project_id,
            workspace__slug=slug,
        )
-        project_member = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=20,
-            is_active=True,
-        )
-        if project_member.exists() or project_view.owned_by == request.user:
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=20,
+                is_active=True,
+            ).exists()
+            or project_view.owned_by_id == request.user.id
+        ):
            project_view.delete()
        else:
            return Response(
@@ -44,6 +44,10 @@ from plane.db.models import (
    WorkspaceTheme,
 )
 from plane.utils.cache import cache_response, invalidate_cache
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_cookie
+from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS


 class WorkSpaceViewSet(BaseViewSet):
@@ -118,7 +122,7 @@ class WorkSpaceViewSet(BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            if serializer.is_valid():
+            if serializer.is_valid(raise_exception=True):
                serializer.save(owner=request.user)
                # Create Workspace member
                _ = WorkspaceMember.objects.create(
@@ -171,6 +175,8 @@ class UserWorkSpacesEndpoint(BaseAPIView):
    ]

    @cache_response(60 * 60 * 2)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
    def get(self, request):
        fields = [
            field
@@ -231,7 +237,10 @@ class WorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        workspace = Workspace.objects.filter(slug=slug).exists()
+        workspace = (
+            Workspace.objects.filter(slug=slug).exists()
+            or slug in RESTRICTED_WORKSPACE_SLUGS
+        )
        return Response({"status": not workspace}, status=status.HTTP_200_OK)


@@ -39,6 +39,16 @@ class OauthAdapter(Adapter):
        self.client_secret = client_secret
        self.code = code

+    def authentication_error_code(self):
+        if self.provider == "google":
+            return "GOOGLE_OAUTH_PROVIDER_ERROR"
+        elif self.provider == "github":
+            return "GITHUB_OAUTH_PROVIDER_ERROR"
+        elif self.provider == "gitlab":
+            return "GITLAB_OAUTH_PROVIDER_ERROR"
+        else:
+            return "OAUTH_NOT_CONFIGURED"
+
    def get_auth_url(self):
        return self.auth_url

@@ -62,7 +72,7 @@ class OauthAdapter(Adapter):
            response.raise_for_status()
            return response.json()
        except requests.RequestException:
-            code = self._provider_error_code()
+            code = self.authentication_error_code()
            raise AuthenticationException(
                error_code=AUTHENTICATION_ERROR_CODES[code],
                error_message=str(code),
@@ -77,15 +87,7 @@ class OauthAdapter(Adapter):
            response.raise_for_status()
            return response.json()
        except requests.RequestException:
-            if self.provider == "google":
-                code = "GOOGLE_OAUTH_PROVIDER_ERROR"
-            elif self.provider == "github":
-                code = "GITHUB_OAUTH_PROVIDER_ERROR"
-            elif self.provider == "gitlab":
-                code = "GITLAB_OAUTH_PROVIDER_ERROR"
-            else:
-                code = "OAUTH_NOT_CONFIGURED"
-
+            code = self.authentication_error_code()
            raise AuthenticationException(
                error_code=AUTHENTICATION_ERROR_CODES[code],
                error_message=str(code),
@@ -3,7 +3,7 @@ from plane.db.models import Profile, Workspace, WorkspaceMemberInvite

 def get_redirection_path(user):
    # Handle redirections
-    profile = Profile.objects.get(user=user)
+    profile, _ = Profile.objects.get_or_create(user=user)

    # Redirect to onboarding if the user is not onboarded yet
    if not profile.is_onboarded:
@@ -120,7 +120,7 @@ class MagicSignInEndpoint(View):
                callback=post_user_auth_workflow,
            )
            user = provider.authenticate()
-            profile = Profile.objects.get(user=user)
+            profile, _ = Profile.objects.get_or_create(user=user)
            # Login the user and record his device info
            user_login(request=request, user=user, is_app=True)
            if user.is_password_autoset and profile.is_onboarded:
@@ -582,17 +582,18 @@ def create_issue_activity(
    issue_activities,
    epoch,
 ):
-    issue_activities.append(
-        IssueActivity(
-            issue_id=issue_id,
-            project_id=project_id,
-            workspace_id=workspace_id,
-            comment="created the issue",
-            verb="created",
-            actor_id=actor_id,
-            epoch=epoch,
-        )
+    issue = Issue.objects.get(pk=issue_id)
+    issue_activity = IssueActivity.objects.create(
+        issue_id=issue_id,
+        project_id=project_id,
+        workspace_id=workspace_id,
+        comment="created the issue",
+        verb="created",
+        actor_id=actor_id,
+        epoch=epoch,
    )
+    issue_activity.created_at = issue.created_at
+    issue_activity.save(update_fields=["created_at"])
    requested_data = (
        json.loads(requested_data) if requested_data is not None else None
    )
@@ -1391,6 +1392,7 @@ def create_issue_relation_activity(
                    workspace_id=workspace_id,
                    comment=f"added {requested_data.get('relation_type')} relation",
                    old_identifier=related_issue,
+                    epoch=epoch,
                )
            )
            issue = Issue.objects.get(pk=issue_id)
@@ -1716,12 +1718,16 @@ def issue_activity(
                    event=(
                        "issue_comment"
                        if activity.field == "comment"
-                        else "inbox_issue" if inbox else "issue"
+                        else "inbox_issue"
+                        if inbox
+                        else "issue"
                    ),
                    event_id=(
                        activity.issue_comment_id
                        if activity.field == "comment"
-                        else inbox if inbox else activity.issue_id
+                        else inbox
+                        if inbox
+                        else activity.issue_id
                    ),
                    verb=activity.verb,
                    field=(
@@ -0,0 +1,44 @@
+# Python imports
+import json
+
+# Third party imports
+from celery import shared_task
+
+# Module imports
+from plane.db.models import Page, PageVersion
+
+
+@shared_task
+def page_version(
+    page_id,
+    existing_instance,
+    user_id,
+):
+    # Get the page
+    page = Page.objects.get(id=page_id)
+
+    # Get the current instance
+    current_instance = (
+        json.loads(existing_instance) if existing_instance is not None else {}
+    )
+
+    # Create a version if description_html is updated
+    if current_instance.get("description_html") != page.description_html:
+        # Create a new page version
+        PageVersion.objects.create(
+            page_id=page_id,
+            workspace_id=page.workspace_id,
+            description_html=page.description_html,
+            description_binary=page.description_binary,
+            owned_by_id=user_id,
+            last_saved_at=page.updated_at,
+        )
+
+        # If page versions are greater than 20 delete the oldest one
+        if PageVersion.objects.filter(page_id=page_id).count() > 20:
+            # Delete the old page version
+            PageVersion.objects.filter(page_id=page_id).order_by(
+                "last_saved_at"
+            ).first().delete()
+
+    return
@@ -161,7 +161,7 @@ class Migration(migrations.Migration):
            options={
                "verbose_name": "Workspace User Property",
                "verbose_name_plural": "Workspace User Property",
-                "db_table": "Workspace_user_properties",
+                "db_table": "workspace_user_properties",
                "ordering": ("-created_at",),
                "unique_together": {("workspace", "user")},
            },
@@ -0,0 +1,106 @@
+# Generated by Django 4.2.11 on 2024-07-10 13:59
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0069_alter_account_provider_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='apitoken',
+            name='is_service',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='exporterhistory',
+            name='filters',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='exporterhistory',
+            name='name',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Exporter Name'),
+        ),
+        migrations.AddField(
+            model_name='exporterhistory',
+            name='type',
+            field=models.CharField(choices=[('issue_exports', 'Issue Exports'), ('issue_worklogs', 'Issue Worklogs')], default='issue_exports', max_length=50),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='is_time_tracking_enabled',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='start_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='target_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.CreateModel(
+            name='PageVersion',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('last_saved_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('description_binary', models.BinaryField(null=True)),
+                ('description_html', models.TextField(blank=True, default='<p></p>')),
+                ('description_stripped', models.TextField(blank=True, null=True)),
+                ('description_json', models.JSONField(blank=True, default=dict)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('owned_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to=settings.AUTH_USER_MODEL)),
+                ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to='db.page')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Page Version',
+                'verbose_name_plural': 'Page Versions',
+                'db_table': 'page_versions',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.CreateModel(
+            name='IssueType',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True)),
+                ('logo_props', models.JSONField(default=dict)),
+                ('sort_order', models.FloatField(default=65535)),
+                ('is_default', models.BooleanField(default=True)),
+                ('weight', models.PositiveIntegerField(default=0)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Issue Type',
+                'verbose_name_plural': 'Issue Types',
+                'db_table': 'issue_types',
+                'ordering': ('sort_order',),
+                'unique_together': {('project', 'name')},
+            },
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issue_type', to='db.issuetype'),
+        ),
+    ]
@@ -0,0 +1,44 @@
+# Generated by Django 4.2.11 on 2024-07-15 06:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db", "0070_apitoken_is_service_exporterhistory_filters_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="IssueProperty",
+            new_name="IssueUserProperty",
+        ),
+        migrations.AlterModelOptions(
+            name="issueuserproperty",
+            options={
+                "ordering": ("-created_at",),
+                "verbose_name": "Issue User Property",
+                "verbose_name_plural": "Issue User Properties",
+            },
+        ),
+        migrations.AlterModelTable(
+            name="issueuserproperty",
+            table="issue_user_properties",
+        ),
+        migrations.AddField(
+            model_name="issuetype",
+            name="is_active",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="is_issue_type_enabled",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="issuetype",
+            name="is_default",
+            field=models.BooleanField(default=False),
+        ),
+    ]
@@ -0,0 +1,145 @@
+# Generated by Django 4.2.14 on 2024-07-22 13:22
+from django.db import migrations, models
+from django.conf import settings
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db", "0071_rename_issueproperty_issueuserproperty_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="issueattachment",
+            name="external_id",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name="issueattachment",
+            name="external_source",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.CreateModel(
+            name="UserRecentVisit",
+            fields=[
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="Created At"
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        auto_now=True, verbose_name="Last Modified At"
+                    ),
+                ),
+                (
+                    "id",
+                    models.UUIDField(
+                        db_index=True,
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        unique=True,
+                    ),
+                ),
+                ("entity_identifier", models.UUIDField(null=True)),
+                (
+                    "entity_name",
+                    models.CharField(
+                        choices=[
+                            ("VIEW", "View"),
+                            ("PAGE", "Page"),
+                            ("ISSUE", "Issue"),
+                            ("CYCLE", "Cycle"),
+                            ("MODULE", "Module"),
+                            ("PROJECT", "Project"),
+                        ],
+                        max_length=30,
+                    ),
+                ),
+                ("visited_at", models.DateTimeField(auto_now=True)),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_created_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Created By",
+                    ),
+                ),
+                (
+                    "project",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="project_%(class)s",
+                        to="db.project",
+                    ),
+                ),
+                (
+                    "updated_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_updated_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Last Modified By",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="user_recent_visit",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "workspace",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="workspace_%(class)s",
+                        to="db.workspace",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "User Recent Visit",
+                "verbose_name_plural": "User Recent Visits",
+                "db_table": "user_recent_visits",
+                "ordering": ("-created_at",),
+            },
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="start_date",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="target_date",
+        ),
+        migrations.AlterField(
+            model_name="issuesequence",
+            name="sequence",
+            field=models.PositiveBigIntegerField(db_index=True, default=1),
+        ),
+        migrations.AlterField(
+            model_name="project",
+            name="identifier",
+            field=models.CharField(
+                db_index=True, max_length=12, verbose_name="Project Identifier"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="projectidentifier",
+            name="name",
+            field=models.CharField(db_index=True, max_length=12),
+        ),
+    ]
@@ -29,7 +29,7 @@ from .issue import (
    IssueLabel,
    IssueLink,
    IssueMention,
-    IssueProperty,
+    IssueUserProperty,
    IssueReaction,
    IssueRelation,
    IssueSequence,
@@ -50,7 +50,14 @@ from .notification import (
    Notification,
    UserNotificationPreference,
 )
-from .page import Page, PageFavorite, PageLabel, PageLog, ProjectPage
+from .page import (
+    Page,
+    PageFavorite,
+    PageLabel,
+    PageLog,
+    ProjectPage,
+    PageVersion,
+)
 from .project import (
    Project,
    ProjectBaseModel,
@@ -101,3 +108,7 @@ from .webhook import Webhook, WebhookLog
 from .dashboard import Dashboard, DashboardWidget, Widget

 from .favorite import UserFavorite
+
+from .issue_type import IssueType
+
+from .recent_visit import UserRecentVisit
@@ -44,6 +44,7 @@ class APIToken(BaseModel):
        null=True,
    )
    expired_at = models.DateTimeField(blank=True, null=True)
+    is_service = models.BooleanField(default=False)

    class Meta:
        verbose_name = "API Token"
@@ -18,6 +18,17 @@ def generate_token():


 class ExporterHistory(BaseModel):
+    name = models.CharField(
+        max_length=255, verbose_name="Exporter Name", null=True, blank=True
+    )
+    type = models.CharField(
+        max_length=50,
+        default="issue_exports",
+        choices=(
+            ("issue_exports", "Issue Exports"),
+            ("issue_worklogs", "Issue Worklogs"),
+        ),
+    )
    workspace = models.ForeignKey(
        "db.WorkSpace",
        on_delete=models.CASCADE,
@@ -55,6 +66,7 @@ class ExporterHistory(BaseModel):
        on_delete=models.CASCADE,
        related_name="workspace_exporters",
    )
+    filters = models.JSONField(blank=True, null=True)

    class Meta:
        verbose_name = "Exporter"
@@ -6,9 +6,7 @@ from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models
-from django.db.models.signals import post_save
-from django.dispatch import receiver
+from django.db import models, transaction
 from django.utils import timezone

 # Module imports
@@ -91,6 +89,7 @@ class IssueManager(models.Manager):
                | models.Q(issue_inbox__status=2)
                | models.Q(issue_inbox__isnull=True)
            )
+            .filter(state__is_triage=False)
            .exclude(archived_at__isnull=False)
            .exclude(project__archived_at__isnull=False)
            .exclude(is_draft=True)
@@ -163,6 +162,13 @@ class Issue(ProjectBaseModel):
    is_draft = models.BooleanField(default=False)
    external_source = models.CharField(max_length=255, null=True, blank=True)
    external_id = models.CharField(max_length=255, blank=True, null=True)
+    type = models.ForeignKey(
+        "db.IssueType",
+        on_delete=models.SET_NULL,
+        related_name="issue_type",
+        null=True,
+        blank=True,
+    )

    objects = models.Manager()
    issue_objects = IssueManager()
@@ -174,7 +180,6 @@ class Issue(ProjectBaseModel):
        ordering = ("-created_at",)

    def save(self, *args, **kwargs):
-        # This means that the model isn't saved to the database yet
        if self.state is None:
            try:
                from plane.db.models import State
@@ -184,7 +189,6 @@ class Issue(ProjectBaseModel):
                    project=self.project,
                    default=True,
                ).first()
-                # if there is no default state assign any random state
                if default_state is None:
                    random_state = State.objects.filter(
                        ~models.Q(is_triage=True), project=self.project
@@ -198,7 +202,6 @@ class Issue(ProjectBaseModel):
            try:
                from plane.db.models import State

-                # Check if the current issue state group is completed or not
                if self.state.group == "completed":
                    self.completed_at = timezone.now()
                else:
@@ -207,30 +210,44 @@ class Issue(ProjectBaseModel):
                pass

        if self._state.adding:
-            # Get the maximum display_id value from the database
-            last_id = IssueSequence.objects.filter(
-                project=self.project
-            ).aggregate(largest=models.Max("sequence"))["largest"]
-            # aggregate can return None! Check it first.
-            # If it isn't none, just use the last ID specified (which should be the greatest) and add one to it
-            if last_id:
-                self.sequence_id = last_id + 1
-            else:
-                self.sequence_id = 1
+            with transaction.atomic():
+                last_sequence = (
+                    IssueSequence.objects.filter(project=self.project)
+                    .select_for_update()
+                    .aggregate(largest=models.Max("sequence"))["largest"]
+                )
+                self.sequence_id = last_sequence + 1 if last_sequence else 1
+                # Strip the html tags using html parser
+                self.description_stripped = (
+                    None
+                    if (
+                        self.description_html == ""
+                        or self.description_html is None
+                    )
+                    else strip_tags(self.description_html)
+                )
+                largest_sort_order = Issue.objects.filter(
+                    project=self.project, state=self.state
+                ).aggregate(largest=models.Max("sort_order"))["largest"]
+                if largest_sort_order is not None:
+                    self.sort_order = largest_sort_order + 10000

-            largest_sort_order = Issue.objects.filter(
-                project=self.project, state=self.state
-            ).aggregate(largest=models.Max("sort_order"))["largest"]
-            if largest_sort_order is not None:
-                self.sort_order = largest_sort_order + 10000
+                super(Issue, self).save(*args, **kwargs)

-        # Strip the html tags using html parser
-        self.description_stripped = (
-            None
-            if (self.description_html == "" or self.description_html is None)
-            else strip_tags(self.description_html)
-        )
-        super(Issue, self).save(*args, **kwargs)
+                IssueSequence.objects.create(
+                    issue=self, sequence=self.sequence_id, project=self.project
+                )
+        else:
+            # Strip the html tags using html parser
+            self.description_stripped = (
+                None
+                if (
+                    self.description_html == ""
+                    or self.description_html is None
+                )
+                else strip_tags(self.description_html)
+            )
+            super(Issue, self).save(*args, **kwargs)

    def __str__(self):
        """Return name of the issue"""
@@ -367,6 +384,8 @@ class IssueAttachment(ProjectBaseModel):
    issue = models.ForeignKey(
        "db.Issue", on_delete=models.CASCADE, related_name="issue_attachment"
    )
+    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_id = models.CharField(max_length=255, blank=True, null=True)

    class Meta:
        verbose_name = "Issue Attachment"
@@ -474,7 +493,7 @@ class IssueComment(ProjectBaseModel):
        return str(self.issue)


-class IssueProperty(ProjectBaseModel):
+class IssueUserProperty(ProjectBaseModel):
    user = models.ForeignKey(
        settings.AUTH_USER_MODEL,
        on_delete=models.CASCADE,
@@ -487,9 +506,9 @@ class IssueProperty(ProjectBaseModel):
    )

    class Meta:
-        verbose_name = "Issue Property"
-        verbose_name_plural = "Issue Properties"
-        db_table = "issue_properties"
+        verbose_name = "Issue User Property"
+        verbose_name_plural = "Issue User Properties"
+        db_table = "issue_user_properties"
        ordering = ("-created_at",)
        unique_together = ["user", "project"]

@@ -559,9 +578,9 @@ class IssueSequence(ProjectBaseModel):
        Issue,
        on_delete=models.SET_NULL,
        related_name="issue_sequence",
-        null=True,
+        null=True,  # This is set to null because we want to keep the sequence even if the issue is deleted
    )
-    sequence = models.PositiveBigIntegerField(default=1)
+    sequence = models.PositiveBigIntegerField(default=1, db_index=True)
    deleted = models.BooleanField(default=False)

    class Meta:
@@ -667,14 +686,3 @@ class IssueVote(ProjectBaseModel):

    def __str__(self):
        return f"{self.issue.name} {self.actor.email}"
-
-
-# TODO: Find a better method to save the model
-@receiver(post_save, sender=Issue)
-def create_issue_sequence(sender, instance, created, **kwargs):
-    if created:
-        IssueSequence.objects.create(
-            issue=instance,
-            sequence=instance.sequence_id,
-            project=instance.project,
-        )
@@ -0,0 +1,37 @@
+# Django imports
+from django.db import models
+
+# Module imports
+from .workspace import WorkspaceBaseModel
+
+
+class IssueType(WorkspaceBaseModel):
+    name = models.CharField(max_length=255)
+    description = models.TextField(blank=True)
+    logo_props = models.JSONField(default=dict)
+    sort_order = models.FloatField(default=65535)
+    is_default = models.BooleanField(default=False)
+    weight = models.PositiveIntegerField(default=0)
+    is_active = models.BooleanField(default=True)
+
+    class Meta:
+        unique_together = ["project", "name"]
+        verbose_name = "Issue Type"
+        verbose_name_plural = "Issue Types"
+        db_table = "issue_types"
+        ordering = ("sort_order",)
+
+    def __str__(self):
+        return self.name
+
+    def save(self, *args, **kwargs):
+        # If we are adding a new issue type, we need to set the sort order
+        if self._state.adding:
+            # Get the largest sort order for the project
+            largest_sort_order = IssueType.objects.filter(
+                project=self.project
+            ).aggregate(largest=models.Max("sort_order"))["largest"]
+            # If there are issue types, set the sort order to the largest + 10000
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000
+        super(IssueType, self).save(*args, **kwargs)
@@ -1,6 +1,7 @@
 import uuid

 from django.conf import settings
+from django.utils import timezone

 # Django imports
 from django.db import models
@@ -66,6 +67,15 @@ class Page(BaseModel):
        """Return owner email and page name"""
        return f"{self.owned_by.email} <{self.name}>"

+    def save(self, *args, **kwargs):
+        # Strip the html tags using html parser
+        self.description_stripped = (
+            None
+            if (self.description_html == "" or self.description_html is None)
+            else strip_tags(self.description_html)
+        )
+        super(Page, self).save(*args, **kwargs)
+

 class PageLog(BaseModel):
    TYPE_CHOICES = (
@@ -93,7 +103,9 @@ class PageLog(BaseModel):
        verbose_name="Transaction Type",
    )
    workspace = models.ForeignKey(
-        "db.Workspace", on_delete=models.CASCADE, related_name="workspace_page_log"
+        "db.Workspace",
+        on_delete=models.CASCADE,
+        related_name="workspace_page_log",
    )

    class Meta:
@@ -247,3 +259,41 @@ class TeamPage(BaseModel):
        verbose_name_plural = "Team Pages"
        db_table = "team_pages"
        ordering = ("-created_at",)
+
+
+class PageVersion(BaseModel):
+    workspace = models.ForeignKey(
+        "db.Workspace",
+        on_delete=models.CASCADE,
+        related_name="page_versions",
+    )
+    page = models.ForeignKey(
+        "db.Page",
+        on_delete=models.CASCADE,
+        related_name="page_versions",
+    )
+    last_saved_at = models.DateTimeField(default=timezone.now)
+    owned_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="page_versions",
+    )
+    description_binary = models.BinaryField(null=True)
+    description_html = models.TextField(blank=True, default="<p></p>")
+    description_stripped = models.TextField(blank=True, null=True)
+    description_json = models.JSONField(default=dict, blank=True)
+
+    class Meta:
+        verbose_name = "Page Version"
+        verbose_name_plural = "Page Versions"
+        db_table = "page_versions"
+        ordering = ("-created_at",)
+
+    def save(self, *args, **kwargs):
+        # Strip the html tags using html parser
+        self.description_stripped = (
+            None
+            if (self.description_html == "" or self.description_html is None)
+            else strip_tags(self.description_html)
+        )
+        super(PageVersion, self).save(*args, **kwargs)
@@ -72,6 +72,7 @@ class Project(BaseModel):
    identifier = models.CharField(
        max_length=12,
        verbose_name="Project Identifier",
+        db_index=True,
    )
    default_assignee = models.ForeignKey(
        settings.AUTH_USER_MODEL,
@@ -94,6 +95,8 @@ class Project(BaseModel):
    issue_views_view = models.BooleanField(default=True)
    page_view = models.BooleanField(default=True)
    inbox_view = models.BooleanField(default=False)
+    is_time_tracking_enabled = models.BooleanField(default=False)
+    is_issue_type_enabled = models.BooleanField(default=False)
    cover_image = models.URLField(blank=True, null=True, max_length=800)
    estimate = models.ForeignKey(
        "db.Estimate",
@@ -217,7 +220,7 @@ class ProjectIdentifier(AuditModel):
    project = models.OneToOneField(
        Project, on_delete=models.CASCADE, related_name="project_identifier"
    )
-    name = models.CharField(max_length=12)
+    name = models.CharField(max_length=12, db_index=True)

    class Meta:
        unique_together = ["name", "workspace"]
@@ -0,0 +1,38 @@
+# Django imports
+from django.db import models
+from django.conf import settings
+
+# Module imports
+from .workspace import WorkspaceBaseModel
+
+
+class EntityNameEnum(models.TextChoices):
+    VIEW = "VIEW", "View"
+    PAGE = "PAGE", "Page"
+    ISSUE = "ISSUE", "Issue"
+    CYCLE = "CYCLE", "Cycle"
+    MODULE = "MODULE", "Module"
+    PROJECT = "PROJECT", "Project"
+
+
+class UserRecentVisit(WorkspaceBaseModel):
+    entity_identifier = models.UUIDField(null=True)
+    entity_name = models.CharField(
+        max_length=30,
+        choices=EntityNameEnum.choices,
+    )
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="user_recent_visit",
+    )
+    visited_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        verbose_name = "User Recent Visit"
+        verbose_name_plural = "User Recent Visits"
+        db_table = "user_recent_visits"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.entity_name} {self.user.email}"
@@ -6,6 +6,7 @@ from django.db import models
 from .base import BaseModel
 from .project import ProjectBaseModel
 from .workspace import WorkspaceBaseModel
+from plane.utils.issue_filters import issue_filters


 def get_default_filters():
@@ -116,6 +117,26 @@ class IssueView(WorkspaceBaseModel):
        db_table = "issue_views"
        ordering = ("-created_at",)

+    def save(self, *args, **kwargs):
+        query_params = self.filters
+        self.query = (
+            issue_filters(query_params, "POST") if query_params else {}
+        )
+
+        if self._state.adding:
+            if self.project:
+                largest_sort_order = IssueView.objects.filter(
+                    project=self.project
+                ).aggregate(largest=models.Max("sort_order"))["largest"]
+            else:
+                largest_sort_order = IssueView.objects.filter(
+                    workspace=self.workspace, project__isnull=True
+                ).aggregate(largest=models.Max("sort_order"))["largest"]
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000
+
+        super(IssueView, self).save(*args, **kwargs)
+
    def __str__(self):
        """Return name of the View"""
        return f"{self.name} <{self.project.name}>"
@@ -5,6 +5,7 @@ from django.db import models

 # Module imports
 from .base import BaseModel
+from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS

 ROLE_CHOICES = (
    (20, "Owner"),
@@ -112,19 +113,7 @@ def get_issue_props():


 def slug_validator(value):
-    if value in [
-        "404",
-        "accounts",
-        "api",
-        "create-workspace",
-        "god-mode",
-        "installations",
-        "invitations",
-        "onboarding",
-        "profile",
-        "spaces",
-        "workspace-invitations",
-    ]:
+    if value in RESTRICTED_WORKSPACE_SLUGS:
        raise ValidationError("Slug is not valid")


@@ -23,6 +23,8 @@ from plane.license.utils.instance_value import (
    get_configuration_value,
 )
 from plane.utils.cache import cache_response, invalidate_cache
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control


 class InstanceEndpoint(BaseAPIView):
@@ -36,6 +38,7 @@ class InstanceEndpoint(BaseAPIView):
        ]

    @cache_response(60 * 60 * 2, user=False)
+    @method_decorator(cache_control(private=True, max_age=12))
    def get(self, request):
        instance = Instance.objects.first()

@@ -16,6 +16,7 @@ from django.core.management.utils import get_random_secret_key
 from sentry_sdk.integrations.celery import CeleryIntegration
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
+from corsheaders.defaults import default_headers

 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

@@ -127,6 +128,8 @@ else:
    CORS_ALLOW_ALL_ORIGINS = True
    secure_origins = False

+CORS_ALLOW_HEADERS = [*default_headers, "X-API-Key"]
+
 # Application Settings
 WSGI_APPLICATION = "plane.wsgi.application"
 ASGI_APPLICATION = "plane.asgi.application"
@@ -291,7 +294,7 @@ if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get(
        send_default_pii=True,
        environment=os.environ.get("SENTRY_ENVIRONMENT", "development"),
        profiles_sample_rate=float(
-            os.environ.get("SENTRY_PROFILE_SAMPLE_RATE", 0.5)
+            os.environ.get("SENTRY_PROFILE_SAMPLE_RATE", 0)
        ),
    )

@@ -1,5 +1,9 @@
 from .user import UserLiteSerializer

-from .issue import LabelLiteSerializer, StateLiteSerializer
+from .issue import (
+    LabelLiteSerializer,
+    StateLiteSerializer,
+    IssuePublicSerializer,
+)

 from .state import StateSerializer, StateLiteSerializer
@@ -188,11 +188,16 @@ class IssueAttachmentSerializer(BaseSerializer):


 class IssueReactionSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")

    class Meta:
        model = IssueReaction
-        fields = "__all__"
+        fields = [
+            "issue",
+            "reaction",
+            "workspace",
+            "project",
+            "actor",
+        ]
        read_only_fields = [
            "workspace",
            "project",
@@ -454,20 +459,6 @@ class IssueCreateSerializer(BaseSerializer):
        return super().update(instance, validated_data)


-class IssueReactionSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-
-    class Meta:
-        model = IssueReaction
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "issue",
-            "actor",
-        ]
-
-
 class CommentReactionSerializer(BaseSerializer):
    class Meta:
        model = CommentReaction
@@ -476,7 +467,6 @@ class CommentReactionSerializer(BaseSerializer):


 class IssueVoteSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")

    class Meta:
        model = IssueVote
@@ -486,35 +476,45 @@ class IssueVoteSerializer(BaseSerializer):
            "workspace",
            "project",
            "actor",
-            "actor_detail",
        ]
        read_only_fields = fields


 class IssuePublicSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    state_detail = StateLiteSerializer(read_only=True, source="state")
    reactions = IssueReactionSerializer(
        read_only=True, many=True, source="issue_reactions"
    )
    votes = IssueVoteSerializer(read_only=True, many=True)
+    module_ids = serializers.ListField(
+        child=serializers.UUIDField(),
+        required=False,
+    )
+    label_ids = serializers.ListField(
+        child=serializers.UUIDField(),
+        required=False,
+    )
+    assignee_ids = serializers.ListField(
+        child=serializers.UUIDField(),
+        required=False,
+    )

    class Meta:
        model = Issue
        fields = [
            "id",
            "name",
-            "description_html",
            "sequence_id",
            "state",
-            "state_detail",
            "project",
-            "project_detail",
            "workspace",
            "priority",
            "target_date",
            "reactions",
            "votes",
+            "module_ids",
+            "created_by",
+            "label_ids",
+            "assignee_ids",
        ]
        read_only_fields = fields

@@ -3,7 +3,6 @@ from django.urls import path

 from plane.space.views import (
    InboxIssuePublicViewSet,
-    IssueVotePublicViewSet,
    WorkspaceProjectDeployBoardEndpoint,
 )

@@ -30,17 +29,6 @@ urlpatterns = [
        ),
        name="inbox-issue",
    ),
-    path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",
-        IssueVotePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-vote-project-board",
-    ),
    path(
        "workspaces/<str:slug>/project-boards/",
        WorkspaceProjectDeployBoardEndpoint.as_view(),
@@ -6,6 +6,7 @@ from plane.space.views import (
    IssueCommentPublicViewSet,
    IssueReactionPublicViewSet,
    CommentReactionPublicViewSet,
+    IssueVotePublicViewSet,
 )

 urlpatterns = [
@@ -73,4 +74,15 @@ urlpatterns = [
        ),
        name="comment-reactions-project-board",
    ),
+    path(
+        "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",
+        IssueVotePublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+                "delete": "destroy",
+            }
+        ),
+        name="issue-vote-project-board",
+    ),
 ]
@@ -5,6 +5,11 @@ from plane.space.views import (
    ProjectDeployBoardPublicSettingsEndpoint,
    ProjectIssuesPublicEndpoint,
    WorkspaceProjectAnchorEndpoint,
+    ProjectCyclesEndpoint,
+    ProjectModulesEndpoint,
+    ProjectStatesEndpoint,
+    ProjectLabelsEndpoint,
+    ProjectMembersEndpoint,
 )

 urlpatterns = [
@@ -23,4 +28,29 @@ urlpatterns = [
        WorkspaceProjectAnchorEndpoint.as_view(),
        name="project-deploy-board",
    ),
+    path(
+        "anchor/<str:anchor>/cycles/",
+        ProjectCyclesEndpoint.as_view(),
+        name="project-cycles",
+    ),
+    path(
+        "anchor/<str:anchor>/modules/",
+        ProjectModulesEndpoint.as_view(),
+        name="project-modules",
+    ),
+    path(
+        "anchor/<str:anchor>/states/",
+        ProjectStatesEndpoint.as_view(),
+        name="project-states",
+    ),
+    path(
+        "anchor/<str:anchor>/labels/",
+        ProjectLabelsEndpoint.as_view(),
+        name="project-labels",
+    ),
+    path(
+        "anchor/<str:anchor>/members/",
+        ProjectMembersEndpoint.as_view(),
+        name="project-members",
+    ),
 ]
@@ -0,0 +1,248 @@
+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import Q, UUIDField, Value, F, Case, When, JSONField
+from django.db.models.functions import Coalesce, JSONObject
+
+# Module imports
+from plane.db.models import (
+    Cycle,
+    Issue,
+    Label,
+    Module,
+    Project,
+    ProjectMember,
+    State,
+    WorkspaceMember,
+)
+
+def issue_queryset_grouper(queryset, group_by, sub_group_by):
+
+    FIELD_MAPPER = {
+        "label_ids": "labels__id",
+        "assignee_ids": "assignees__id",
+        "module_ids": "issue_module__module_id",
+    }
+
+    annotations_map = {
+        "assignee_ids": ("assignees__id", ~Q(assignees__id__isnull=True)),
+        "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
+        "module_ids": (
+            "issue_module__module_id",
+            ~Q(issue_module__module_id__isnull=True),
+        ),
+    }
+    default_annotations = {
+        key: Coalesce(
+            ArrayAgg(
+                field,
+                distinct=True,
+                filter=condition,
+            ),
+            Value([], output_field=ArrayField(UUIDField())),
+        )
+        for key, (field, condition) in annotations_map.items()
+        if FIELD_MAPPER.get(key) != group_by
+        or FIELD_MAPPER.get(key) != sub_group_by
+    }
+
+    return queryset.annotate(**default_annotations)
+
+
+def issue_on_results(issues, group_by, sub_group_by):
+
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "issue_module__module_id": "module_ids",
+    }
+
+    original_list = ["assignee_ids", "label_ids", "module_ids"]
+
+    required_fields = [
+        "id",
+        "name",
+        "state_id",
+        "sort_order",
+        "estimate_point",
+        "priority",
+        "start_date",
+        "target_date",
+        "sequence_id",
+        "project_id",
+        "parent_id",
+        "cycle_id",
+        "created_by",
+        "state__group",
+    ]
+
+    if group_by in FIELD_MAPPER:
+        original_list.remove(FIELD_MAPPER[group_by])
+        original_list.append(group_by)
+
+    if sub_group_by in FIELD_MAPPER:
+        original_list.remove(FIELD_MAPPER[sub_group_by])
+        original_list.append(sub_group_by)
+
+    required_fields.extend(original_list)
+
+    issues = issues.annotate(
+        vote_items=ArrayAgg(
+            Case(
+                When(
+                    votes__isnull=False,
+                    then=JSONObject(
+                        vote=F("votes__vote"),
+                        actor_details=JSONObject(
+                            id=F("votes__actor__id"),
+                            first_name=F("votes__actor__first_name"),
+                            last_name=F("votes__actor__last_name"),
+                            avatar=F("votes__actor__avatar"),
+                            display_name=F("votes__actor__display_name"),
+                        )
+                    ),
+                ),
+                default=None,
+                output_field=JSONField(),
+            ),
+            filter=Case(
+                When(votes__isnull=False, then=True),
+                default=False,
+                output_field=JSONField(),
+            ),
+            distinct=True,
+        ),
+        reaction_items=ArrayAgg(
+            Case(
+                When(
+                    issue_reactions__isnull=False,
+                    then=JSONObject(
+                        reaction=F("issue_reactions__reaction"),
+                        actor_details=JSONObject(
+                            id=F("issue_reactions__actor__id"),
+                            first_name=F("issue_reactions__actor__first_name"),
+                            last_name=F("issue_reactions__actor__last_name"),
+                            avatar=F("issue_reactions__actor__avatar"),
+                            display_name=F("issue_reactions__actor__display_name"),
+                        ),
+                    ),
+                ),
+                default=None,
+                output_field=JSONField(),
+            ),
+            filter=Case(
+                When(issue_reactions__isnull=False, then=True),
+                default=False,
+                output_field=JSONField(),
+            ),
+            distinct=True,
+        ),
+    ).values(*required_fields, "vote_items", "reaction_items")
+
+    return issues
+
+
+def issue_group_values(field, slug, project_id=None, filters=dict):
+    if field == "state_id":
+        queryset = State.objects.filter(
+            is_triage=False,
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+    if field == "labels__id":
+        queryset = Label.objects.filter(workspace__slug=slug).values_list(
+            "id", flat=True
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "assignees__id":
+        if project_id:
+            return ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                is_active=True,
+            ).values_list("member_id", flat=True)
+        else:
+            return list(
+                WorkspaceMember.objects.filter(
+                    workspace__slug=slug, is_active=True
+                ).values_list("member_id", flat=True)
+            )
+    if field == "issue_module__module_id":
+        queryset = Module.objects.filter(
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "cycle_id":
+        queryset = Cycle.objects.filter(
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "project_id":
+        queryset = Project.objects.filter(workspace__slug=slug).values_list(
+            "id", flat=True
+        )
+        return list(queryset)
+    if field == "priority":
+        return [
+            "low",
+            "medium",
+            "high",
+            "urgent",
+            "none",
+        ]
+    if field == "state__group":
+        return [
+            "backlog",
+            "unstarted",
+            "started",
+            "completed",
+            "cancelled",
+        ]
+    if field == "target_date":
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("target_date", flat=True)
+            .distinct()
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+    if field == "start_date":
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("start_date", flat=True)
+            .distinct()
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+
+    if field == "created_by":
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("created_by", flat=True)
+            .distinct()
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+
+    return []
@@ -2,6 +2,7 @@ from .project import (
    ProjectDeployBoardPublicSettingsEndpoint,
    WorkspaceProjectDeployBoardEndpoint,
    WorkspaceProjectAnchorEndpoint,
+    ProjectMembersEndpoint,
 )

 from .issue import (
@@ -14,3 +15,11 @@ from .issue import (
 )

 from .inbox import InboxIssuePublicViewSet
+
+from .cycle import ProjectCyclesEndpoint
+
+from .module import ProjectModulesEndpoint
+
+from .state import ProjectStatesEndpoint
+
+from .label import ProjectLabelsEndpoint
@@ -0,0 +1,35 @@
+# Third Party imports
+from rest_framework import status
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
+
+# Module imports
+from .base import BaseAPIView
+from plane.db.models import (
+    DeployBoard,
+    Cycle,
+)
+
+
+class ProjectCyclesEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        deploy_board = DeployBoard.objects.filter(anchor=anchor).first()
+        if not deploy_board:
+            return Response(
+                {"error": "Invalid anchor"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        cycles = Cycle.objects.filter(
+            workspace__slug=deploy_board.workspace.slug,
+            project_id=deploy_board.project_id,
+        ).values("id", "name")
+
+        return Response(
+            cycles,
+            status=status.HTTP_200_OK,
+        )
@@ -1,34 +1,51 @@
 # Python imports
 import json

+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models.functions import Coalesce, JSONObject
 from django.core.serializers.json import DjangoJSONEncoder
+from django.utils import timezone
 from django.db.models import (
    Exists,
    F,
-    Func,
-    OuterRef,
    Q,
    Prefetch,
+    UUIDField,
    Case,
    When,
-    CharField,
-    IntegerField,
+    JSONField,
    Value,
-    Max,
+    OuterRef,
+    Func
 )

-# Django imports
-from django.utils import timezone
-from rest_framework import status
-from rest_framework.permissions import AllowAny, IsAuthenticated
-
 # Third Party imports
 from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import AllowAny, IsAuthenticated

+
+# Module imports
+from .base import BaseAPIView, BaseViewSet
+
+# fetch the space app grouper function separately
+from plane.space.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
+
+
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
 from plane.app.serializers import (
    CommentReactionSerializer,
    IssueCommentSerializer,
-    IssuePublicSerializer,
    IssueReactionSerializer,
    IssueVoteSerializer,
 )
@@ -36,21 +53,183 @@ from plane.db.models import (
    Issue,
    IssueComment,
    IssueLink,
-    IssueAttachment,
-    ProjectMember,
    IssueReaction,
+    ProjectMember,
    CommentReaction,
    DeployBoard,
    IssueVote,
    ProjectPublicMember,
-    State,
-    Label,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.issue_filters import issue_filters

-# Module imports
-from .base import BaseAPIView, BaseViewSet
+
+class ProjectIssuesPublicEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        filters = issue_filters(request.query_params, "GET")
+        order_by_param = request.GET.get("order_by", "-created_at")
+
+        deploy_board = DeployBoard.objects.filter(
+            anchor=anchor, entity_name="project"
+        ).first()
+        if not deploy_board:
+            return Response(
+                {"error": "Project is not published"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        project_id = deploy_board.entity_identifier
+        slug = deploy_board.workspace.slug
+
+        issue_queryset = (
+            Issue.issue_objects.filter(
+                workspace__slug=slug, project_id=project_id
+            )
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .prefetch_related(
+                Prefetch(
+                    "issue_reactions",
+                    queryset=IssueReaction.objects.select_related("actor"),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "votes",
+                    queryset=IssueVote.objects.select_related("actor"),
+                )
+            )
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        ).distinct()
+
+        issue_queryset = issue_queryset.filter(**filters)
+
+        # Issue queryset
+        issue_queryset, order_by_param = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
+        )
+
+        # Group by
+        group_by = request.GET.get("group_by", False)
+        sub_group_by = request.GET.get("sub_group_by", False)
+
+        # issue queryset
+        issue_queryset = issue_queryset_grouper(
+            queryset=issue_queryset,
+            group_by=group_by,
+            sub_group_by=sub_group_by,
+        )
+
+        if group_by:
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    return self.paginate(
+                        request=request,
+                        order_by=order_by_param,
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=order_by_param,
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
+                )
+        else:
+            return self.paginate(
+                order_by=order_by_param,
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by,
+                    issues=issues,
+                    sub_group_by=sub_group_by,
+                ),
+            )


 class IssueCommentPublicViewSet(BaseViewSet):
@@ -503,67 +682,50 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
    ]

    def get(self, request, anchor, issue_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
-        )
-        issue = Issue.objects.get(
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
-            pk=issue_id,
-        )
-        serializer = IssuePublicSerializer(issue)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class ProjectIssuesPublicEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, anchor):
-        deploy_board = DeployBoard.objects.filter(
-            anchor=anchor, entity_name="project"
-        ).first()
-        if not deploy_board:
-            return Response(
-                {"error": "Project is not published"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        filters = issue_filters(request.query_params, "GET")
-
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
-        order_by_param = request.GET.get("order_by", "-created_at")
-
-        project_id = deploy_board.entity_identifier
-        slug = deploy_board.workspace.slug
+        deploy_board = DeployBoard.objects.get(anchor=anchor)

        issue_queryset = (
-            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
+            Issue.issue_objects.filter(
+                pk=issue_id,
+                workspace__slug=deploy_board.workspace.slug,
+                project_id=deploy_board.project_id,
+            )
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(
+                label_ids=Coalesce(
+                    ArrayAgg(
+                        "labels__id",
+                        distinct=True,
+                        filter=~Q(labels__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                assignee_ids=Coalesce(
+                    ArrayAgg(
+                        "assignees__id",
+                        distinct=True,
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+                module_ids=Coalesce(
+                    ArrayAgg(
+                        "issue_module__module_id",
+                        distinct=True,
+                        filter=~Q(issue_module__module_id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
            )
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project", "workspace", "state", "parent")
-            .prefetch_related("assignees", "labels")
            .prefetch_related(
                Prefetch(
                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
+                    queryset=IssueReaction.objects.select_related(
+                        "issue", "actor"
+                    ),
                )
            )
            .prefetch_related(
@@ -572,124 +734,91 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                    queryset=IssueVote.objects.select_related("actor"),
                )
            )
-            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-        )
-
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
-
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
-                )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
-                    else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
-            )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        issues = IssuePublicSerializer(issue_queryset, many=True).data
-
-        state_group_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
-        states = (
-            State.objects.filter(
-                ~Q(name="Triage"),
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(
-                custom_order=Case(
-                    *[
-                        When(group=value, then=Value(index))
-                        for index, value in enumerate(state_group_order)
-                    ],
-                    default=Value(len(state_group_order)),
-                    output_field=IntegerField(),
+                vote_items=ArrayAgg(
+                    Case(
+                        When(
+                            votes__isnull=False,
+                            then=JSONObject(
+                                vote=F("votes__vote"),
+                                actor_details=JSONObject(
+                                    id=F("votes__actor__id"),
+                                    first_name=F("votes__actor__first_name"),
+                                    last_name=F("votes__actor__last_name"),
+                                    avatar=F("votes__actor__avatar"),
+                                    display_name=F(
+                                        "votes__actor__display_name"
+                                    ),
+                                ),
+                            ),
+                        ),
+                        default=None,
+                        output_field=JSONField(),
+                    ),
+                    filter=Case(
+                        When(votes__isnull=False, then=True),
+                        default=False,
+                        output_field=JSONField(),
+                    ),
+                    distinct=True,
+                ),
+                reaction_items=ArrayAgg(
+                    Case(
+                        When(
+                            issue_reactions__isnull=False,
+                            then=JSONObject(
+                                reaction=F("issue_reactions__reaction"),
+                                actor_details=JSONObject(
+                                    id=F("issue_reactions__actor__id"),
+                                    first_name=F(
+                                        "issue_reactions__actor__first_name"
+                                    ),
+                                    last_name=F(
+                                        "issue_reactions__actor__last_name"
+                                    ),
+                                    avatar=F("issue_reactions__actor__avatar"),
+                                    display_name=F(
+                                        "issue_reactions__actor__display_name"
+                                    ),
+                                ),
+                            ),
+                        ),
+                        default=None,
+                        output_field=JSONField(),
+                    ),
+                    filter=Case(
+                        When(issue_reactions__isnull=False, then=True),
+                        default=False,
+                        output_field=JSONField(),
+                    ),
+                    distinct=True,
                ),
            )
-            .values("name", "group", "color", "id")
-            .order_by("custom_order", "sequence")
-        )
+            .values(
+                "id",
+                "name",
+                "state_id",
+                "sort_order",
+                "description",
+                "description_html",
+                "description_stripped",
+                "description_binary",
+                "module_ids",
+                "label_ids",
+                "assignee_ids",
+                "estimate_point",
+                "priority",
+                "start_date",
+                "target_date",
+                "sequence_id",
+                "project_id",
+                "parent_id",
+                "cycle_id",
+                "created_by",
+                "state__group",
+                "vote_items",
+                "reaction_items",
+            )
+        ).first()

-        labels = Label.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).values("id", "name", "color", "parent")
-
-        return Response(
-            {
-                "issues": issues,
-                "states": states,
-                "labels": labels,
-            },
-            status=status.HTTP_200_OK,
-        )
+        return Response(issue_queryset, status=status.HTTP_200_OK)
@@ -0,0 +1,35 @@
+# Third Party imports
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import AllowAny
+
+# Module imports
+from .base import BaseAPIView
+from plane.db.models import (
+    DeployBoard,
+    Label,
+)
+
+
+class ProjectLabelsEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        deploy_board = DeployBoard.objects.filter(anchor=anchor).first()
+        if not deploy_board:
+            return Response(
+                {"error": "Invalid anchor"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        labels = Label.objects.filter(
+            workspace__slug=deploy_board.workspace.slug,
+            project_id=deploy_board.project_id,
+        ).values("id", "name", "color", "parent")
+
+        return Response(
+            labels,
+            status=status.HTTP_200_OK,
+        )
@@ -0,0 +1,35 @@
+# Third Party imports
+from rest_framework import status
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
+
+# Module imports
+from .base import BaseAPIView
+from plane.db.models import (
+    DeployBoard,
+    Module,
+)
+
+
+class ProjectModulesEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        deploy_board = DeployBoard.objects.filter(anchor=anchor).first()
+        if not deploy_board:
+            return Response(
+                {"error": "Invalid anchor"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        modules = Module.objects.filter(
+            workspace__slug=deploy_board.workspace.slug,
+            project_id=deploy_board.project_id,
+        ).values("id", "name")
+
+        return Response(
+            modules,
+            status=status.HTTP_200_OK,
+        )
@@ -12,10 +12,7 @@ from rest_framework.permissions import AllowAny
 # Module imports
 from .base import BaseAPIView
 from plane.app.serializers import DeployBoardSerializer
-from plane.db.models import (
-    Project,
-    DeployBoard,
-)
+from plane.db.models import Project, DeployBoard, ProjectMember


 class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
@@ -76,3 +73,27 @@ class WorkspaceProjectAnchorEndpoint(BaseAPIView):
        )
        serializer = DeployBoardSerializer(project_deploy_board)
        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class ProjectMembersEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        deploy_board = DeployBoard.objects.filter(anchor=anchor).first()
+
+        members = ProjectMember.objects.filter(
+            project=deploy_board.project,
+            workspace=deploy_board.workspace,
+            is_active=True,
+        ).values(
+            "id",
+            "member",
+            "member__first_name",
+            "member__last_name",
+            "member__display_name",
+            "project",
+            "workspace",
+        )
+        return Response(members, status=status.HTTP_200_OK)
@@ -0,0 +1,42 @@
+# Django imports
+from django.db.models import Q
+
+# Third Party imports
+from rest_framework import status
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
+
+# Module imports
+from .base import BaseAPIView
+from plane.db.models import (
+    DeployBoard,
+    State,
+)
+
+
+class ProjectStatesEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, anchor):
+        deploy_board = DeployBoard.objects.filter(anchor=anchor).first()
+        if not deploy_board:
+            return Response(
+                {"error": "Invalid anchor"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        states = (
+            State.objects.filter(
+                ~Q(name="Triage"),
+                workspace__slug=deploy_board.workspace.slug,
+                project_id=deploy_board.project_id,
+            )
+            .values("name", "group", "color", "id")
+        )
+
+        return Response(
+            states,
+            status=status.HTTP_200_OK,
+        )
@@ -12,7 +12,7 @@ from django.db.models import (
    Sum,
    Value,
    When,
-    IntegerField,
+    FloatField,
 )
 from django.db.models.functions import (
    Coalesce,
@@ -98,7 +98,7 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):
    # Estimate
    else:
        queryset = queryset.annotate(
-            estimate=Sum(Cast("estimate_point__value", IntegerField()))
+            estimate=Sum(Cast("estimate_point__value", FloatField()))
        ).order_by(x_axis)
        queryset = (
            queryset.annotate(segment=F(segment)) if segment else queryset
@@ -137,7 +137,7 @@ def burndown_plot(
        estimate__isnull=False,
        estimate__type="points",
    ).exists()
-    if estimate_type and plot_type == "points":
+    if estimate_type and plot_type == "points" and cycle_id:
        issue_estimates = Issue.objects.filter(
            workspace__slug=slug,
            project_id=project_id,
@@ -145,7 +145,18 @@ def burndown_plot(
            estimate_point__isnull=False,
        ).values_list("estimate_point__value", flat=True)

-        issue_estimates = [int(value) for value in issue_estimates]
+        issue_estimates = [float(value) for value in issue_estimates]
+        total_estimate_points = sum(issue_estimates)
+
+    if estimate_type and plot_type == "points" and module_id:
+        issue_estimates = Issue.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            issue_module__module_id=module_id,
+            estimate_point__isnull=False,
+        ).values_list("estimate_point__value", flat=True)
+
+        issue_estimates = [float(value) for value in issue_estimates]
        total_estimate_points = sum(issue_estimates)

    if cycle_id:
@@ -227,12 +238,12 @@ def burndown_plot(
                .order_by("date")
            )

-    for date in date_range:
-        if plot_type == "points":
+    if plot_type == "points":
+        for date in date_range:
            cumulative_pending_issues = total_estimate_points
            total_completed = 0
            total_completed = sum(
-                int(item["estimate_point__value"])
+                float(item["estimate_point__value"])
                for item in completed_issues_estimate_point_distribution
                if item["date"] is not None and item["date"] <= date
            )
@@ -241,7 +252,8 @@ def burndown_plot(
                chart_data[str(date)] = None
            else:
                chart_data[str(date)] = cumulative_pending_issues
-        else:
+    else:
+        for date in date_range:
            cumulative_pending_issues = total_issues
            total_completed = 0
            total_completed = sum(
--- a/Show More
+++ b/Show More