Merge pull request #4569 from makeplane/preview

release: v0.20-dev

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

@@ -1,91 +0,0 @@
-name: Build AIO Base Image
-
-on:
-  workflow_dispatch:
-
-env:
-  TARGET_BRANCH: ${{ github.ref_name }}
-
-jobs:
-  base_build_setup:
-    name: Build Preparation
-    runs-on: ubuntu-latest
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
-      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
-      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
-      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
-      build_base: ${{ steps.changed_files.outputs.base_any_changed }}
-
-    steps:
-      - id: set_env_variables
-        name: Set Environment Variables
-        run: |
-          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
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            base: 
-              - aio/Dockerfile.base
-
-  base_build_push:
-    if: ${{ needs.base_build_setup.outputs.build_base == 'true' || github.event_name == 'workflow_dispatch' || needs.base_build_setup.outputs.gh_branch_name == 'master' }}
-    runs-on: ubuntu-latest
-    needs: [base_build_setup]
-    env:
-      BASE_IMG_TAG: makeplane/plane-aio-base:${{ needs.base_build_setup.outputs.gh_branch_name }}
-      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 }}
-      BUILDX_ENDPOINT: ${{ needs.base_build_setup.outputs.gh_buildx_endpoint }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Set Docker Tag
-        run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-base:latest
-          else
-            TAG=${{ env.BASE_IMG_TAG }}
-          fi
-          echo "BASE_IMG_TAG=${TAG}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: ./aio
-          file: ./aio/Dockerfile.base
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.BASE_IMG_TAG }}
-          push: true
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build-branch.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   branch_build_setup:
-    name: Build Setup
+    name: Build-Push Web/Space/API/Proxy Docker Image
     runs-on: ubuntu-latest
     outputs:
       gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      FRONTEND_TAG: makeplane/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ needs.branch_build_setup.outputs.gh_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 }}
@@ -95,9 +95,9 @@ jobs:
       - name: Set Frontend Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-frontend:stable,makeplane/plane-frontend:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-frontend:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:latest
           else
             TAG=${{ env.FRONTEND_TAG }}
           fi
@@ -137,7 +137,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      ADMIN_TAG: makeplane/plane-admin:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      ADMIN_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:${{ needs.branch_build_setup.outputs.gh_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 }}
@@ -147,9 +147,9 @@ jobs:
       - name: Set Admin Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-admin:stable,makeplane/plane-admin:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-admin:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:latest
           else
             TAG=${{ env.ADMIN_TAG }}
           fi
@@ -189,7 +189,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      SPACE_TAG: makeplane/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ needs.branch_build_setup.outputs.gh_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 }}
@@ -199,9 +199,9 @@ jobs:
       - name: Set Space Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-space:stable,makeplane/plane-space:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-space:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest
           else
             TAG=${{ env.SPACE_TAG }}
           fi
@@ -241,7 +241,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      BACKEND_TAG: makeplane/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ needs.branch_build_setup.outputs.gh_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 }}
@@ -251,9 +251,9 @@ jobs:
       - name: Set Backend Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-backend:stable,makeplane/plane-backend:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-backend:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:latest
           else
             TAG=${{ env.BACKEND_TAG }}
           fi
@@ -293,7 +293,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      PROXY_TAG: makeplane/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ needs.branch_build_setup.outputs.gh_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 }}
@@ -303,9 +303,9 @@ jobs:
       - name: Set Proxy Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-proxy:stable,makeplane/plane-proxy:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-proxy:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:latest
           else
             TAG=${{ env.PROXY_TAG }}
           fi

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

@@ -3,11 +3,10 @@ name: Build and Lint on Pull Request
 on:
   workflow_dispatch:
   pull_request:
-    types: ["opened", "synchronize", "ready_for_review"]
+    types: ["opened", "synchronize"]
 
 jobs:
   get-changed-files:
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     outputs:
       apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}

Dockerfile

@@ -0,0 +1,124 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
+
+RUN yarn global add turbo
+RUN apk add tree
+COPY . .
+
+RUN turbo prune --scope=app --scope=plane-deploy --docker
+CMD tree -I node_modules/
+
+# Add lockfile and package.json's of isolated subworkspace
+FROM node:18-alpine AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+# First install the dependencies (as they change less often)
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install
+
+# # Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+COPY replace-env-vars.sh /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+
+RUN yarn turbo run build
+
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
+
+FROM python:3.11.1-alpine3.17 AS backend
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+
+WORKDIR /code
+
+RUN apk --no-cache add \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2" \
+    "nginx" \
+    "nodejs" \
+    "npm" \
+    "supervisor"
+
+COPY apiserver/requirements.txt ./
+COPY apiserver/requirements ./requirements
+RUN apk add --no-cache libffi-dev
+RUN apk add --no-cache --virtual .build-deps \
+    "bash~=5.2" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
+    "libc-dev" \
+    "linux-headers" \
+    && \
+    pip install -r requirements.txt --compile --no-cache-dir \
+    && \
+    apk del .build-deps
+
+# Add in Django deps and generate Django's static files
+COPY apiserver/manage.py manage.py
+COPY apiserver/plane plane/
+COPY apiserver/templates templates/
+
+RUN apk --no-cache add "bash~=5.2"
+COPY apiserver/bin ./bin/
+
+RUN chmod +x ./bin/*
+RUN chmod -R 777 /code
+
+# Expose container port and run entry point script
+
+WORKDIR /app
+
+COPY --from=installer /app/apps/app/next.config.js .
+COPY --from=installer /app/apps/app/package.json .
+COPY --from=installer /app/apps/space/next.config.js .
+COPY --from=installer /app/apps/space/package.json .
+
+COPY --from=installer /app/apps/app/.next/standalone ./
+
+COPY --from=installer /app/apps/app/.next/static ./apps/app/.next/static
+
+COPY --from=installer /app/apps/space/.next/standalone ./
+COPY --from=installer /app/apps/space/.next ./apps/space/.next
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+# RUN rm /etc/nginx/conf.d/default.conf
+#######################################################################
+COPY nginx/nginx-single-docker-image.conf /etc/nginx/http.d/default.conf
+#######################################################################
+
+COPY nginx/supervisor.conf /code/supervisor.conf
+
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+COPY replace-env-vars.sh /usr/local/bin/
+COPY start.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+RUN chmod +x /usr/local/bin/start.sh
+
+EXPOSE 80
+
+CMD ["supervisord","-c","/code/supervisor.conf"]

admin/app/ai/page.tsx

@@ -19,14 +19,14 @@ const InstanceAIPage = observer(() => {
   return (
     <>
       <PageHeader title="Artificial Intelligence - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">AI features for all your workspaces</div>
           <div className="text-sm font-normal text-custom-text-300">
             Configure your AI API credentials so Plane AI features are turned on for all your workspaces.
           </div>
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-auto">
           {formattedConfig ? (
             <InstanceAIForm config={formattedConfig} />
           ) : (

admin/app/authentication/github/page.tsx

@@ -64,8 +64,8 @@ const InstanceGithubAuthenticationPage = observer(() => {
   return (
     <>
       <PageHeader title="Authentication - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <AuthenticationMethodCard
             name="Github"
             description="Allow members to login or sign up to plane with their Github accounts."
@@ -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-auto">
           {formattedConfig ? (
             <InstanceGithubConfigForm config={formattedConfig} />
           ) : (

admin/app/authentication/google/page.tsx

@@ -58,8 +58,8 @@ const InstanceGoogleAuthenticationPage = observer(() => {
   return (
     <>
       <PageHeader title="Authentication - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <AuthenticationMethodCard
             name="Google"
             description="Allow members to login or sign up to plane with their Google
@@ -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-auto">
           {formattedConfig ? (
             <InstanceGoogleConfigForm config={formattedConfig} />
           ) : (

admin/app/authentication/page.tsx

@@ -7,12 +7,12 @@ import { useTheme } from "next-themes";
 import useSWR from "swr";
 import { Mails, KeyRound } from "lucide-react";
 import { TInstanceConfigurationKeys } from "@plane/types";
-import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
+import { Loader, setPromiseToast } from "@plane/ui";
 // components
 import { PageHeader } from "@/components/core";
 // hooks
 // helpers
-import { cn, resolveGeneralTheme } from "@/helpers/common.helper";
+import { resolveGeneralTheme } from "@/helpers/common.helper";
 import { useInstance } from "@/hooks/store";
 // images
 import githubLightModeImage from "@/public/logos/github-black.png";
@@ -45,8 +45,6 @@ const InstanceAuthenticationPage = observer(() => {
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
   // theme
   const { resolvedTheme } = useTheme();
-  // derived values
-  const enableSignUpConfig = formattedConfig?.ENABLE_SIGNUP ?? "";
 
   const updateConfig = async (key: TInstanceConfigurationKeys, value: string) => {
     setIsSubmitting(true);
@@ -121,44 +119,17 @@ const InstanceAuthenticationPage = observer(() => {
   return (
     <>
       <PageHeader title="Authentication - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">Manage authentication for your instance</div>
           <div className="text-sm font-normal text-custom-text-300">
             Configure authentication modes for your team and restrict sign ups to be invite only.
           </div>
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-auto">
           {formattedConfig ? (
             <div className="space-y-3">
-              <div className="text-lg font-medium pb-1">Sign-up configuration</div>
-              <div className={cn("w-full flex items-center gap-14 rounded")}>
-                <div className="flex grow items-center gap-4">
-                  <div className="grow">
-                    <div className={cn("font-medium leading-5 text-custom-text-100 text-sm")}>
-                      Allow anyone to sign up without invite
-                    </div>
-                    <div className={cn("font-normal leading-5 text-custom-text-300 text-xs")}>
-                      Toggling this off will disable self sign ups.
-                    </div>
-                  </div>
-                </div>
-                <div className={`shrink-0 pr-4 ${isSubmitting && "opacity-70"}`}>
-                  <div className="flex items-center gap-4">
-                    <ToggleSwitch
-                      value={Boolean(parseInt(enableSignUpConfig))}
-                      onChange={() => {
-                        Boolean(parseInt(enableSignUpConfig)) === true
-                          ? updateConfig("ENABLE_SIGNUP", "0")
-                          : updateConfig("ENABLE_SIGNUP", "1");
-                      }}
-                      size="sm"
-                      disabled={isSubmitting}
-                    />
-                  </div>
-                </div>
-              </div>
-              <div className="text-lg font-medium pt-6">Authentication modes</div>
+              <div className="text-lg font-medium">Authentication modes</div>
               {authenticationMethodsCard.map((method) => (
                 <AuthenticationMethodCard
                   key={method.key}

admin/app/email/page.tsx

@@ -19,8 +19,8 @@ const InstanceEmailPage = observer(() => {
   return (
     <>
       <PageHeader title="Email - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">Secure emails from your own instance</div>
           <div className="text-sm font-normal text-custom-text-300">
             Plane can send useful emails to you and your users from your own instance without talking to the Internet.
@@ -30,7 +30,7 @@ const InstanceEmailPage = observer(() => {
             </div>
           </div>
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-auto">
           {formattedConfig ? (
             <InstanceEmailForm config={formattedConfig} />
           ) : (

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

@@ -51,7 +51,7 @@ export const SendTestEmailModal: FC<Props> = (props) => {
         setSendEmailStep(ESendEmailSteps.SUCCESS);
       })
       .catch((error) => {
-        setError(error?.error || "Failed to send email");
+        setError(error?.message || "Failed to send email");
         setSendEmailStep(ESendEmailSteps.FAILED);
       })
       .finally(() => {

admin/app/general/page.tsx

@@ -10,15 +10,15 @@ function GeneralPage() {
   console.log("instance", instance);
   return (
     <>
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">General settings</div>
           <div className="text-sm font-normal text-custom-text-300">
             Change the name of your instance and instance admin e-mail addresses. Enable or disable telemetry in your
             instance.
           </div>
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-auto">
           {instance && instanceAdmins && (
             <GeneralConfigurationForm instance={instance} instanceAdmins={instanceAdmins} />
           )}

admin/app/globals.css

@@ -332,90 +332,42 @@ body {
 }
 
 /* scrollbar style */
-@-moz-document url-prefix() {
-  * {
-    scrollbar-width: none;
-  }
-  .vertical-scrollbar,
-  .horizontal-scrollbar {
-    scrollbar-width: initial;
-    scrollbar-color: rgba(96, 100, 108, 0.1) transparent;
-  }
-  .vertical-scrollbar:hover,
-  .horizontal-scrollbar:hover {
-    scrollbar-color: rgba(96, 100, 108, 0.25) transparent;
-  }
-  .vertical-scrollbar:active,
-  .horizontal-scrollbar:active {
-    scrollbar-color: rgba(96, 100, 108, 0.7) transparent;
-  }
+::-webkit-scrollbar {
+  display: none;
 }
 
-.vertical-scrollbar {
-  overflow-y: auto;
+.horizontal-scroll-enable {
+  overflow-x: scroll;
 }
-.horizontal-scrollbar {
-  overflow-x: auto;
-}
-.vertical-scrollbar::-webkit-scrollbar,
-.horizontal-scrollbar::-webkit-scrollbar {
+
+.horizontal-scroll-enable::-webkit-scrollbar {
   display: block;
-}
-.vertical-scrollbar::-webkit-scrollbar-track,
-.horizontal-scrollbar::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 9999px;
-}
-.vertical-scrollbar::-webkit-scrollbar-thumb,
-.horizontal-scrollbar::-webkit-scrollbar-thumb {
-  background-clip: padding-box;
-  background-color: rgba(96, 100, 108, 0.1);
-  border-radius: 9999px;
-}
-.vertical-scrollbar:hover::-webkit-scrollbar-thumb,
-.horizontal-scrollbar:hover::-webkit-scrollbar-thumb {
-  background-color: rgba(96, 100, 108, 0.25);
-}
-.vertical-scrollbar::-webkit-scrollbar-thumb:hover,
-.horizontal-scrollbar::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(96, 100, 108, 0.5);
-}
-.vertical-scrollbar::-webkit-scrollbar-thumb:active,
-.horizontal-scrollbar::-webkit-scrollbar-thumb:active {
-  background-color: rgba(96, 100, 108, 0.7);
-}
-.vertical-scrollbar::-webkit-scrollbar-corner,
-.horizontal-scrollbar::-webkit-scrollbar-corner {
-  background-color: transparent;
-}
-.vertical-scrollbar-margin-top-md::-webkit-scrollbar-track {
-  margin-top: 44px;
+  height: 7px;
+  width: 0;
 }
 
-/* scrollbar sm size */
-.scrollbar-sm::-webkit-scrollbar {
-  height: 12px;
-  width: 12px;
+.horizontal-scroll-enable::-webkit-scrollbar-track {
+  height: 7px;
+  background-color: rgba(var(--color-background-100));
 }
-.scrollbar-sm::-webkit-scrollbar-thumb {
-  border: 3px solid rgba(0, 0, 0, 0);
-}
-/* scrollbar md size */
-.scrollbar-md::-webkit-scrollbar {
-  height: 14px;
-  width: 14px;
-}
-.scrollbar-md::-webkit-scrollbar-thumb {
-  border: 3px solid rgba(0, 0, 0, 0);
-}
-/* scrollbar lg size */
 
-.scrollbar-lg::-webkit-scrollbar {
-  height: 16px;
-  width: 16px;
+.horizontal-scroll-enable::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background-color: rgba(var(--color-scrollbar));
 }
-.scrollbar-lg::-webkit-scrollbar-thumb {
-  border: 4px solid rgba(0, 0, 0, 0);
+
+.vertical-scroll-enable::-webkit-scrollbar {
+  display: block;
+  width: 5px;
+}
+
+.vertical-scroll-enable::-webkit-scrollbar-track {
+  width: 5px;
+}
+
+.vertical-scroll-enable::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background-color: rgba(var(--color-background-90));
 }
 /* end scrollbar style */
 

admin/app/image/page.tsx

@@ -19,14 +19,14 @@ const InstanceImagePage = observer(() => {
   return (
     <>
       <PageHeader title="Image - God Mode" />
-      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
-        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+      <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">Third-party image libraries</div>
           <div className="text-sm font-normal text-custom-text-300">
             Let your users search and choose images from third-party libraries
           </div>
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-auto">
           {formattedConfig ? (
             <InstanceImageConfigForm config={formattedConfig} />
           ) : (

admin/components/admin-sidebar/help-section.tsx

@@ -5,11 +5,9 @@ import { observer } from "mobx-react-lite";
 import Link from "next/link";
 import { ExternalLink, FileText, HelpCircle, MoveLeft } from "lucide-react";
 import { Transition } from "@headlessui/react";
-// ui
 import { DiscordIcon, GithubIcon, Tooltip } from "@plane/ui";
-// helpers
-import { WEB_BASE_URL, cn } from "@/helpers/common.helper";
 // hooks
+import { WEB_BASE_URL } from "@/helpers/common.helper";
 import { useTheme } from "@/hooks/store";
 // assets
 import packageJson from "package.json";
@@ -40,16 +38,13 @@ export const HelpSection: FC = observer(() => {
   // refs
   const helpOptionsRef = useRef<HTMLDivElement | null>(null);
 
-  const redirectionLink = encodeURI(WEB_BASE_URL + "/");
+  const redirectionLink = encodeURI(WEB_BASE_URL + "/create-workspace");
 
   return (
     <div
-      className={cn(
-        "flex w-full items-center justify-between gap-1 self-baseline border-t border-custom-border-200 bg-custom-sidebar-background-100 px-4 h-14 flex-shrink-0",
-        {
-          "flex-col h-auto py-1.5": isSidebarCollapsed,
-        }
-      )}
+      className={`flex w-full items-center justify-between gap-1 self-baseline border-t border-custom-sidebar-border-200 bg-custom-sidebar-background-100 px-4 py-2 ${
+        isSidebarCollapsed ? "flex-col" : ""
+      }`}
     >
       <div className={`flex items-center gap-1 ${isSidebarCollapsed ? "flex-col justify-center" : "w-full"}`}>
         <Tooltip tooltipContent="Redirect to plane" position="right" className="ml-4" disabled={!isSidebarCollapsed}>

admin/components/admin-sidebar/sidebar-menu.tsx

@@ -56,7 +56,7 @@ export const SidebarMenu = observer(() => {
   };
 
   return (
-    <div className="flex h-full w-full flex-col gap-2.5 overflow-y-scroll vertical-scrollbar scrollbar-sm px-4 py-4">
+    <div className="flex h-full w-full flex-col gap-2.5 overflow-y-auto px-4 py-4">
       {INSTANCE_ADMIN_LINKS.map((item, index) => {
         const isActive = item.href === pathName || pathName.includes(item.href);
         return (

admin/components/common/copy-field.tsx

@@ -24,7 +24,7 @@ export const CopyField: React.FC<Props> = (props) => {
 
   return (
     <div className="flex flex-col gap-1">
-      <h4 className="text-sm text-custom-text-200">{label}</h4>
+      <h4 className="text-sm text-custom-text-300">{label}</h4>
       <Button
         variant="neutral-primary"
         className="flex items-center justify-between py-2"
@@ -40,7 +40,7 @@ export const CopyField: React.FC<Props> = (props) => {
         <p className="text-sm font-medium">{url}</p>
         <Copy size={18} color="#B9B9B9" />
       </Button>
-      <div className="text-xs text-custom-text-300">{description}</div>
+      <div className="text-xs text-custom-text-400">{description}</div>
     </div>
   );
 };

admin/components/instance/setup-form.tsx

@@ -158,7 +158,6 @@ export const InstanceSetupForm: FC = (props) => {
           onError={() => setIsSubmitting(false)}
         >
           <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />
-          <input type="hidden" name="is_telemetry_enabled" value={formData.is_telemetry_enabled ? "True" : "False"} />
 
           <div className="flex flex-col sm:flex-row items-center gap-4">
             <div className="w-full space-y-1">
@@ -320,6 +319,8 @@ export const InstanceSetupForm: FC = (props) => {
             <div>
               <Checkbox
                 id="is_telemetry_enabled"
+                name="is_telemetry_enabled"
+                value={formData.is_telemetry_enabled ? "True" : "False"}
                 onChange={() => handleFormChange("is_telemetry_enabled", !formData.is_telemetry_enabled)}
                 checked={formData.is_telemetry_enabled}
               />

admin/components/new-user-popup.tsx

@@ -7,9 +7,9 @@ import { useTheme as nextUseTheme } from "next-themes";
 // ui
 import { Button, getButtonStyling } from "@plane/ui";
 // helpers
-import { WEB_BASE_URL, resolveGeneralTheme } from "helpers/common.helper";
+import { resolveGeneralTheme } from "helpers/common.helper";
 // hooks
-import { useTheme } from "@/hooks/store";
+import { useInstance, useTheme } from "@/hooks/store";
 // icons
 import TakeoffIconLight from "/public/logos/takeoff-icon-light.svg";
 import TakeoffIconDark from "/public/logos/takeoff-icon-dark.svg";
@@ -17,10 +17,11 @@ import TakeoffIconDark from "/public/logos/takeoff-icon-dark.svg";
 export const NewUserPopup: React.FC = observer(() => {
   // hooks
   const { isNewUserPopup, toggleNewUserPopup } = useTheme();
+  const { config } = useInstance();
   // theme
   const { resolvedTheme } = nextUseTheme();
 
-  const redirectionLink = encodeURI(WEB_BASE_URL + "/create-workspace");
+  const redirectionLink = `${config?.app_base_url ? `${config?.app_base_url}/create-workspace` : `/god-mode/`}`;
 
   if (!isNewUserPopup) return <></>;
   return (

admin/next.config.js

@@ -1,5 +1,4 @@
 /** @type {import('next').NextConfig} */
-
 const nextConfig = {
   trailingSlash: true,
   reactStrictMode: false,

admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.21.0",
+  "version": "0.20.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

aio/Dockerfile

@@ -1,149 +0,0 @@
-# *****************************************************************************
-# STAGE 1: Build the project
-# *****************************************************************************
-FROM node:18-alpine AS builder
-RUN apk add --no-cache libc6-compat
-# Set working directory
-WORKDIR /app
-ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
-
-RUN yarn global add turbo
-COPY . .
-
-RUN turbo prune --scope=web --scope=space --scope=admin --docker
-
-# *****************************************************************************
-# STAGE 2: Install dependencies & build the project
-# *****************************************************************************
-# Add lockfile and package.json's of isolated subworkspace
-FROM node:18-alpine AS installer
-
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# First install the dependencies (as they change less often)
-COPY .gitignore .gitignore
-COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/yarn.lock ./yarn.lock
-RUN yarn install
-
-# # Build the project
-COPY --from=builder /app/out/full/ .
-COPY turbo.json turbo.json
-
-ARG NEXT_PUBLIC_API_BASE_URL=""
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
-ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
-ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
-
-ARG NEXT_PUBLIC_SPACE_BASE_URL=""
-ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
-
-ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
-ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
-
-ENV NEXT_TELEMETRY_DISABLED 1
-ENV TURBO_TELEMETRY_DISABLED 1
-
-RUN yarn turbo run build
-
-# *****************************************************************************
-# STAGE 3: Copy the project and start it
-# *****************************************************************************
-# FROM makeplane/plane-aio-base AS runner
-FROM makeplane/plane-aio-base:develop AS runner
-
-WORKDIR /app
-
-SHELL [ "/bin/bash", "-c" ]
-
-# PYTHON APPLICATION SETUP
-
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
-
-COPY apiserver/requirements.txt ./api/
-COPY apiserver/requirements ./api/requirements
-
-RUN python3.12 -m venv /app/venv && \
-    source /app/venv/bin/activate && \
-    /app/venv/bin/pip install --upgrade pip && \
-    /app/venv/bin/pip install -r ./api/requirements.txt --compile --no-cache-dir
-
-# Add in Django deps and generate Django's static files
-COPY apiserver/manage.py ./api/manage.py
-COPY apiserver/plane ./api/plane/
-COPY apiserver/templates ./api/templates/
-COPY package.json ./api/package.json
-
-COPY apiserver/bin ./api/bin/
-
-RUN chmod +x ./api/bin/*
-RUN chmod -R 777 ./api/
-
-# NEXTJS BUILDS
-
-COPY --from=installer /app/web/next.config.js ./web/
-COPY --from=installer /app/web/package.json ./web/
-COPY --from=installer /app/web/.next/standalone ./web
-COPY --from=installer /app/web/.next/static ./web/web/.next/static
-COPY --from=installer /app/web/public ./web/web/public
-
-COPY --from=installer /app/space/next.config.js ./space/
-COPY --from=installer /app/space/package.json ./space/
-COPY --from=installer /app/space/.next/standalone ./space
-COPY --from=installer /app/space/.next/static ./space/space/.next/static
-COPY --from=installer /app/space/public ./space/space/public
-
-COPY --from=installer /app/admin/next.config.js ./admin/
-COPY --from=installer /app/admin/package.json ./admin/
-COPY --from=installer /app/admin/.next/standalone ./admin
-COPY --from=installer /app/admin/.next/static ./admin/admin/.next/static
-COPY --from=installer /app/admin/public ./admin/admin/public
-
-ARG NEXT_PUBLIC_API_BASE_URL=""
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
-ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
-ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
-
-ARG NEXT_PUBLIC_SPACE_BASE_URL=""
-ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
-
-ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
-ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
-
-ARG NEXT_PUBLIC_WEB_BASE_URL=""
-ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
-
-ENV NEXT_TELEMETRY_DISABLED 1
-ENV TURBO_TELEMETRY_DISABLED 1
-
-COPY aio/supervisord.conf /app/supervisord.conf
-
-COPY aio/aio.sh /app/aio.sh
-RUN chmod +x /app/aio.sh
-
-COPY aio/pg-setup.sh /app/pg-setup.sh
-RUN chmod +x /app/pg-setup.sh 
-
-COPY deploy/selfhost/variables.env /app/plane.env
-
-# NGINX Conf Copy
-COPY ./aio/nginx.conf.aio /etc/nginx/nginx.conf.template
-COPY ./nginx/env.sh /app/nginx-start.sh
-RUN chmod +x /app/nginx-start.sh
-
-RUN  ./pg-setup.sh
-
-VOLUME [ "/app/data/minio/uploads", "/var/lib/postgresql/data" ]
-
-CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/Dockerfile.base

@@ -1,92 +0,0 @@
-FROM --platform=$BUILDPLATFORM tonistiigi/binfmt as binfmt
-
-FROM debian:12-slim
-
-# Set environment variables to non-interactive for apt
-ENV DEBIAN_FRONTEND=noninteractive
-
-SHELL [ "/bin/bash", "-c" ]
-
-# Update the package list and install prerequisites
-RUN apt-get update && \
-    apt-get install -y \
-    gnupg2 curl ca-certificates lsb-release software-properties-common \
-    build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
-    libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev xz-utils \
-    tk-dev libffi-dev liblzma-dev supervisor nginx nano vim ncdu
-
-# Install Redis 7.2
-RUN echo "deb http://deb.debian.org/debian $(lsb_release -cs)-backports main" > /etc/apt/sources.list.d/backports.list && \
-    curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg && \
-    echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" > /etc/apt/sources.list.d/redis.list && \
-    apt-get update && \
-    apt-get install -y redis-server
-
-# Install PostgreSQL 15
-ENV POSTGRES_VERSION 15
-RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/pgdg-archive-keyring.gpg && \
-    echo "deb [signed-by=/usr/share/keyrings/pgdg-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    apt-get update && \
-    apt-get install -y postgresql-$POSTGRES_VERSION postgresql-client-$POSTGRES_VERSION && \
-    mkdir -p /var/lib/postgresql/data && \
-    chown -R postgres:postgres /var/lib/postgresql
-
-# Install MinIO
-ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "amd64" ]; then \
-        curl -fSl https://dl.min.io/server/minio/release/linux-amd64/minio -o /usr/local/bin/minio; \
-    elif [ "$TARGETARCH" = "arm64" ]; then \
-        curl -fSl https://dl.min.io/server/minio/release/linux-arm64/minio -o /usr/local/bin/minio; \
-    else \
-        echo "Unsupported architecture: $TARGETARCH"; exit 1; \
-    fi && \
-    chmod +x /usr/local/bin/minio
-
-
-# Install Node.js 18
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs
-
-# Install Python 3.12 from source
-RUN cd /usr/src && \
-    wget https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tgz && \
-    tar xzf Python-3.12.0.tgz && \
-    cd Python-3.12.0 && \
-    ./configure --enable-optimizations && \
-    make altinstall && \
-    rm -f /usr/src/Python-3.12.0.tgz
-
-RUN python3.12 -m pip install --upgrade pip
-
-RUN echo "alias python=/usr/local/bin/python3.12" >> ~/.bashrc && \
-    echo "alias pip=/usr/local/bin/pip3.12" >> ~/.bashrc
-    
-# Clean up
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /usr/src/Python-3.12.0
-    
-WORKDIR /app
-
-RUN mkdir -p /app/{data,logs} && \
-    mkdir -p /app/data/{redis,pg,minio,nginx} && \
-    mkdir -p /app/logs/{access,error} && \
-    mkdir -p /etc/supervisor/conf.d
-
-# Create Supervisor configuration file
-COPY supervisord.base /app/supervisord.conf
-
-RUN apt-get update && \
-    apt-get install -y sudo lsof net-tools libpq-dev procps gettext && \
-    apt-get clean
-
-RUN sudo -u postgres /usr/lib/postgresql/$POSTGRES_VERSION/bin/initdb -D /var/lib/postgresql/data
-COPY postgresql.conf /etc/postgresql/postgresql.conf
-
-RUN echo "alias python=/usr/local/bin/python3.12" >> ~/.bashrc && \
-    echo "alias pip=/usr/local/bin/pip3.12" >> ~/.bashrc
-
-# Expose ports for Redis, PostgreSQL, and MinIO
-EXPOSE 6379 5432 9000 80
-
-# Start Supervisor
-CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/aio.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-set -e
-
-
-if [ "$1" = 'api' ]; then
-    source /app/venv/bin/activate
-    cd /app/api
-    exec ./bin/docker-entrypoint-api.sh
-elif [ "$1" = 'worker' ]; then
-    source /app/venv/bin/activate
-    cd /app/api
-    exec ./bin/docker-entrypoint-worker.sh
-elif [ "$1" = 'beat' ]; then
-    source /app/venv/bin/activate
-    cd /app/api
-    exec ./bin/docker-entrypoint-beat.sh
-elif [ "$1" = 'migrator' ]; then
-    source /app/venv/bin/activate
-    cd /app/api
-    exec ./bin/docker-entrypoint-migrator.sh
-elif [ "$1" = 'web' ]; then
-    node /app/web/web/server.js
-elif [ "$1" = 'space' ]; then
-    node /app/space/space/server.js
-elif [ "$1" = 'admin' ]; then
-    node /app/admin/admin/server.js
-else
-    echo "Command not found"
-    exit 1
-fi

aio/nginx.conf.aio

@@ -1,73 +0,0 @@
-events {
-}
-
-http {
-    sendfile on;
-
-    server {
-        listen 80;
-        root /www/data/;
-        access_log /var/log/nginx/access.log;
-
-        client_max_body_size ${FILE_SIZE_LIMIT};
-
-        add_header X-Content-Type-Options    "nosniff" always;
-        add_header Referrer-Policy           "no-referrer-when-downgrade" always;
-        add_header Permissions-Policy        "interest-cohort=()" always;
-        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-        add_header X-Forwarded-Proto         "${dollar}scheme";
-        add_header X-Forwarded-Host          "${dollar}host";
-        add_header X-Forwarded-For           "${dollar}proxy_add_x_forwarded_for";
-        add_header X-Real-IP                 "${dollar}remote_addr";
-
-        location / {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:3001/;
-        }
-
-        location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;            
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:3002/spaces/;
-        }
-
-
-        location /god-mode/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:3003/god-mode/;
-        }
-
-        location /api/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:8000/api/;
-        }
-
-        location /auth/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:8000/auth/;
-        }
-
-        location /${BUCKET_NAME}/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:9000/uploads/;
-        }
-    }
-}

aio/pg-setup.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-
-# Variables
-set -o allexport
-source plane.env set
-set +o allexport
-
-export PGHOST=localhost
-
-sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data start
-sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/psql" --command "CREATE USER $POSTGRES_USER WITH SUPERUSER PASSWORD '$POSTGRES_PASSWORD';" && \
-sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/createdb" -O "$POSTGRES_USER" "$POSTGRES_DB" && \
-sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data stop

aio/postgresql.conf

@@ -1,12 +0,0 @@
-# PostgreSQL configuration file
-
-# Allow connections from any IP address
-listen_addresses = '*'
-
-# Set the maximum number of connections
-max_connections = 100
-
-# Set the shared buffers size
-shared_buffers = 128MB
-
-# Other custom configurations can be added here

aio/supervisord.base

@@ -1,37 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-stderr_logfile=/app/logs/error/supervisor.err.log
-stdout_logfile=/app/logs/access/supervisor.out.log
-
-[program:redis]
-directory=/app/data/redis
-command=redis-server
-autostart=true
-autorestart=true
-stderr_logfile=/app/logs/error/redis.err.log
-stdout_logfile=/app/logs/access/redis.out.log
-
-[program:postgresql]
-user=postgres
-command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/15/main/postgresql.conf
-autostart=true
-autorestart=true
-stderr_logfile=/app/logs/error/postgresql.err.log
-stdout_logfile=/app/logs/access/postgresql.out.log
-
-[program:minio]
-directory=/app/data/minio
-command=minio server /app/data/minio
-autostart=true
-autorestart=true
-stderr_logfile=/app/logs/error/minio.err.log
-stdout_logfile=/app/logs/access/minio.out.log
-
-[program:nginx]
-directory=/app/data/nginx
-command=/usr/sbin/nginx -g 'daemon off;'
-autostart=true
-autorestart=true
-stderr_logfile=/app/logs/error/nginx.err.log
-stdout_logfile=/app/logs/access/nginx.out.log

aio/supervisord.conf

@@ -1,115 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:redis]
-directory=/app/data/redis
-command=redis-server
-autostart=true
-autorestart=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:postgresql]
-user=postgres
-command=/usr/lib/postgresql/15/bin/postgres -D /var/lib/postgresql/data --config-file=/etc/postgresql/postgresql.conf
-autostart=true
-autorestart=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:minio]
-directory=/app/data/minio
-command=minio server /app/data/minio
-autostart=true
-autorestart=true
-priority=1
-stdout_logfile=/app/logs/access/minio.log
-stderr_logfile=/app/logs/error/minio.err.log
-
-[program:nginx]
-command=/app/nginx-start.sh
-autostart=true
-autorestart=true
-priority=1
-stdout_logfile=/app/logs/access/nginx.log
-stderr_logfile=/app/logs/error/nginx.err.log
-
-
-[program:web]
-command=/app/aio.sh web
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3001,HOSTNAME=0.0.0.0
-
-[program:space]
-command=/app/aio.sh space
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3002,HOSTNAME=0.0.0.0
-
-[program:admin]
-command=/app/aio.sh admin
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3003,HOSTNAME=0.0.0.0
-
-[program:migrator]
-command=/app/aio.sh migrator
-autostart=true
-autorestart=false
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:api]
-command=/app/aio.sh api
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:worker]
-command=/app/aio.sh worker
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:beat]
-command=/app/aio.sh beat
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.21.0"
+  "version": "0.20.0"
 }

apiserver/plane/api/views/cycle.py

@@ -784,7 +784,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
 
     def post(self, request, slug, project_id, cycle_id):
         new_cycle_id = request.data.get("new_cycle_id", False)
-        plot_type = request.GET.get("plot_type", "issues")
 
         if not new_cycle_id:
             return Response(
@@ -866,7 +865,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             queryset=old_cycle.first(),
             slug=slug,
             project_id=project_id,
-            plot_type=plot_type,
             cycle_id=cycle_id,
         )
 

apiserver/plane/api/views/issue.py

@@ -182,6 +182,7 @@ class IssueAPIEndpoint(BaseAPIView):
         issue_queryset = (
             self.get_queryset()
             .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()

apiserver/plane/api/views/project.py

@@ -22,7 +22,7 @@ from plane.db.models import (
     IssueProperty,
     Module,
     Project,
-    DeployBoard,
+    ProjectDeployBoard,
     ProjectMember,
     State,
     Workspace,
@@ -99,7 +99,7 @@ class ProjectAPIEndpoint(BaseAPIView):
             )
             .annotate(
                 is_deployed=Exists(
-                    DeployBoard.objects.filter(
+                    ProjectDeployBoard.objects.filter(
                         project_id=OuterRef("pk"),
                         workspace__slug=self.kwargs.get("slug"),
                     )

apiserver/plane/app/serializers/__init__.py

@@ -30,7 +30,7 @@ from .project import (
     ProjectIdentifierSerializer,
     ProjectLiteSerializer,
     ProjectMemberLiteSerializer,
-    DeployBoardSerializer,
+    ProjectDeployBoardSerializer,
     ProjectMemberAdminSerializer,
     ProjectPublicMemberSerializer,
     ProjectMemberRoleSerializer,

apiserver/plane/app/serializers/cycle.py

@@ -66,7 +66,6 @@ class CycleSerializer(BaseSerializer):
             "external_source",
             "external_id",
             "progress_snapshot",
-            "logo_props",
             # meta fields
             "is_favorite",
             "total_issues",

apiserver/plane/app/serializers/estimate.py

@@ -11,6 +11,10 @@ from rest_framework import serializers
 
 
 class EstimateSerializer(BaseSerializer):
+    workspace_detail = WorkspaceLiteSerializer(
+        read_only=True, source="workspace"
+    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = Estimate
@@ -44,6 +48,10 @@ class EstimatePointSerializer(BaseSerializer):
 
 class EstimateReadSerializer(BaseSerializer):
     points = EstimatePointSerializer(read_only=True, many=True)
+    workspace_detail = WorkspaceLiteSerializer(
+        read_only=True, source="workspace"
+    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = Estimate

apiserver/plane/app/serializers/module.py

@@ -177,8 +177,6 @@ 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)
 
     class Meta:
         model = Module
@@ -201,10 +199,7 @@ class ModuleSerializer(DynamicBaseSerializer):
             "sort_order",
             "external_source",
             "external_id",
-            "logo_props",
             # computed fields
-            "total_estimate_points",
-            "completed_estimate_points",
             "is_favorite",
             "total_issues",
             "cancelled_issues",

apiserver/plane/app/serializers/page.py

@@ -39,7 +39,6 @@ class PageSerializer(BaseSerializer):
             "created_by",
             "updated_by",
             "view_props",
-            "logo_props",
         ]
         read_only_fields = [
             "workspace",
@@ -107,9 +106,7 @@ class PageDetailSerializer(PageSerializer):
     description_html = serializers.CharField()
 
     class Meta(PageSerializer.Meta):
-        fields = PageSerializer.Meta.fields + [
-            "description_html",
-        ]
+        fields = PageSerializer.Meta.fields + ["description_html"]
 
 
 class SubPageSerializer(BaseSerializer):

apiserver/plane/app/serializers/project.py

@@ -13,7 +13,7 @@ from plane.db.models import (
     ProjectMember,
     ProjectMemberInvite,
     ProjectIdentifier,
-    DeployBoard,
+    ProjectDeployBoard,
     ProjectPublicMember,
 )
 
@@ -114,7 +114,7 @@ class ProjectListSerializer(DynamicBaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
-    anchor = serializers.CharField(read_only=True)
+    is_deployed = serializers.BooleanField(read_only=True)
     members = serializers.SerializerMethodField()
 
     def get_members(self, obj):
@@ -148,7 +148,7 @@ class ProjectDetailSerializer(BaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
-    anchor = serializers.CharField(read_only=True)
+    is_deployed = serializers.BooleanField(read_only=True)
 
     class Meta:
         model = Project
@@ -206,14 +206,14 @@ class ProjectMemberLiteSerializer(BaseSerializer):
         read_only_fields = fields
 
 
-class DeployBoardSerializer(BaseSerializer):
+class ProjectDeployBoardSerializer(BaseSerializer):
     project_details = ProjectLiteSerializer(read_only=True, source="project")
     workspace_detail = WorkspaceLiteSerializer(
         read_only=True, source="workspace"
     )
 
     class Meta:
-        model = DeployBoard
+        model = ProjectDeployBoard
         fields = "__all__"
         read_only_fields = [
             "workspace",

apiserver/plane/app/urls/estimate.py

@@ -4,7 +4,6 @@ from django.urls import path
 from plane.app.views import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,
-    EstimatePointEndpoint,
 )
 
 
@@ -35,23 +34,4 @@ urlpatterns = [
         ),
         name="bulk-create-estimate-points",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/",
-        EstimatePointEndpoint.as_view(
-            {
-                "post": "create",
-            }
-        ),
-        name="estimate-points",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/<estimate_point_id>/",
-        EstimatePointEndpoint.as_view(
-            {
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="estimate-points",
-    ),
 ]

apiserver/plane/app/urls/page.py

@@ -6,7 +6,6 @@ from plane.app.views import (
     PageFavoriteViewSet,
     PageLogEndpoint,
     SubPagesEndpoint,
-    PagesDescriptionViewSet,
 )
 
 
@@ -80,14 +79,4 @@ urlpatterns = [
         SubPagesEndpoint.as_view(),
         name="sub-page",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/description/",
-        PagesDescriptionViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-            }
-        ),
-        name="page-description",
-    ),
 ]

apiserver/plane/app/urls/project.py

@@ -2,7 +2,6 @@ from django.urls import path
 
 from plane.app.views import (
     ProjectViewSet,
-    DeployBoardViewSet,
     ProjectInvitationsViewset,
     ProjectMemberViewSet,
     ProjectMemberUserEndpoint,
@@ -13,6 +12,7 @@ from plane.app.views import (
     ProjectFavoritesViewSet,
     UserProjectInvitationsViewset,
     ProjectPublicCoverImagesEndpoint,
+    ProjectDeployBoardViewSet,
     UserProjectRolesEndpoint,
     ProjectArchiveUnarchiveEndpoint,
 )
@@ -157,7 +157,7 @@ urlpatterns = [
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
-        DeployBoardViewSet.as_view(
+        ProjectDeployBoardViewSet.as_view(
             {
                 "get": "list",
                 "post": "create",
@@ -167,7 +167,7 @@ urlpatterns = [
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
-        DeployBoardViewSet.as_view(
+        ProjectDeployBoardViewSet.as_view(
             {
                 "get": "retrieve",
                 "patch": "partial_update",

apiserver/plane/app/views/__init__.py

@@ -4,7 +4,7 @@ from .project.base import (
     ProjectUserViewsEndpoint,
     ProjectFavoritesViewSet,
     ProjectPublicCoverImagesEndpoint,
-    DeployBoardViewSet,
+    ProjectDeployBoardViewSet,
     ProjectArchiveUnarchiveEndpoint,
 )
 
@@ -177,7 +177,6 @@ from .page.base import (
     PageFavoriteViewSet,
     PageLogEndpoint,
     SubPagesEndpoint,
-    PagesDescriptionViewSet,
 )
 
 from .search import GlobalSearchEndpoint, IssueSearchEndpoint
@@ -190,7 +189,6 @@ from .external.base import (
 from .estimate.base import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,
-    EstimatePointEndpoint,
 )
 
 from .inbox.base import InboxViewSet, InboxIssueViewSet

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

@@ -33,7 +33,7 @@ class AnalyticsEndpoint(BaseAPIView):
             "state__group",
             "labels__id",
             "assignees__id",
-            "estimate_point__value",
+            "estimate_point",
             "issue_cycle__cycle_id",
             "issue_module__module_id",
             "priority",
@@ -381,9 +381,9 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
         )
 
         open_estimate_sum = open_issues_queryset.aggregate(
-            sum=Sum("point")
+            sum=Sum("estimate_point")
         )["sum"]
-        total_estimate_sum = base_issues.aggregate(sum=Sum("point"))[
+        total_estimate_sum = base_issues.aggregate(sum=Sum("estimate_point"))[
             "sum"
         ]
 

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

@@ -177,7 +177,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
         )
 
     def get(self, request, slug, project_id, pk=None):
-        plot_type = request.GET.get("plot_type", "issues")
         if pk is None:
             queryset = (
                 self.get_queryset()
@@ -376,7 +375,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     queryset=queryset,
                     slug=slug,
                     project_id=project_id,
-                    plot_type=plot_type,
                     cycle_id=pk,
                 )
 

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

@@ -17,11 +17,8 @@ from django.db.models import (
     UUIDField,
     Value,
     When,
-    Subquery,
-    Sum,
-    IntegerField,
 )
-from django.db.models.functions import Coalesce, Cast
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 from django.core.serializers.json import DjangoJSONEncoder
 
@@ -76,89 +73,6 @@ class CycleViewSet(BaseViewSet):
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
         return self.filter_queryset(
             super()
             .get_queryset()
@@ -283,49 +197,12 @@ class CycleViewSet(BaseViewSet):
                     Value([], output_field=ArrayField(UUIDField())),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
             .order_by("-is_favorite", "name")
             .distinct()
         )
 
     def list(self, request, slug, project_id):
         queryset = self.get_queryset().filter(archived_at__isnull=True)
-        plot_type = request.GET.get("plot_type", "issues")
         cycle_view = request.GET.get("cycle_view", "all")
 
         # Update the order by
@@ -354,14 +231,7 @@ class CycleViewSet(BaseViewSet):
                 "external_source",
                 "external_id",
                 "progress_snapshot",
-                "logo_props",
                 # meta fields
-                "backlog_estimate_points",
-                "unstarted_estimate_points",
-                "started_estimate_points",
-                "cancelled_estimate_points",
-                "completed_estimate_points",
-                "total_estimate_points",
                 "is_favorite",
                 "total_issues",
                 "cancelled_issues",
@@ -464,7 +334,6 @@ class CycleViewSet(BaseViewSet):
                             queryset=queryset.first(),
                             slug=slug,
                             project_id=project_id,
-                            plot_type=plot_type,
                             cycle_id=data[0]["id"],
                         )
                     )
@@ -487,10 +356,7 @@ class CycleViewSet(BaseViewSet):
             "external_source",
             "external_id",
             "progress_snapshot",
-            "logo_props",
             # meta fields
-            "completed_estimate_points",
-            "total_estimate_points",
             "is_favorite",
             "total_issues",
             "cancelled_issues",
@@ -537,7 +403,6 @@ class CycleViewSet(BaseViewSet):
                         "external_source",
                         "external_id",
                         "progress_snapshot",
-                        "logo_props",
                         # meta fields
                         "is_favorite",
                         "cancelled_issues",
@@ -631,7 +496,6 @@ class CycleViewSet(BaseViewSet):
                 "external_source",
                 "external_id",
                 "progress_snapshot",
-                "logo_props",
                 # meta fields
                 "is_favorite",
                 "total_issues",
@@ -659,7 +523,6 @@ class CycleViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def retrieve(self, request, slug, project_id, pk):
-        plot_type = request.GET.get("plot_type", "issues")
         queryset = (
             self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
         )
@@ -693,7 +556,6 @@ class CycleViewSet(BaseViewSet):
                 "external_id",
                 "progress_snapshot",
                 "sub_issues",
-                "logo_props",
                 # meta fields
                 "is_favorite",
                 "total_issues",
@@ -815,7 +677,6 @@ class CycleViewSet(BaseViewSet):
                 queryset=queryset,
                 slug=slug,
                 project_id=project_id,
-                plot_type=plot_type,
                 cycle_id=pk,
             )
 
@@ -932,7 +793,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
 
     def post(self, request, slug, project_id, cycle_id):
         new_cycle_id = request.data.get("new_cycle_id", False)
-        plot_type = request.GET.get("plot_type", "issues")
 
         if not new_cycle_id:
             return Response(
@@ -1014,7 +874,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             queryset=old_cycle.first(),
             slug=slug,
             project_id=project_id,
-            plot_type=plot_type,
             cycle_id=cycle_id,
         )
 

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

@@ -1,6 +1,3 @@
-import random
-import string
-
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
@@ -8,7 +5,7 @@ from rest_framework import status
 # Module imports
 from ..base import BaseViewSet, BaseAPIView
 from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import Project, Estimate, EstimatePoint, Issue
+from plane.db.models import Project, Estimate, EstimatePoint
 from plane.app.serializers import (
     EstimateSerializer,
     EstimatePointSerializer,
@@ -16,12 +13,6 @@ from plane.app.serializers import (
 )
 from plane.utils.cache import invalidate_cache
 
-
-def generate_random_name(length=10):
-    letters = string.ascii_lowercase
-    return "".join(random.choice(letters) for i in range(length))
-
-
 class ProjectEstimatePointEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,
@@ -58,17 +49,13 @@ class BulkEstimatePointEndpoint(BaseViewSet):
         serializer = EstimateReadSerializer(estimates, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    @invalidate_cache(
-        path="/api/workspaces/:slug/estimates/", url_params=True, user=False
-    )
+    @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)
     def create(self, request, slug, project_id):
-        estimate = request.data.get('estimate')
-        estimate_name = estimate.get("name", generate_random_name())
-        estimate_type = estimate.get("type", 'categories')
-        last_used = estimate.get("last_used", False)
-        estimate = Estimate.objects.create(
-            name=estimate_name, project_id=project_id, last_used=last_used, type=estimate_type
-        )
+        if not request.data.get("estimate", False):
+            return Response(
+                {"error": "Estimate is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         estimate_points = request.data.get("estimate_points", [])
 
@@ -80,6 +67,14 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
 
+        estimate_serializer = EstimateSerializer(
+            data=request.data.get("estimate")
+        )
+        if not estimate_serializer.is_valid():
+            return Response(
+                estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
+            )
+        estimate = estimate_serializer.save(project_id=project_id)
         estimate_points = EstimatePoint.objects.bulk_create(
             [
                 EstimatePoint(
@@ -98,8 +93,17 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             ignore_conflicts=True,
         )
 
-        serializer = EstimateReadSerializer(estimate)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        estimate_point_serializer = EstimatePointSerializer(
+            estimate_points, many=True
+        )
+
+        return Response(
+            {
+                "estimate": estimate_serializer.data,
+                "estimate_points": estimate_point_serializer.data,
+            },
+            status=status.HTTP_200_OK,
+        )
 
     def retrieve(self, request, slug, project_id, estimate_id):
         estimate = Estimate.objects.get(
@@ -111,10 +115,13 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    @invalidate_cache(
-        path="/api/workspaces/:slug/estimates/", url_params=True, user=False
-    )
+    @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)
     def partial_update(self, request, slug, project_id, estimate_id):
+        if not request.data.get("estimate", False):
+            return Response(
+                {"error": "Estimate is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         if not len(request.data.get("estimate_points", [])):
             return Response(
@@ -124,10 +131,15 @@ class BulkEstimatePointEndpoint(BaseViewSet):
 
         estimate = Estimate.objects.get(pk=estimate_id)
 
-        if request.data.get("estimate"):
-            estimate.name = request.data.get("estimate").get("name", estimate.name)
-            estimate.type = request.data.get("estimate").get("type", estimate.type)
-            estimate.save()
+        estimate_serializer = EstimateSerializer(
+            estimate, data=request.data.get("estimate"), partial=True
+        )
+        if not estimate_serializer.is_valid():
+            return Response(
+                estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        estimate = estimate_serializer.save()
 
         estimate_points_data = request.data.get("estimate_points", [])
 
@@ -153,113 +165,29 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                 estimate_point.value = estimate_point_data[0].get(
                     "value", estimate_point.value
                 )
-                estimate_point.key = estimate_point_data[0].get(
-                    "key", estimate_point.key
-                )
                 updated_estimate_points.append(estimate_point)
 
         EstimatePoint.objects.bulk_update(
             updated_estimate_points,
-            ["key", "value"],
+            ["value"],
             batch_size=10,
         )
 
-        estimate_serializer = EstimateReadSerializer(estimate)
+        estimate_point_serializer = EstimatePointSerializer(
+            estimate_points, many=True
+        )
         return Response(
-            estimate_serializer.data,
+            {
+                "estimate": estimate_serializer.data,
+                "estimate_points": estimate_point_serializer.data,
+            },
             status=status.HTTP_200_OK,
         )
 
-    @invalidate_cache(
-        path="/api/workspaces/:slug/estimates/", url_params=True, user=False
-    )
+    @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)
     def destroy(self, request, slug, project_id, estimate_id):
         estimate = Estimate.objects.get(
             pk=estimate_id, workspace__slug=slug, project_id=project_id
         )
         estimate.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class EstimatePointEndpoint(BaseViewSet):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def create(self, request, slug, project_id, estimate_id):
-        #  TODO: add a key validation if the same key already exists
-        if not request.data.get("key") or not request.data.get("value"):
-            return Response(
-                {"error": "Key and value are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        key = request.data.get("key", 0)
-        value = request.data.get("value", "")
-        estimate_point = EstimatePoint.objects.create(
-            estimate_id=estimate_id,
-            project_id=project_id,
-            key=key,
-            value=value,
-        )
-        serializer = EstimatePointSerializer(estimate_point).data
-        return Response(serializer, status=status.HTTP_200_OK)
-
-    def partial_update(self, request, slug, project_id, estimate_id, estimate_point_id):
-        #  TODO: add a key validation if the same key already exists
-        estimate_point = EstimatePoint.objects.get(
-            pk=estimate_point_id,
-            estimate_id=estimate_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-        serializer = EstimatePointSerializer(
-            estimate_point, data=request.data, partial=True
-        )
-        if not serializer.is_valid():
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
-        serializer.save()
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def destroy(
-        self, request, slug, project_id, estimate_id, estimate_point_id
-    ):
-        new_estimate_id = request.GET.get("new_estimate_id", None)
-        estimate_points = EstimatePoint.objects.filter(
-            estimate_id=estimate_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-        # update all the issues with the new estimate
-        if new_estimate_id:
-            _ = Issue.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                estimate_id=estimate_point_id,
-            ).update(estimate_id=new_estimate_id)
-
-        # delete the estimate point
-        old_estimate_point = EstimatePoint.objects.filter(
-            pk=estimate_point_id
-        ).first()
-
-        # rearrange the estimate points
-        updated_estimate_points = []
-        for estimate_point in estimate_points:
-            if estimate_point.key > old_estimate_point.key:
-                estimate_point.key -= 1
-                updated_estimate_points.append(estimate_point)
-
-        EstimatePoint.objects.bulk_update(
-            updated_estimate_points,
-            ["key"],
-            batch_size=10,
-        )
-
-        old_estimate_point.delete()
-
-        return Response(
-            EstimatePointSerializer(updated_estimate_points, many=True).data,
-            status=status.HTTP_200_OK,
-        )

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

@@ -165,7 +165,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
         )
 
     def get(self, request, slug, project_id, pk=None):
-        plot_type = request.GET.get("plot_type", "issues")
         if pk is None:
             queryset = self.get_queryset()
             modules = queryset.values(  # Required fields
@@ -324,7 +323,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     queryset=modules,
                     slug=slug,
                     project_id=project_id,
-                    plot_type=plot_type,
                     module_id=pk,
                 )
 

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

@@ -16,9 +16,8 @@ from django.db.models import (
     Subquery,
     UUIDField,
     Value,
-    Sum,
 )
-from django.db.models.functions import Coalesce, Cast
+from django.db.models.functions import Coalesce
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
 
@@ -129,34 +128,6 @@ class ModuleViewSet(BaseViewSet):
             .annotate(cnt=Count("pk"))
             .values("cnt")
         )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", IntegerField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
         return (
             super()
             .get_queryset()
@@ -211,18 +182,6 @@ class ModuleViewSet(BaseViewSet):
                     Value(0, output_field=IntegerField()),
                 )
             )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=IntegerField()),
-                ),
-            )
             .annotate(
                 member_ids=Coalesce(
                     ArrayAgg(
@@ -266,7 +225,6 @@ class ModuleViewSet(BaseViewSet):
                     "sort_order",
                     "external_source",
                     "external_id",
-                    "logo_props",
                     # computed fields
                     "is_favorite",
                     "cancelled_issues",
@@ -274,8 +232,6 @@ class ModuleViewSet(BaseViewSet):
                     "total_issues",
                     "started_issues",
                     "unstarted_issues",
-                    "completed_estimate_points",
-                    "total_estimate_points",
                     "backlog_issues",
                     "created_at",
                     "updated_at",
@@ -325,10 +281,7 @@ class ModuleViewSet(BaseViewSet):
                 "sort_order",
                 "external_source",
                 "external_id",
-                "logo_props",
                 # computed fields
-                "completed_estimate_points",
-                "total_estimate_points",
                 "total_issues",
                 "is_favorite",
                 "cancelled_issues",
@@ -346,7 +299,6 @@ class ModuleViewSet(BaseViewSet):
         return Response(modules, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, pk):
-        plot_type = request.GET.get("plot_type", "burndown")
         queryset = (
             self.get_queryset()
             .filter(archived_at__isnull=True)
@@ -469,7 +421,6 @@ class ModuleViewSet(BaseViewSet):
                 queryset=modules,
                 slug=slug,
                 project_id=project_id,
-                plot_type=plot_type,
                 module_id=pk,
             )
 
@@ -514,10 +465,7 @@ class ModuleViewSet(BaseViewSet):
                 "sort_order",
                 "external_source",
                 "external_id",
-                "logo_props",
                 # computed fields
-                "completed_estimate_points",
-                "total_estimate_points",
                 "is_favorite",
                 "cancelled_issues",
                 "completed_issues",

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

@@ -1,6 +1,5 @@
 # Python imports
 import json
-import base64
 from datetime import datetime
 from django.core.serializers.json import DjangoJSONEncoder
 
@@ -9,7 +8,6 @@ from django.db import connection
 from django.db.models import Exists, OuterRef, Q
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.http import StreamingHttpResponse
 
 # Third party imports
 from rest_framework import status
@@ -390,48 +388,3 @@ class SubPagesEndpoint(BaseAPIView):
         return Response(
             SubPageSerializer(pages, many=True).data, status=status.HTTP_200_OK
         )
-
-
-class PagesDescriptionViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def retrieve(self, request, slug, project_id, pk):
-        page = Page.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
-        )
-        binary_data = page.description_binary
-
-        def stream_data():
-            if binary_data:
-                yield binary_data
-            else:
-                yield b""
-
-        response = StreamingHttpResponse(
-            stream_data(), content_type="application/octet-stream"
-        )
-        response["Content-Disposition"] = (
-            'attachment; filename="page_description.bin"'
-        )
-        return response
-
-    def partial_update(self, request, slug, project_id, pk):
-        page = Page.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
-        )
-
-        base64_data = request.data.get("description_binary")
-
-        if base64_data:
-            # Decode the base64 data to bytes
-            new_binary_data = base64.b64decode(base64_data)
-
-            # Store the updated binary data
-            page.description_binary = new_binary_data
-            page.description_html = request.data.get("description_html")
-            page.save()
-            return Response({"message": "Updated successfully"})
-        else:
-            return Response({"error": "No binary data provided"})

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

@@ -28,7 +28,7 @@ from plane.app.views.base import BaseViewSet, BaseAPIView
 from plane.app.serializers import (
     ProjectSerializer,
     ProjectListSerializer,
-    DeployBoardSerializer,
+    ProjectDeployBoardSerializer,
 )
 
 from plane.app.permissions import (
@@ -46,7 +46,7 @@ from plane.db.models import (
     Module,
     Cycle,
     Inbox,
-    DeployBoard,
+    ProjectDeployBoard,
     IssueProperty,
     Issue,
 )
@@ -137,11 +137,12 @@ class ProjectViewSet(BaseViewSet):
                 ).values("role")
             )
             .annotate(
-                anchor=DeployBoard.objects.filter(
-                    entity_name="project",
-                    entity_identifier=OuterRef("pk"),
-                    workspace__slug=self.kwargs.get("slug"),
-                ).values("anchor")
+                is_deployed=Exists(
+                    ProjectDeployBoard.objects.filter(
+                        project_id=OuterRef("pk"),
+                        workspace__slug=self.kwargs.get("slug"),
+                    )
+                )
             )
             .annotate(sort_order=Subquery(sort_order))
             .prefetch_related(
@@ -638,28 +639,29 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):
         return Response(files, status=status.HTTP_200_OK)
 
 
-class DeployBoardViewSet(BaseViewSet):
+class ProjectDeployBoardViewSet(BaseViewSet):
     permission_classes = [
         ProjectMemberPermission,
     ]
-    serializer_class = DeployBoardSerializer
-    model = DeployBoard
+    serializer_class = ProjectDeployBoardSerializer
+    model = ProjectDeployBoard
 
-    def list(self, request, slug, project_id):
-        project_deploy_board = DeployBoard.objects.filter(
-            entity_name="project",
-            entity_identifier=project_id,
-            workspace__slug=slug,
-        ).first()
-
-        serializer = DeployBoardSerializer(project_deploy_board)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .filter(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
+            )
+            .select_related("project")
+        )
 
     def create(self, request, slug, project_id):
-        comments = request.data.get("is_comments_enabled", False)
-        reactions = request.data.get("is_reactions_enabled", False)
+        comments = request.data.get("comments", False)
+        reactions = request.data.get("reactions", False)
         inbox = request.data.get("inbox", None)
-        votes = request.data.get("is_votes_enabled", False)
+        votes = request.data.get("votes", False)
         views = request.data.get(
             "views",
             {
@@ -671,18 +673,17 @@ class DeployBoardViewSet(BaseViewSet):
             },
         )
 
-        project_deploy_board, _ = DeployBoard.objects.get_or_create(
-            entity_name="project",
-            entity_identifier=project_id,
+        project_deploy_board, _ = ProjectDeployBoard.objects.get_or_create(
+            anchor=f"{slug}/{project_id}",
             project_id=project_id,
         )
+        project_deploy_board.comments = comments
+        project_deploy_board.reactions = reactions
         project_deploy_board.inbox = inbox
-        project_deploy_board.view_props = views
-        project_deploy_board.is_votes_enabled = votes
-        project_deploy_board.is_comments_enabled = comments
-        project_deploy_board.is_reactions_enabled = reactions
+        project_deploy_board.votes = votes
+        project_deploy_board.views = views
 
         project_deploy_board.save()
 
-        serializer = DeployBoardSerializer(project_deploy_board)
+        serializer = ProjectDeployBoardSerializer(project_deploy_board)
         return Response(serializer.data, status=status.HTTP_200_OK)

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

@@ -1,5 +1,5 @@
 # Python imports
-import uuid
+# import uuid
 
 # Django imports
 from django.db.models import Case, Count, IntegerField, Q, When
@@ -183,8 +183,8 @@ class UserEndpoint(BaseViewSet):
         profile.save()
 
         # Reset password
-        user.is_password_autoset = True
-        user.set_password(uuid.uuid4().hex)
+        # user.is_password_autoset = True
+        # user.set_password(uuid.uuid4().hex)
 
         # Deactivate the user
         user.is_active = False

apiserver/plane/authentication/adapter/base.py

@@ -4,8 +4,6 @@ import uuid
 
 # Django imports
 from django.utils import timezone
-from django.core.validators import validate_email
-from django.core.exceptions import ValidationError
 
 # Third party imports
 from zxcvbn import zxcvbn
@@ -48,115 +46,53 @@ class Adapter:
     def authenticate(self):
         raise NotImplementedError
 
-    def sanitize_email(self, email):
-        # Check if email is present
-        if not email:
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["INVALID_EMAIL"],
-                error_message="INVALID_EMAIL",
-                payload={"email": email},
-            )
-
-        # Sanitize email
-        email = str(email).lower().strip()
-
-        # validate email
-        try:
-            validate_email(email)
-        except ValidationError:
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["INVALID_EMAIL"],
-                error_message="INVALID_EMAIL",
-                payload={"email": email},
-            )
-        # Return email
-        return email
-
-    def validate_password(self, email):
-        """Validate password strength"""
-        results = zxcvbn(self.code)
-        if results["score"] < 3:
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["INVALID_PASSWORD"],
-                error_message="INVALID_PASSWORD",
-                payload={"email": email},
-            )
-        return
-
-    def __check_signup(self, email):
-        """Check if sign up is enabled or not and raise exception if not enabled"""
-
-        # Get configuration value
-        (ENABLE_SIGNUP,) = get_configuration_value(
-            [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP", "1"),
-                },
-            ]
-        )
-
-        # Check if sign up is disabled and invite is present or not
-        if (
-            ENABLE_SIGNUP == "0"
-            and not WorkspaceMemberInvite.objects.filter(
-                email=email,
-            ).exists()
-        ):
-            # Raise exception
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["SIGNUP_DISABLED"],
-                error_message="SIGNUP_DISABLED",
-                payload={"email": email},
-            )
-
-        return True
-
-    def save_user_data(self, user):
-        # Update user details
-        user.last_login_medium = self.provider
-        user.last_active = timezone.now()
-        user.last_login_time = timezone.now()
-        user.last_login_ip = self.request.META.get("REMOTE_ADDR")
-        user.last_login_uagent = self.request.META.get("HTTP_USER_AGENT")
-        user.token_updated_at = timezone.now()
-        user.save()
-        return user
-
     def complete_login_or_signup(self):
-        # Get email
         email = self.user_data.get("email")
-
-        # Sanitize email
-        email = self.sanitize_email(email)
-
-        # Check if the user is present
         user = User.objects.filter(email=email).first()
         # Check if sign up case or login
         is_signup = bool(user)
-        # If user is not present, create a new user
         if not user:
             # New user
-            self.__check_signup(email)
-
-            # Initialize user
+            (ENABLE_SIGNUP,) = get_configuration_value(
+                [
+                    {
+                        "key": "ENABLE_SIGNUP",
+                        "default": os.environ.get("ENABLE_SIGNUP", "1"),
+                    },
+                ]
+            )
+            if (
+                ENABLE_SIGNUP == "0"
+                and not WorkspaceMemberInvite.objects.filter(
+                    email=email,
+                ).exists()
+            ):
+                raise AuthenticationException(
+                    error_code=AUTHENTICATION_ERROR_CODES["SIGNUP_DISABLED"],
+                    error_message="SIGNUP_DISABLED",
+                    payload={"email": email},
+                )
             user = User(email=email, username=uuid.uuid4().hex)
 
-            # Check if password is autoset
             if self.user_data.get("user").get("is_password_autoset"):
                 user.set_password(uuid.uuid4().hex)
                 user.is_password_autoset = True
                 user.is_email_verified = True
-
-            # Validate password
             else:
                 # Validate password
-                self.validate_password(email)
-                # Set password
+                results = zxcvbn(self.code)
+                if results["score"] < 3:
+                    raise AuthenticationException(
+                        error_code=AUTHENTICATION_ERROR_CODES[
+                            "INVALID_PASSWORD"
+                        ],
+                        error_message="INVALID_PASSWORD",
+                        payload={"email": email},
+                    )
+
                 user.set_password(self.code)
                 user.is_password_autoset = False
 
-            # Set user details
             avatar = self.user_data.get("user", {}).get("avatar", "")
             first_name = self.user_data.get("user", {}).get("first_name", "")
             last_name = self.user_data.get("user", {}).get("last_name", "")
@@ -164,8 +100,6 @@ class Adapter:
             user.first_name = first_name if first_name else ""
             user.last_name = last_name if last_name else ""
             user.save()
-
-            # Create profile
             Profile.objects.create(user=user)
 
         if not user.is_active:
@@ -174,10 +108,15 @@ class Adapter:
                 error_message="USER_ACCOUNT_DEACTIVATED",
             )
 
-        # Save user data
-        user = self.save_user_data(user=user)
+        # Update user details
+        user.last_login_medium = self.provider
+        user.last_active = timezone.now()
+        user.last_login_time = timezone.now()
+        user.last_login_ip = self.request.META.get("REMOTE_ADDR")
+        user.last_login_uagent = self.request.META.get("HTTP_USER_AGENT")
+        user.token_updated_at = timezone.now()
+        user.save()
 
-        # Call callback if present
         if self.callback:
             self.callback(
                 user,
@@ -185,9 +124,7 @@ class Adapter:
                 self.request,
             )
 
-        # Create or update account if token data is present
         if self.token_data:
             self.create_update_account(user=user)
 
-        # Return user
         return user

apiserver/plane/authentication/adapter/error.py

@@ -17,7 +17,6 @@ AUTHENTICATION_ERROR_CODES = {
     "INVALID_EMAIL_SIGN_UP": 5045,
     "INVALID_EMAIL_MAGIC_SIGN_UP": 5050,
     "MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED": 5055,
-    "EMAIL_PASSWORD_AUTHENTICATION_DISABLED": 5056,
     # Sign In
     "USER_DOES_NOT_EXIST": 5060,
     "AUTHENTICATION_FAILED_SIGN_IN": 5065,
@@ -58,8 +57,6 @@ AUTHENTICATION_ERROR_CODES = {
     "ADMIN_USER_DEACTIVATED": 5190,
     # Rate limit
     "RATE_LIMIT_EXCEEDED": 5900,
-    # Unknown
-    "AUTHENTICATION_FAILED": 5999,
 }
 
 

apiserver/plane/authentication/adapter/oauth.py

@@ -8,10 +8,6 @@ from django.utils import timezone
 from plane.db.models import Account
 
 from .base import Adapter
-from plane.authentication.adapter.error import (
-    AuthenticationException,
-    AUTHENTICATION_ERROR_CODES,
-)
 
 
 class OauthAdapter(Adapter):
@@ -54,42 +50,20 @@ class OauthAdapter(Adapter):
         return self.complete_login_or_signup()
 
     def get_user_token(self, data, headers=None):
-        try:
-            headers = headers or {}
-            response = requests.post(
-                self.get_token_url(), data=data, headers=headers
-            )
-            response.raise_for_status()
-            return response.json()
-        except requests.RequestException:
-            code = (
-                "GOOGLE_OAUTH_PROVIDER_ERROR"
-                if self.provider == "google"
-                else "GITHUB_OAUTH_PROVIDER_ERROR"
-            )
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[code],
-                error_message=str(code),
-            )
+        headers = headers or {}
+        response = requests.post(
+            self.get_token_url(), data=data, headers=headers
+        )
+        response.raise_for_status()
+        return response.json()
 
     def get_user_response(self):
-        try:
-            headers = {
-                "Authorization": f"Bearer {self.token_data.get('access_token')}"
-            }
-            response = requests.get(self.get_user_info_url(), headers=headers)
-            response.raise_for_status()
-            return response.json()
-        except requests.RequestException:
-            if self.provider == "google":
-                code = "GOOGLE_OAUTH_PROVIDER_ERROR"
-            if self.provider == "github":
-                code = "GITHUB_OAUTH_PROVIDER_ERROR"
-
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[code],
-                error_message=str(code),
-            )
+        headers = {
+            "Authorization": f"Bearer {self.token_data.get('access_token')}"
+        }
+        response = requests.get(self.get_user_info_url(), headers=headers)
+        response.raise_for_status()
+        return response.json()
 
     def set_user_data(self, data):
         self.user_data = data

apiserver/plane/authentication/provider/credentials/email.py

@@ -41,10 +41,8 @@ class EmailProvider(CredentialAdapter):
 
         if ENABLE_EMAIL_PASSWORD == "0":
             raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "EMAIL_PASSWORD_AUTHENTICATION_DISABLED"
-                ],
-                error_message="EMAIL_PASSWORD_AUTHENTICATION_DISABLED",
+                error_code=AUTHENTICATION_ERROR_CODES["ENABLE_EMAIL_PASSWORD"],
+                error_message="ENABLE_EMAIL_PASSWORD",
             )
 
     def set_user_data(self):

apiserver/plane/authentication/provider/oauth/github.py

@@ -105,26 +105,14 @@ class GitHubOAuthProvider(OauthAdapter):
         )
 
     def __get_email(self, headers):
-        try:
-            # Github does not provide email in user response
-            emails_url = "https://api.github.com/user/emails"
-            emails_response = requests.get(emails_url, headers=headers).json()
-            email = next(
-                (
-                    email["email"]
-                    for email in emails_response
-                    if email["primary"]
-                ),
-                None,
-            )
-            return email
-        except requests.RequestException:
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "GITHUB_OAUTH_PROVIDER_ERROR"
-                ],
-                error_message="GITHUB_OAUTH_PROVIDER_ERROR",
-            )
+        # Github does not provide email in user response
+        emails_url = "https://api.github.com/user/emails"
+        emails_response = requests.get(emails_url, headers=headers).json()
+        email = next(
+            (email["email"] for email in emails_response if email["primary"]),
+            None,
+        )
+        return email
 
     def set_user_data(self):
         user_info_response = self.get_user_response()

apiserver/plane/authentication/utils/workspace_project_join.py

@@ -4,7 +4,6 @@ from plane.db.models import (
     WorkspaceMember,
     WorkspaceMemberInvite,
 )
-from plane.utils.cache import invalidate_cache_directly
 
 
 def process_workspace_project_invitations(user):
@@ -27,16 +26,6 @@ def process_workspace_project_invitations(user):
         ignore_conflicts=True,
     )
 
-    [
-        invalidate_cache_directly(
-            path=f"/api/workspaces/{str(workspace_member_invite.workspace.slug)}/members/",
-            url_params=False,
-            user=False,
-            multiple=True,
-        )
-        for workspace_member_invite in workspace_member_invites
-    ]
-
     # Check if user has any project invites
     project_member_invites = ProjectMemberInvite.objects.filter(
         email=user.email, accepted=True

apiserver/plane/bgtasks/issue_activites_task.py

@@ -28,7 +28,6 @@ from plane.db.models import (
     Project,
     State,
     User,
-    EstimatePoint,
 )
 from plane.settings.redis import redis_instance
 from plane.utils.exception_logger import log_exception
@@ -449,37 +448,21 @@ def track_estimate_points(
     if current_instance.get("estimate_point") != requested_data.get(
         "estimate_point"
     ):
-        old_estimate = (
-            EstimatePoint.objects.filter(
-                pk=current_instance.get("estimate_point")
-            ).first()
-            if current_instance.get("estimate_point") is not None
-            else None
-        )
-        new_estimate = (
-            EstimatePoint.objects.filter(
-                pk=requested_data.get("estimate_point")
-            ).first()
-            if requested_data.get("estimate_point") is not None
-            else None
-        )
         issue_activities.append(
             IssueActivity(
                 issue_id=issue_id,
                 actor_id=actor_id,
                 verb="updated",
-                old_identifier=(
+                old_value=(
                     current_instance.get("estimate_point")
                     if current_instance.get("estimate_point") is not None
-                    else None
+                    else ""
                 ),
-                new_identifier=(
+                new_value=(
                     requested_data.get("estimate_point")
                     if requested_data.get("estimate_point") is not None
-                    else None
+                    else ""
                 ),
-                old_value=old_estimate.value if old_estimate else None,
-                new_value=new_estimate.value if new_estimate else None,
                 field="estimate_point",
                 project_id=project_id,
                 workspace_id=workspace_id,

apiserver/plane/db/management/commands/activate_user.py

@@ -1,34 +0,0 @@
-# Django imports
-from django.core.management import BaseCommand, CommandError
-
-# Module imports
-from plane.db.models import User
-
-
-class Command(BaseCommand):
-    help = "Make the user with the given email active"
-
-    def add_arguments(self, parser):
-        # Positional argument
-        parser.add_argument("email", type=str, help="user email")
-
-    def handle(self, *args, **options):
-        # get the user email from console
-        email = options.get("email", False)
-
-        # raise error if email is not present
-        if not email:
-            raise CommandError("Error: Email is required")
-
-        # filter the user
-        user = User.objects.filter(email=email).first()
-
-        # Raise error if the user is not present
-        if not user:
-            raise CommandError(f"Error: User with {email} does not exists")
-
-        # Activate the user
-        user.is_active = True
-        user.save()
-
-        self.stdout.write(self.style.SUCCESS("User activated succesfully"))

apiserver/plane/db/migrations/0067_issue_estimate.py

@@ -1,260 +0,0 @@
-# # Generated by Django 4.2.7 on 2024-05-24 09:47
-# Python imports
-import uuid
-from uuid import uuid4
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-import plane.db.models.deploy_board
-
-
-def issue_estimate_point(apps, schema_editor):
-    Issue = apps.get_model("db", "Issue")
-    Project = apps.get_model("db", "Project")
-    EstimatePoint = apps.get_model("db", "EstimatePoint")
-    IssueActivity = apps.get_model("db", "IssueActivity")
-    updated_estimate_point = []
-    updated_issue_activity = []
-
-    # loop through all the projects
-    for project in Project.objects.filter(estimate__isnull=False):
-        estimate_points = EstimatePoint.objects.filter(
-            estimate=project.estimate, project=project
-        )
-
-        for issue_activity in IssueActivity.objects.filter(
-            field="estimate_point", project=project
-        ):
-            if issue_activity.new_value:
-                new_identifier = estimate_points.filter(
-                    key=issue_activity.new_value
-                ).first().id
-                issue_activity.new_identifier = new_identifier
-                new_value = estimate_points.filter(
-                    key=issue_activity.new_value
-                ).first().value
-                issue_activity.new_value = new_value
-                
-            if issue_activity.old_value:
-                old_identifier = estimate_points.filter(
-                    key=issue_activity.old_value
-                ).first().id
-                issue_activity.old_identifier = old_identifier
-                old_value = estimate_points.filter(
-                    key=issue_activity.old_value
-                ).first().value
-                issue_activity.old_value = old_value
-            updated_issue_activity.append(issue_activity)
-
-        for issue in Issue.objects.filter(
-            point__isnull=False, project=project
-        ):
-            # get the estimate id for the corresponding estimate point in the issue
-            estimate = estimate_points.filter(key=issue.point).first()
-            issue.estimate_point = estimate
-            updated_estimate_point.append(issue)
-
-    Issue.objects.bulk_update(
-        updated_estimate_point, ["estimate_point"], batch_size=1000
-    )
-    IssueActivity.objects.bulk_update(
-        updated_issue_activity,
-        ["new_value", "old_value", "new_identifier", "old_identifier"],
-        batch_size=1000,
-    )
-
-
-def last_used_estimate(apps, schema_editor):
-    Project = apps.get_model("db", "Project")
-    Estimate = apps.get_model("db", "Estimate")
-
-    # Get all estimate ids used in projects
-    estimate_ids = Project.objects.filter(estimate__isnull=False).values_list(
-        "estimate", flat=True
-    )
-
-    # Update all matching estimates
-    Estimate.objects.filter(id__in=estimate_ids).update(last_used=True)
-
-
-def populate_deploy_board(apps, schema_editor):
-    DeployBoard = apps.get_model("db", "DeployBoard")
-    ProjectDeployBoard = apps.get_model("db", "ProjectDeployBoard")
-
-    DeployBoard.objects.bulk_create(
-        [
-            DeployBoard(
-                entity_identifier=deploy_board.project_id,
-                project_id=deploy_board.project_id,
-                entity_name="project",
-                anchor=uuid4().hex,
-                is_comments_enabled=deploy_board.comments,
-                is_reactions_enabled=deploy_board.reactions,
-                inbox=deploy_board.inbox,
-                is_votes_enabled=deploy_board.votes,
-                view_props=deploy_board.views,
-                workspace_id=deploy_board.workspace_id,
-                created_at=deploy_board.created_at,
-                updated_at=deploy_board.updated_at,
-                created_by_id=deploy_board.created_by_id,
-                updated_by_id=deploy_board.updated_by_id,
-            )
-            for deploy_board in ProjectDeployBoard.objects.all()
-        ],
-        batch_size=100,
-    )
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0066_account_id_token_cycle_logo_props_module_logo_props"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="DeployBoard",
-            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=[
-                            ("project", "Project"),
-                            ("issue", "Issue"),
-                            ("module", "Module"),
-                            ("cycle", "Task"),
-                            ("page", "Page"),
-                            ("view", "View"),
-                        ],
-                        max_length=30,
-                    ),
-                ),
-                (
-                    "anchor",
-                    models.CharField(
-                        db_index=True,
-                        default=plane.db.models.deploy_board.get_anchor,
-                        max_length=255,
-                        unique=True,
-                    ),
-                ),
-                ("is_comments_enabled", models.BooleanField(default=False)),
-                ("is_reactions_enabled", models.BooleanField(default=False)),
-                ("is_votes_enabled", models.BooleanField(default=False)),
-                ("view_props", models.JSONField(default=dict)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "inbox",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="board_inbox",
-                        to="db.inbox",
-                    ),
-                ),
-                (
-                    "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": "Deploy Board",
-                "verbose_name_plural": "Deploy Boards",
-                "db_table": "deploy_boards",
-                "ordering": ("-created_at",),
-                "unique_together": {("entity_name", "entity_identifier")},
-            },
-        ),
-        migrations.AddField(
-            model_name="estimate",
-            name="last_used",
-            field=models.BooleanField(default=False),
-        ),
-        # Rename the existing field
-        migrations.RenameField(
-            model_name="issue",
-            old_name="estimate_point",
-            new_name="point",
-        ),
-        # Add a new field with the original name as a foreign key
-        migrations.AddField(
-            model_name="issue",
-            name="estimate_point",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="issue_estimates",
-                to="db.EstimatePoint",
-                blank=True,
-                null=True,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="estimate",
-            name="type",
-            field=models.CharField(default="categories", max_length=255),
-        ),
-        migrations.AlterField(
-            model_name="estimatepoint",
-            name="value",
-            field=models.CharField(max_length=255),
-        ),
-        migrations.RunPython(issue_estimate_point),
-        migrations.RunPython(last_used_estimate),
-        migrations.RunPython(populate_deploy_board),
-    ]

apiserver/plane/db/models/__init__.py

@@ -4,7 +4,6 @@ from .asset import FileAsset
 from .base import BaseModel
 from .cycle import Cycle, CycleFavorite, CycleIssue, CycleUserProperties
 from .dashboard import Dashboard, DashboardWidget, Widget
-from .deploy_board import DeployBoard
 from .estimate import Estimate, EstimatePoint
 from .exporter import ExporterHistory
 from .importer import Importer
@@ -54,13 +53,13 @@ from .page import Page, PageFavorite, PageLabel, PageLog
 from .project import (
     Project,
     ProjectBaseModel,
+    ProjectDeployBoard,
     ProjectFavorite,
     ProjectIdentifier,
     ProjectMember,
     ProjectMemberInvite,
     ProjectPublicMember,
 )
-from .deploy_board import DeployBoard
 from .session import Session
 from .social_connection import SocialLoginConnection
 from .state import State

apiserver/plane/db/models/asset.py

@@ -12,7 +12,6 @@ from .base import BaseModel
 
 
 def get_upload_path(instance, filename):
-    filename = filename[:50]
     if instance.workspace_id is not None:
         return f"{instance.workspace.id}/{uuid4().hex}-{filename}"
     return f"user-{uuid4().hex}-{filename}"

apiserver/plane/db/models/deploy_board.py

@@ -1,53 +0,0 @@
-# Python imports
-from uuid import uuid4
-
-# Django imports
-from django.db import models
-
-# Module imports
-from .workspace import WorkspaceBaseModel
-
-
-def get_anchor():
-    return uuid4().hex
-
-
-class DeployBoard(WorkspaceBaseModel):
-    TYPE_CHOICES = (
-        ("project", "Project"),
-        ("issue", "Issue"),
-        ("module", "Module"),
-        ("cycle", "Task"),
-        ("page", "Page"),
-        ("view", "View"),
-    )
-
-    entity_identifier = models.UUIDField(null=True)
-    entity_name = models.CharField(
-        max_length=30,
-        choices=TYPE_CHOICES,
-    )
-    anchor = models.CharField(
-        max_length=255, default=get_anchor, unique=True, db_index=True
-    )
-    is_comments_enabled = models.BooleanField(default=False)
-    is_reactions_enabled = models.BooleanField(default=False)
-    inbox = models.ForeignKey(
-        "db.Inbox",
-        related_name="board_inbox",
-        on_delete=models.SET_NULL,
-        null=True,
-    )
-    is_votes_enabled = models.BooleanField(default=False)
-    view_props = models.JSONField(default=dict)
-
-    def __str__(self):
-        """Return name of the deploy board"""
-        return f"{self.entity_identifier} <{self.entity_name}>"
-
-    class Meta:
-        unique_together = ["entity_name", "entity_identifier"]
-        verbose_name = "Deploy Board"
-        verbose_name_plural = "Deploy Boards"
-        db_table = "deploy_boards"
-        ordering = ("-created_at",)

apiserver/plane/db/models/estimate.py

@@ -11,8 +11,7 @@ class Estimate(ProjectBaseModel):
     description = models.TextField(
         verbose_name="Estimate Description", blank=True
     )
-    type = models.CharField(max_length=255, default="categories")
-    last_used = models.BooleanField(default=False)
+    type = models.CharField(max_length=255, default="Categories")
 
     def __str__(self):
         """Return name of the estimate"""
@@ -36,7 +35,7 @@ class EstimatePoint(ProjectBaseModel):
         default=0, validators=[MinValueValidator(0), MaxValueValidator(12)]
     )
     description = models.TextField(blank=True)
-    value = models.CharField(max_length=255)
+    value = models.CharField(max_length=20)
 
     def __str__(self):
         """Return name of the estimate"""

apiserver/plane/db/models/issue.py

@@ -119,18 +119,11 @@ class Issue(ProjectBaseModel):
         blank=True,
         related_name="state_issue",
     )
-    point = models.IntegerField(
+    estimate_point = models.IntegerField(
         validators=[MinValueValidator(0), MaxValueValidator(12)],
         null=True,
         blank=True,
     )
-    estimate_point = models.ForeignKey(
-        "db.EstimatePoint",
-        on_delete=models.SET_NULL,
-        related_name="issue_estimates",
-        null=True,
-        blank=True,
-    )
     name = models.CharField(max_length=255, verbose_name="Issue Name")
     description = models.JSONField(blank=True, default=dict)
     description_html = models.TextField(blank=True, default="<p></p>")

apiserver/plane/db/models/page.py

@@ -18,7 +18,6 @@ def get_view_props():
 class Page(ProjectBaseModel):
     name = models.CharField(max_length=255, blank=True)
     description = models.JSONField(default=dict, blank=True)
-    description_binary = models.BinaryField(null=True)
     description_html = models.TextField(blank=True, default="<p></p>")
     description_stripped = models.TextField(blank=True, null=True)
     owned_by = models.ForeignKey(
@@ -44,6 +43,7 @@ class Page(ProjectBaseModel):
     is_locked = models.BooleanField(default=False)
     view_props = models.JSONField(default=get_view_props)
     logo_props = models.JSONField(default=dict)
+    description_binary = models.BinaryField(null=True)
 
     class Meta:
         verbose_name = "Page"

apiserver/plane/db/models/project.py

@@ -260,8 +260,6 @@ def get_default_views():
     }
 
 
-# DEPRECATED TODO:
-# used to get the old anchors for the project deploy boards
 class ProjectDeployBoard(ProjectBaseModel):
     anchor = models.CharField(
         max_length=255, default=get_anchor, unique=True, db_index=True

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

@@ -13,9 +13,12 @@ class InstanceSerializer(BaseSerializer):
         model = Instance
         exclude = [
             "license_key",
+            "api_key",
+            "version",
         ]
         read_only_fields = [
             "id",
+            "instance_id",
             "email",
             "last_checked_at",
             "is_setup_done",

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

@@ -148,7 +148,7 @@ class InstanceEndpoint(BaseAPIView):
         data["app_base_url"] = settings.APP_BASE_URL
 
         instance_data = serializer.data
-        instance_data["workspaces_exist"] = Workspace.objects.count() >= 1
+        instance_data["workspaces_exist"] = Workspace.objects.count() > 1
 
         response_data = {"config": data, "instance": instance_data}
         return Response(response_data, status=status.HTTP_200_OK)

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

@@ -49,8 +49,8 @@ class Command(BaseCommand):
                 instance_name="Plane Community Edition",
                 instance_id=secrets.token_hex(12),
                 license_key=None,
-                current_version=payload.get("version"),
-                latest_version=payload.get("version"),
+                api_key=secrets.token_hex(8),
+                version=payload.get("version"),
                 last_checked_at=timezone.now(),
                 user_count=payload.get("user_count", 0),
             )

apiserver/plane/license/migrations/0002_rename_version_instance_current_version_and_more.py

@@ -1,106 +0,0 @@
-# Generated by Django 4.2.11 on 2024-05-31 10:46
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("license", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="instance",
-            name="instance_id",
-            field=models.CharField(max_length=255, unique=True),
-        ),
-        migrations.RenameField(
-            model_name="instance",
-            old_name="version",
-            new_name="current_version",
-        ),
-        migrations.RemoveField(
-            model_name="instance",
-            name="api_key",
-        ),
-        migrations.AddField(
-            model_name="instance",
-            name="domain",
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name="instance",
-            name="latest_version",
-            field=models.CharField(blank=True, max_length=10, null=True),
-        ),
-        migrations.AddField(
-            model_name="instance",
-            name="product",
-            field=models.CharField(default="plane-ce", max_length=50),
-        ),
-        migrations.CreateModel(
-            name="ChangeLog",
-            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,
-                    ),
-                ),
-                ("title", models.CharField(max_length=100)),
-                ("description", models.TextField(blank=True)),
-                ("version", models.CharField(max_length=100)),
-                ("tags", models.JSONField(default=list)),
-                ("release_date", models.DateTimeField(null=True)),
-                ("is_release_candidate", models.BooleanField(default=False)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Change Log",
-                "verbose_name_plural": "Change Logs",
-                "db_table": "changelogs",
-                "ordering": ("-created_at",),
-            },
-        ),
-    ]

apiserver/plane/license/models/instance.py

@@ -1,6 +1,3 @@
-# Python imports
-from enum import Enum
-
 # Django imports
 from django.db import models
 from django.conf import settings
@@ -11,23 +8,15 @@ from plane.db.models import BaseModel
 ROLE_CHOICES = ((20, "Admin"),)
 
 
-class ProductTypes(Enum):
-    PLANE_CE = "plane-ce"
-
-
 class Instance(BaseModel):
-    # General information
+    # General informations
     instance_name = models.CharField(max_length=255)
     whitelist_emails = models.TextField(blank=True, null=True)
-    instance_id = models.CharField(max_length=255, unique=True)
+    instance_id = models.CharField(max_length=25, unique=True)
     license_key = models.CharField(max_length=256, null=True, blank=True)
-    current_version = models.CharField(max_length=10)
-    latest_version = models.CharField(max_length=10, null=True, blank=True)
-    product = models.CharField(
-        max_length=50, default=ProductTypes.PLANE_CE.value
-    )
-    domain = models.TextField(blank=True)
-    # Instance specifics
+    api_key = models.CharField(max_length=16)
+    version = models.CharField(max_length=10)
+    # Instnace specifics
     last_checked_at = models.DateTimeField()
     namespace = models.CharField(max_length=50, blank=True, null=True)
     # telemetry and support
@@ -81,20 +70,3 @@ class InstanceConfiguration(BaseModel):
         verbose_name_plural = "Instance Configurations"
         db_table = "instance_configurations"
         ordering = ("-created_at",)
-
-
-class ChangeLog(BaseModel):
-    """Change Log model to store the release changelogs made in the application."""
-
-    title = models.CharField(max_length=100)
-    description = models.TextField(blank=True)
-    version = models.CharField(max_length=100)
-    tags = models.JSONField(default=list)
-    release_date = models.DateTimeField(null=True)
-    is_release_candidate = models.BooleanField(default=False)
-
-    class Meta:
-        verbose_name = "Change Log"
-        verbose_name_plural = "Change Logs"
-        db_table = "changelogs"
-        ordering = ("-created_at",)

apiserver/plane/settings/common.py

@@ -225,9 +225,6 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 
 # Storage Settings
-# Use Minio settings
-USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
-
 STORAGES = {
     "staticfiles": {
         "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
@@ -246,7 +243,7 @@ AWS_S3_FILE_OVERWRITE = False
 AWS_S3_ENDPOINT_URL = os.environ.get(
     "AWS_S3_ENDPOINT_URL", None
 ) or os.environ.get("MINIO_ENDPOINT_URL", None)
-if AWS_S3_ENDPOINT_URL and USE_MINIO:
+if AWS_S3_ENDPOINT_URL:
     parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost"))
     AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
     AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
@@ -310,6 +307,8 @@ GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)
 ANALYTICS_SECRET_KEY = os.environ.get("ANALYTICS_SECRET_KEY", False)
 ANALYTICS_BASE_API = os.environ.get("ANALYTICS_BASE_API", False)
 
+# Use Minio settings
+USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
 
 # Posthog settings
 POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
@@ -351,4 +350,4 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
 # Base URLs
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
-APP_BASE_URL = os.environ.get("APP_BASE_URL")
+APP_BASE_URL = os.environ.get("APP_BASE_URL") or os.environ.get("WEB_URL")

apiserver/plane/space/urls/inbox.py

@@ -10,7 +10,7 @@ from plane.space.views import (
 
 urlpatterns = [
     path(
-        "anchor/<str:anchor>/inboxes/<uuid:inbox_id>/inbox-issues/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",
         InboxIssuePublicViewSet.as_view(
             {
                 "get": "list",
@@ -20,7 +20,7 @@ urlpatterns = [
         name="inbox-issue",
     ),
     path(
-        "anchor/<str:anchor>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
         InboxIssuePublicViewSet.as_view(
             {
                 "get": "retrieve",
@@ -31,7 +31,7 @@ urlpatterns = [
         name="inbox-issue",
     ),
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/votes/",
         IssueVotePublicViewSet.as_view(
             {
                 "get": "list",

apiserver/plane/space/urls/issue.py

@@ -10,12 +10,12 @@ from plane.space.views import (
 
 urlpatterns = [
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/",
         IssueRetrievePublicEndpoint.as_view(),
         name="workspace-project-boards",
     ),
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/comments/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
         IssueCommentPublicViewSet.as_view(
             {
                 "get": "list",
@@ -25,7 +25,7 @@ urlpatterns = [
         name="issue-comments-project-board",
     ),
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
         IssueCommentPublicViewSet.as_view(
             {
                 "get": "retrieve",
@@ -36,7 +36,7 @@ urlpatterns = [
         name="issue-comments-project-board",
     ),
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/reactions/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/",
         IssueReactionPublicViewSet.as_view(
             {
                 "get": "list",
@@ -46,7 +46,7 @@ urlpatterns = [
         name="issue-reactions-project-board",
     ),
     path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",
         IssueReactionPublicViewSet.as_view(
             {
                 "delete": "destroy",
@@ -55,7 +55,7 @@ urlpatterns = [
         name="issue-reactions-project-board",
     ),
     path(
-        "anchor/<str:anchor>/comments/<uuid:comment_id>/reactions/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/",
         CommentReactionPublicViewSet.as_view(
             {
                 "get": "list",
@@ -65,7 +65,7 @@ urlpatterns = [
         name="comment-reactions-project-board",
     ),
     path(
-        "anchor/<str:anchor>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",
         CommentReactionPublicViewSet.as_view(
             {
                 "delete": "destroy",

apiserver/plane/space/urls/project.py

@@ -4,23 +4,17 @@ from django.urls import path
 from plane.space.views import (
     ProjectDeployBoardPublicSettingsEndpoint,
     ProjectIssuesPublicEndpoint,
-    WorkspaceProjectAnchorEndpoint,
 )
 
 urlpatterns = [
     path(
-        "anchor/<str:anchor>/settings/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/settings/",
         ProjectDeployBoardPublicSettingsEndpoint.as_view(),
         name="project-deploy-board-settings",
     ),
     path(
-        "anchor/<str:anchor>/issues/",
+        "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",
         ProjectIssuesPublicEndpoint.as_view(),
         name="project-deploy-board",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/anchor/",
-        WorkspaceProjectAnchorEndpoint.as_view(),
-        name="project-deploy-board",
-    ),
 ]

apiserver/plane/space/views/__init__.py

@@ -1,7 +1,6 @@
 from .project import (
     ProjectDeployBoardPublicSettingsEndpoint,
     WorkspaceProjectDeployBoardEndpoint,
-    WorkspaceProjectAnchorEndpoint,
 )
 
 from .issue import (

apiserver/plane/space/views/inbox.py

@@ -18,7 +18,7 @@ from plane.db.models import (
     State,
     IssueLink,
     IssueAttachment,
-    DeployBoard,
+    ProjectDeployBoard,
 )
 from plane.app.serializers import (
     IssueSerializer,
@@ -39,7 +39,7 @@ class InboxIssuePublicViewSet(BaseViewSet):
     ]
 
     def get_queryset(self):
-        project_deploy_board = DeployBoard.objects.get(
+        project_deploy_board = ProjectDeployBoard.objects.get(
             workspace__slug=self.kwargs.get("slug"),
             project_id=self.kwargs.get("project_id"),
         )
@@ -58,9 +58,9 @@ class InboxIssuePublicViewSet(BaseViewSet):
             )
         return InboxIssue.objects.none()
 
-    def list(self, request, anchor, inbox_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def list(self, request, slug, project_id, inbox_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
         if project_deploy_board.inbox is None:
             return Response(
@@ -72,8 +72,8 @@ class InboxIssuePublicViewSet(BaseViewSet):
         issues = (
             Issue.objects.filter(
                 issue_inbox__inbox_id=inbox_id,
-                workspace_id=project_deploy_board.workspace_id,
-                project_id=project_deploy_board.project_id,
+                workspace__slug=slug,
+                project_id=project_id,
             )
             .filter(**filters)
             .annotate(bridge_id=F("issue_inbox__id"))
@@ -117,9 +117,9 @@ class InboxIssuePublicViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    def create(self, request, anchor, inbox_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def create(self, request, slug, project_id, inbox_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
         if project_deploy_board.inbox is None:
             return Response(
@@ -151,7 +151,7 @@ class InboxIssuePublicViewSet(BaseViewSet):
             name="Triage",
             group="backlog",
             description="Default state for managing all Inbox Issues",
-            project_id=project_deploy_board.project_id,
+            project_id=project_id,
             color="#ff7700",
         )
 
@@ -163,7 +163,7 @@ class InboxIssuePublicViewSet(BaseViewSet):
                 "description_html", "<p></p>"
             ),
             priority=request.data.get("issue", {}).get("priority", "low"),
-            project_id=project_deploy_board.project_id,
+            project_id=project_id,
             state=state,
         )
 
@@ -173,14 +173,14 @@ class InboxIssuePublicViewSet(BaseViewSet):
             requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
             actor_id=str(request.user.id),
             issue_id=str(issue.id),
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
         )
         # create an inbox issue
         InboxIssue.objects.create(
             inbox_id=inbox_id,
-            project_id=project_deploy_board.project_id,
+            project_id=project_id,
             issue=issue,
             source=request.data.get("source", "in-app"),
         )
@@ -188,9 +188,9 @@ class InboxIssuePublicViewSet(BaseViewSet):
         serializer = IssueStateInboxSerializer(issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def partial_update(self, request, anchor, inbox_id, pk):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def partial_update(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
         if project_deploy_board.inbox is None:
             return Response(
@@ -200,8 +200,8 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
         inbox_issue = InboxIssue.objects.get(
             pk=pk,
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug,
+            project_id=project_id,
             inbox_id=inbox_id,
         )
         # Get the project member
@@ -216,8 +216,8 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
         issue = Issue.objects.get(
             pk=inbox_issue.issue_id,
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug,
+            project_id=project_id,
         )
         # viewers and guests since only viewers and guests
         issue_data = {
@@ -242,7 +242,7 @@ class InboxIssuePublicViewSet(BaseViewSet):
                     requested_data=requested_data,
                     actor_id=str(request.user.id),
                     issue_id=str(issue.id),
-                    project_id=str(project_deploy_board.project_id),
+                    project_id=str(project_id),
                     current_instance=json.dumps(
                         IssueSerializer(current_instance).data,
                         cls=DjangoJSONEncoder,
@@ -255,9 +255,9 @@ class InboxIssuePublicViewSet(BaseViewSet):
             issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST
         )
 
-    def retrieve(self, request, anchor, inbox_id, pk):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def retrieve(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
         if project_deploy_board.inbox is None:
             return Response(
@@ -267,21 +267,21 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
         inbox_issue = InboxIssue.objects.get(
             pk=pk,
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug,
+            project_id=project_id,
             inbox_id=inbox_id,
         )
         issue = Issue.objects.get(
             pk=inbox_issue.issue_id,
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug,
+            project_id=project_id,
         )
         serializer = IssueStateInboxSerializer(issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def destroy(self, request, anchor, inbox_id, pk):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def destroy(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
         if project_deploy_board.inbox is None:
             return Response(
@@ -291,8 +291,8 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
         inbox_issue = InboxIssue.objects.get(
             pk=pk,
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug,
+            project_id=project_id,
             inbox_id=inbox_id,
         )
 

apiserver/plane/space/views/issue.py

@@ -44,7 +44,7 @@ from plane.db.models import (
     ProjectMember,
     IssueReaction,
     CommentReaction,
-    DeployBoard,
+    ProjectDeployBoard,
     IssueVote,
     ProjectPublicMember,
 )
@@ -76,15 +76,15 @@ class IssueCommentPublicViewSet(BaseViewSet):
 
     def get_queryset(self):
         try:
-            project_deploy_board = DeployBoard.objects.get(
-                anchor=self.kwargs.get("anchor"),
-                entity_name="project",
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
             )
-            if project_deploy_board.is_comments_enabled:
+            if project_deploy_board.comments:
                 return self.filter_queryset(
                     super()
                     .get_queryset()
-                    .filter(workspace_id=project_deploy_board.workspace_id)
+                    .filter(workspace__slug=self.kwargs.get("slug"))
                     .filter(issue_id=self.kwargs.get("issue_id"))
                     .filter(access="EXTERNAL")
                     .select_related("project")
@@ -93,8 +93,8 @@ class IssueCommentPublicViewSet(BaseViewSet):
                     .annotate(
                         is_member=Exists(
                             ProjectMember.objects.filter(
-                                workspace_id=project_deploy_board.workspace_id,
-                                project_id=project_deploy_board.project_id,
+                                workspace__slug=self.kwargs.get("slug"),
+                                project_id=self.kwargs.get("project_id"),
                                 member_id=self.request.user.id,
                                 is_active=True,
                             )
@@ -103,15 +103,15 @@ class IssueCommentPublicViewSet(BaseViewSet):
                     .distinct()
                 ).order_by("created_at")
             return IssueComment.objects.none()
-        except DeployBoard.DoesNotExist:
+        except ProjectDeployBoard.DoesNotExist:
             return IssueComment.objects.none()
 
-    def create(self, request, anchor, issue_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def create(self, request, slug, project_id, issue_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_comments_enabled:
+        if not project_deploy_board.comments:
             return Response(
                 {"error": "Comments are not enabled for this project"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -120,7 +120,7 @@ class IssueCommentPublicViewSet(BaseViewSet):
         serializer = IssueCommentSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 issue_id=issue_id,
                 actor=request.user,
                 access="EXTERNAL",
@@ -132,35 +132,37 @@ class IssueCommentPublicViewSet(BaseViewSet):
                 ),
                 actor_id=str(request.user.id),
                 issue_id=str(issue_id),
-                project_id=str(project_deploy_board.project_id),
+                project_id=str(project_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
             if not ProjectMember.objects.filter(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 member=request.user,
                 is_active=True,
             ).exists():
                 # Add the user for workspace tracking
                 _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_deploy_board.project_id,
+                    project_id=project_id,
                     member=request.user,
                 )
 
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def partial_update(self, request, anchor, issue_id, pk):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def partial_update(self, request, slug, project_id, issue_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_comments_enabled:
+        if not project_deploy_board.comments:
             return Response(
                 {"error": "Comments are not enabled for this project"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        comment = IssueComment.objects.get(pk=pk, actor=request.user)
+        comment = IssueComment.objects.get(
+            workspace__slug=slug, pk=pk, actor=request.user
+        )
         serializer = IssueCommentSerializer(
             comment, data=request.data, partial=True
         )
@@ -171,7 +173,7 @@ class IssueCommentPublicViewSet(BaseViewSet):
                 requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
                 actor_id=str(request.user.id),
                 issue_id=str(issue_id),
-                project_id=str(project_deploy_board.project_id),
+                project_id=str(project_id),
                 current_instance=json.dumps(
                     IssueCommentSerializer(comment).data,
                     cls=DjangoJSONEncoder,
@@ -181,18 +183,20 @@ class IssueCommentPublicViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def destroy(self, request, anchor, issue_id, pk):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def destroy(self, request, slug, project_id, issue_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_comments_enabled:
+        if not project_deploy_board.comments:
             return Response(
                 {"error": "Comments are not enabled for this project"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         comment = IssueComment.objects.get(
+            workspace__slug=slug,
             pk=pk,
+            project_id=project_id,
             actor=request.user,
         )
         issue_activity.delay(
@@ -200,7 +204,7 @@ class IssueCommentPublicViewSet(BaseViewSet):
             requested_data=json.dumps({"comment_id": str(pk)}),
             actor_id=str(request.user.id),
             issue_id=str(issue_id),
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(project_id),
             current_instance=json.dumps(
                 IssueCommentSerializer(comment).data,
                 cls=DjangoJSONEncoder,
@@ -217,11 +221,11 @@ class IssueReactionPublicViewSet(BaseViewSet):
 
     def get_queryset(self):
         try:
-            project_deploy_board = DeployBoard.objects.get(
+            project_deploy_board = ProjectDeployBoard.objects.get(
                 workspace__slug=self.kwargs.get("slug"),
                 project_id=self.kwargs.get("project_id"),
             )
-            if project_deploy_board.is_reactions_enabled:
+            if project_deploy_board.reactions:
                 return (
                     super()
                     .get_queryset()
@@ -232,15 +236,15 @@ class IssueReactionPublicViewSet(BaseViewSet):
                     .distinct()
                 )
             return IssueReaction.objects.none()
-        except DeployBoard.DoesNotExist:
+        except ProjectDeployBoard.DoesNotExist:
             return IssueReaction.objects.none()
 
-    def create(self, request, anchor, issue_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def create(self, request, slug, project_id, issue_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_reactions_enabled:
+        if not project_deploy_board.reactions:
             return Response(
                 {"error": "Reactions are not enabled for this project board"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -249,18 +253,16 @@ class IssueReactionPublicViewSet(BaseViewSet):
         serializer = IssueReactionSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
-                project_id=project_deploy_board.project_id,
-                issue_id=issue_id,
-                actor=request.user,
+                project_id=project_id, issue_id=issue_id, actor=request.user
             )
             if not ProjectMember.objects.filter(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 member=request.user,
                 is_active=True,
             ).exists():
                 # Add the user for workspace tracking
                 _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_deploy_board.project_id,
+                    project_id=project_id,
                     member=request.user,
                 )
             issue_activity.delay(
@@ -270,25 +272,25 @@ class IssueReactionPublicViewSet(BaseViewSet):
                 ),
                 actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id", None)),
-                project_id=str(project_deploy_board.project_id),
+                project_id=str(self.kwargs.get("project_id", None)),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def destroy(self, request, anchor, issue_id, reaction_code):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def destroy(self, request, slug, project_id, issue_id, reaction_code):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_reactions_enabled:
+        if not project_deploy_board.reactions:
             return Response(
                 {"error": "Reactions are not enabled for this project board"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         issue_reaction = IssueReaction.objects.get(
-            workspace_id=project_deploy_board.workspace_id,
+            workspace__slug=slug,
             issue_id=issue_id,
             reaction=reaction_code,
             actor=request.user,
@@ -298,7 +300,7 @@ class IssueReactionPublicViewSet(BaseViewSet):
             requested_data=None,
             actor_id=str(self.request.user.id),
             issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(self.kwargs.get("project_id", None)),
             current_instance=json.dumps(
                 {
                     "reaction": str(reaction_code),
@@ -317,29 +319,30 @@ class CommentReactionPublicViewSet(BaseViewSet):
 
     def get_queryset(self):
         try:
-            project_deploy_board = DeployBoard.objects.get(
-                anchor=self.kwargs.get("anchor"), entity_name="project"
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
             )
-            if project_deploy_board.is_reactions_enabled:
+            if project_deploy_board.reactions:
                 return (
                     super()
                     .get_queryset()
-                    .filter(workspace_id=project_deploy_board.workspace_id)
-                    .filter(project_id=project_deploy_board.project_id)
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(project_id=self.kwargs.get("project_id"))
                     .filter(comment_id=self.kwargs.get("comment_id"))
                     .order_by("-created_at")
                     .distinct()
                 )
             return CommentReaction.objects.none()
-        except DeployBoard.DoesNotExist:
+        except ProjectDeployBoard.DoesNotExist:
             return CommentReaction.objects.none()
 
-    def create(self, request, anchor, comment_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def create(self, request, slug, project_id, comment_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
 
-        if not project_deploy_board.is_reactions_enabled:
+        if not project_deploy_board.reactions:
             return Response(
                 {"error": "Reactions are not enabled for this board"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -348,18 +351,18 @@ class CommentReactionPublicViewSet(BaseViewSet):
         serializer = CommentReactionSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 comment_id=comment_id,
                 actor=request.user,
             )
             if not ProjectMember.objects.filter(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 member=request.user,
                 is_active=True,
             ).exists():
                 # Add the user for workspace tracking
                 _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_deploy_board.project_id,
+                    project_id=project_id,
                     member=request.user,
                 )
             issue_activity.delay(
@@ -376,19 +379,19 @@ class CommentReactionPublicViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def destroy(self, request, anchor, comment_id, reaction_code):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def destroy(self, request, slug, project_id, comment_id, reaction_code):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
-        if not project_deploy_board.is_reactions_enabled:
+        if not project_deploy_board.reactions:
             return Response(
                 {"error": "Reactions are not enabled for this board"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
         comment_reaction = CommentReaction.objects.get(
-            project_id=project_deploy_board.project_id,
-            workspace_id=project_deploy_board.workspace_id,
+            project_id=project_id,
+            workspace__slug=slug,
             comment_id=comment_id,
             reaction=reaction_code,
             actor=request.user,
@@ -398,7 +401,7 @@ class CommentReactionPublicViewSet(BaseViewSet):
             requested_data=None,
             actor_id=str(self.request.user.id),
             issue_id=None,
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(self.kwargs.get("project_id", None)),
             current_instance=json.dumps(
                 {
                     "reaction": str(reaction_code),
@@ -418,42 +421,36 @@ class IssueVotePublicViewSet(BaseViewSet):
 
     def get_queryset(self):
         try:
-            project_deploy_board = DeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("anchor"),
-                entity_name="project",
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
             )
-            if project_deploy_board.is_votes_enabled:
+            if project_deploy_board.votes:
                 return (
                     super()
                     .get_queryset()
                     .filter(issue_id=self.kwargs.get("issue_id"))
-                    .filter(workspace_id=project_deploy_board.workspace_id)
-                    .filter(project_id=project_deploy_board.project_id)
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(project_id=self.kwargs.get("project_id"))
                 )
             return IssueVote.objects.none()
-        except DeployBoard.DoesNotExist:
+        except ProjectDeployBoard.DoesNotExist:
             return IssueVote.objects.none()
 
-    def create(self, request, anchor, issue_id):
-        print("hite")
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
-        )
-        print("awer")
+    def create(self, request, slug, project_id, issue_id):
         issue_vote, _ = IssueVote.objects.get_or_create(
             actor_id=request.user.id,
-            project_id=project_deploy_board.project_id,
+            project_id=project_id,
             issue_id=issue_id,
         )
-        print("AWer")
         # Add the user for workspace tracking
         if not ProjectMember.objects.filter(
-            project_id=project_deploy_board.project_id,
+            project_id=project_id,
             member=request.user,
             is_active=True,
         ).exists():
             _ = ProjectPublicMember.objects.get_or_create(
-                project_id=project_deploy_board.project_id,
+                project_id=project_id,
                 member=request.user,
             )
         issue_vote.vote = request.data.get("vote", 1)
@@ -465,29 +462,26 @@ class IssueVotePublicViewSet(BaseViewSet):
             ),
             actor_id=str(self.request.user.id),
             issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(self.kwargs.get("project_id", None)),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
         )
         serializer = IssueVoteSerializer(issue_vote)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    def destroy(self, request, anchor, issue_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
-        )
+    def destroy(self, request, slug, project_id, issue_id):
         issue_vote = IssueVote.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
             issue_id=issue_id,
             actor_id=request.user.id,
-            project_id=project_deploy_board.project_id,
-            workspace_id=project_deploy_board.workspace_id,
         )
         issue_activity.delay(
             type="issue_vote.activity.deleted",
             requested_data=None,
             actor_id=str(self.request.user.id),
             issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(project_deploy_board.project_id),
+            project_id=str(self.kwargs.get("project_id", None)),
             current_instance=json.dumps(
                 {
                     "vote": str(issue_vote.vote),
@@ -505,14 +499,9 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
         AllowAny,
     ]
 
-    def get(self, request, anchor, issue_id):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
-        )
+    def get(self, request, slug, project_id, issue_id):
         issue = Issue.objects.get(
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
-            pk=issue_id,
+            workspace__slug=slug, project_id=project_id, pk=issue_id
         )
         serializer = IssuePublicSerializer(issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -523,17 +512,14 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
         AllowAny,
     ]
 
-    def get(self, request, anchor):
-        if not DeployBoard.objects.filter(
-            anchor=anchor, entity_name="project"
+    def get(self, request, slug, project_id):
+        if not ProjectDeployBoard.objects.filter(
+            workspace__slug=slug, project_id=project_id
         ).exists():
             return Response(
                 {"error": "Project is not published"},
                 status=status.HTTP_404_NOT_FOUND,
             )
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
-        )
 
         filters = issue_filters(request.query_params, "GET")
 
@@ -558,8 +544,8 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .filter(project_id=project_deploy_board.project_id)
-            .filter(workspace_id=project_deploy_board.workspace_id)
+            .filter(project_id=project_id)
+            .filter(workspace__slug=slug)
             .select_related("project", "workspace", "state", "parent")
             .prefetch_related("assignees", "labels")
             .prefetch_related(
@@ -666,8 +652,8 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
         states = (
             State.objects.filter(
                 ~Q(name="Triage"),
-                workspace_id=project_deploy_board.workspace_id,
-                project_id=project_deploy_board.project_id,
+                workspace__slug=slug,
+                project_id=project_id,
             )
             .annotate(
                 custom_order=Case(
@@ -684,8 +670,7 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
         )
 
         labels = Label.objects.filter(
-            workspace_id=project_deploy_board.workspace_id,
-            project_id=project_deploy_board.project_id,
+            workspace__slug=slug, project_id=project_id
         ).values("id", "name", "color", "parent")
 
         ## Grouping the results

apiserver/plane/space/views/project.py

@@ -11,10 +11,10 @@ from rest_framework.permissions import AllowAny
 
 # Module imports
 from .base import BaseAPIView
-from plane.app.serializers import DeployBoardSerializer
+from plane.app.serializers import ProjectDeployBoardSerializer
 from plane.db.models import (
     Project,
-    DeployBoard,
+    ProjectDeployBoard,
 )
 
 
@@ -23,11 +23,11 @@ class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
         AllowAny,
     ]
 
-    def get(self, request, anchor):
-        project_deploy_board = DeployBoard.objects.get(
-            anchor=anchor, entity_name="project"
+    def get(self, request, slug, project_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
         )
-        serializer = DeployBoardSerializer(project_deploy_board)
+        serializer = ProjectDeployBoardSerializer(project_deploy_board)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
 
@@ -36,16 +36,13 @@ class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
         AllowAny,
     ]
 
-    def get(self, request, anchor):
-        deploy_board = DeployBoard.objects.filter(anchor=anchor, entity_name="project").values_list
+    def get(self, request, slug):
         projects = (
-            Project.objects.filter(workspace=deploy_board.workspace)
+            Project.objects.filter(workspace__slug=slug)
             .annotate(
                 is_public=Exists(
-                    DeployBoard.objects.filter(
-                        anchor=anchor,
-                        project_id=OuterRef("pk"),
-                        entity_name="project",
+                    ProjectDeployBoard.objects.filter(
+                        workspace__slug=slug, project_id=OuterRef("pk")
                     )
                 )
             )
@@ -61,16 +58,3 @@ class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
         )
 
         return Response(projects, status=status.HTTP_200_OK)
-
-
-class WorkspaceProjectAnchorEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id):
-        project_deploy_board = DeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        serializer = DeployBoardSerializer(project_deploy_board)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/utils/analytics_plot.py

@@ -4,28 +4,18 @@ from itertools import groupby
 
 # Django import
 from django.db import models
-from django.db.models import (
-    Case,
-    CharField,
-    Count,
-    F,
-    Sum,
-    Value,
-    When,
-    IntegerField,
-)
+from django.db.models import Case, CharField, Count, F, Sum, Value, When
 from django.db.models.functions import (
     Coalesce,
     Concat,
     ExtractMonth,
     ExtractYear,
     TruncDate,
-    Cast,
 )
 from django.utils import timezone
 
 # Module imports
-from plane.db.models import Issue, Project
+from plane.db.models import Issue
 
 
 def annotate_with_monthly_dimension(queryset, field_name, attribute):
@@ -97,9 +87,9 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):
 
     # Estimate
     else:
-        queryset = queryset.annotate(
-            estimate=Sum(Cast("estimate_point__value", IntegerField()))
-        ).order_by(x_axis)
+        queryset = queryset.annotate(estimate=Sum("estimate_point")).order_by(
+            x_axis
+        )
         queryset = (
             queryset.annotate(segment=F(segment)) if segment else queryset
         )
@@ -120,33 +110,9 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):
     return sort_data(grouped_data, temp_axis)
 
 
-def burndown_plot(
-    queryset,
-    slug,
-    project_id,
-    plot_type,
-    cycle_id=None,
-    module_id=None,
-):
+def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
     # Total Issues in Cycle or Module
     total_issues = queryset.total_issues
-    # check whether the estimate is a point or not
-    estimate_type = Project.objects.filter(
-        workspace__slug=slug,
-        pk=project_id,
-        estimate__isnull=False,
-        estimate__type="points",
-    ).exists()
-    if estimate_type and plot_type == "points":
-        issue_estimates = Issue.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_cycle__cycle_id=cycle_id,
-            estimate_point__isnull=False,
-        ).values_list("estimate_point__value", flat=True)
-
-        issue_estimates = [int(value) for value in issue_estimates]
-        total_estimate_points = sum(issue_estimates)
 
     if cycle_id:
         if queryset.end_date and queryset.start_date:
@@ -162,32 +128,18 @@ def burndown_plot(
 
         chart_data = {str(date): 0 for date in date_range}
 
-        if plot_type == "points":
-            completed_issues_estimate_point_distribution = (
-                Issue.issue_objects.filter(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    issue_cycle__cycle_id=cycle_id,
-                    estimate_point__isnull=False,
-                )
-                .annotate(date=TruncDate("completed_at"))
-                .values("date")
-                .values("date", "estimate_point__value")
-                .order_by("date")
-            )
-        else:
-            completed_issues_distribution = (
-                Issue.issue_objects.filter(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    issue_cycle__cycle_id=cycle_id,
-                )
-                .annotate(date=TruncDate("completed_at"))
-                .values("date")
-                .annotate(total_completed=Count("id"))
-                .values("date", "total_completed")
-                .order_by("date")
+        completed_issues_distribution = (
+            Issue.issue_objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                issue_cycle__cycle_id=cycle_id,
             )
+            .annotate(date=TruncDate("completed_at"))
+            .values("date")
+            .annotate(total_completed=Count("id"))
+            .values("date", "total_completed")
+            .order_by("date")
+        )
 
     if module_id:
         # Get all dates between the two dates
@@ -200,59 +152,31 @@ def burndown_plot(
 
         chart_data = {str(date): 0 for date in date_range}
 
-        if plot_type == "points":
-            completed_issues_estimate_point_distribution = (
-                Issue.issue_objects.filter(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    issue_module__module_id=module_id,
-                    estimate_point__isnull=False,
-                )
-                .annotate(date=TruncDate("completed_at"))
-                .values("date")
-                .values("date", "estimate_point__value")
-                .order_by("date")
-            )
-        else:
-            completed_issues_distribution = (
-                Issue.issue_objects.filter(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    issue_module__module_id=module_id,
-                )
-                .annotate(date=TruncDate("completed_at"))
-                .values("date")
-                .annotate(total_completed=Count("id"))
-                .values("date", "total_completed")
-                .order_by("date")
+        completed_issues_distribution = (
+            Issue.issue_objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                issue_module__module_id=module_id,
             )
+            .annotate(date=TruncDate("completed_at"))
+            .values("date")
+            .annotate(total_completed=Count("id"))
+            .values("date", "total_completed")
+            .order_by("date")
+        )
 
     for date in date_range:
-        if plot_type == "points":
-            cumulative_pending_issues = total_estimate_points
-            total_completed = 0
-            total_completed = sum(
-                int(item["estimate_point__value"])
-                for item in completed_issues_estimate_point_distribution
-                if item["date"] is not None and item["date"] <= date
-            )
-            cumulative_pending_issues -= total_completed
-            if date > timezone.now().date():
-                chart_data[str(date)] = None
-            else:
-                chart_data[str(date)] = cumulative_pending_issues
+        cumulative_pending_issues = total_issues
+        total_completed = 0
+        total_completed = sum(
+            item["total_completed"]
+            for item in completed_issues_distribution
+            if item["date"] is not None and item["date"] <= date
+        )
+        cumulative_pending_issues -= total_completed
+        if date > timezone.now().date():
+            chart_data[str(date)] = None
         else:
-            cumulative_pending_issues = total_issues
-            total_completed = 0
-            total_completed = sum(
-                item["total_completed"]
-                for item in completed_issues_distribution
-                if item["date"] is not None and item["date"] <= date
-            )
-            cumulative_pending_issues -= total_completed
-            if date > timezone.now().date():
-                chart_data[str(date)] = None
-            else:
-                chart_data[str(date)] = cumulative_pending_issues
+            chart_data[str(date)] = cumulative_pending_issues
 
     return chart_data

apiserver/plane/utils/cache.py

@@ -66,7 +66,7 @@ def invalidate_cache_directly(
         custom_path = path if path is not None else request.get_full_path()
     auth_header = (
         None
-        if request and request.user.is_anonymous
+        if request.user.is_anonymous
         else str(request.user.id) if user else None
     )
     key = generate_cache_key(custom_path, auth_header)

deploy/selfhost/docker-compose.yml

@@ -128,7 +128,7 @@ services:
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
     pull_policy: ${PULL_POLICY:-always}
-    restart: "no"
+    restart: no
     command: ./bin/docker-entrypoint-migrator.sh
     volumes:
       - logs_migrator:/code/plane/logs

nginx/supervisor.conf

@@ -0,0 +1,32 @@
+[supervisord] ## This is the main process for the Supervisor
+nodaemon=true
+
+[program:node]
+command=sh /usr/local/bin/start.sh
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/node.err.log
+stdout_logfile=/var/log/node.out.log
+
+[program:python]
+directory=/code
+command=sh bin/docker-entrypoint-api.sh
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/python.err.log
+stdout_logfile=/var/log/python.out.log
+
+[program:nginx]
+command=nginx -g "daemon off;"
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/nginx.err.log
+stdout_logfile=/var/log/nginx.out.log
+
+[program:worker]
+directory=/code
+command=sh bin/worker
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/worker.err.log
+stdout_logfile=/var/log/worker.out.log

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.21.0",
+  "version": "0.20.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [

packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/constants",
-  "version": "0.21.0",
+  "version": "0.20.0",
   "private": true,
   "main": "./src/index.ts",
   "exports": {

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.21.0",
+  "version": "0.20.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/core/src/hooks/use-editor.tsx

@@ -13,21 +13,17 @@ import { EditorMenuItemNames, getEditorMenuItems } from "src/ui/menus/menu-items
 import { EditorRefApi } from "src/types/editor-ref-api";
 import { IMarking, scrollSummary } from "src/helpers/scroll-to-node";
 
-export type TFileHandler = {
-  cancel: () => void;
-  delete: DeleteImage;
-  upload: UploadImage;
-  restore: RestoreImage;
-};
-
-export interface CustomEditorProps {
+interface CustomEditorProps {
   id?: string;
-  fileHandler: TFileHandler;
-  initialValue?: string;
+  uploadFile: UploadImage;
+  restoreFile: RestoreImage;
+  deleteFile: DeleteImage;
+  cancelUploadImage?: () => void;
+  initialValue: string;
   editorClassName: string;
   // undefined when prop is not passed, null if intentionally passed to stop
   // swr syncing
-  value?: string | null | undefined;
+  value: string | null | undefined;
   onChange?: (json: object, html: string) => void;
   extensions?: any;
   editorProps?: EditorProps;
@@ -42,16 +38,19 @@ export interface CustomEditorProps {
 }
 
 export const useEditor = ({
+  uploadFile,
   id = "",
+  deleteFile,
+  cancelUploadImage,
   editorProps = {},
   initialValue,
   editorClassName,
   value,
   extensions = [],
-  fileHandler,
   onChange,
   forwardedRef,
   tabIndex,
+  restoreFile,
   handleEditorReady,
   mentionHandler,
   placeholder,
@@ -68,10 +67,10 @@ export const useEditor = ({
           mentionHighlights: mentionHandler.highlights ?? [],
         },
         fileConfig: {
-          uploadFile: fileHandler.upload,
-          deleteFile: fileHandler.delete,
-          restoreFile: fileHandler.restore,
-          cancelUploadImage: fileHandler.cancel,
+          deleteFile,
+          restoreFile,
+          cancelUploadImage,
+          uploadFile,
         },
         placeholder,
         tabIndex,
@@ -112,7 +111,7 @@ export const useEditor = ({
     if (value === null || value === undefined) return;
     if (editor && !editor.isDestroyed && !editor.storage.image.uploadInProgress) {
       try {
-        editor.commands.setContent(value, false, { preserveWhitespace: "full" });
+        editor.commands.setContent(value);
         const currentSavedSelection = savedSelectionRef.current;
         if (currentSavedSelection) {
           const docLength = editor.state.doc.content.size;
@@ -140,14 +139,14 @@ export const useEditor = ({
         }
       },
       executeMenuItemCommand: (itemName: EditorMenuItemNames) => {
-        const editorItems = getEditorMenuItems(editorRef.current, fileHandler.upload);
+        const editorItems = getEditorMenuItems(editorRef.current, uploadFile);
 
         const getEditorMenuItem = (itemName: EditorMenuItemNames) => editorItems.find((item) => item.key === itemName);
 
         const item = getEditorMenuItem(itemName);
         if (item) {
           if (item.key === "image") {
-            item.command(savedSelectionRef.current);
+            item.command(savedSelection);
           } else {
             item.command();
           }
@@ -156,7 +155,7 @@ export const useEditor = ({
         }
       },
       isMenuItemActive: (itemName: EditorMenuItemNames): boolean => {
-        const editorItems = getEditorMenuItems(editorRef.current, fileHandler.upload);
+        const editorItems = getEditorMenuItems(editorRef.current, uploadFile);
 
         const getEditorMenuItem = (itemName: EditorMenuItemNames) => editorItems.find((item) => item.key === itemName);
         const item = getEditorMenuItem(itemName);
@@ -178,15 +177,10 @@ export const useEditor = ({
         const markdownOutput = editorRef.current?.storage.markdown.getMarkdown();
         return markdownOutput;
       },
-      getHTML: (): string => {
-        const htmlOutput = editorRef.current?.getHTML() ?? "<p></p>";
-        return htmlOutput;
-      },
       scrollSummary: (marking: IMarking): void => {
         if (!editorRef.current) return;
         scrollSummary(editorRef.current, marking);
       },
-      isEditorReadyToDiscard: () => editorRef.current?.storage.image.uploadInProgress === false,
       setFocusAtPosition: (position: number) => {
         if (!editorRef.current || editorRef.current.isDestroyed) {
           console.error("Editor reference is not available or has been destroyed.");
@@ -205,7 +199,7 @@ export const useEditor = ({
         }
       },
     }),
-    [editorRef, savedSelection, fileHandler.upload]
+    [editorRef, savedSelection, uploadFile]
   );
 
   if (!editor) {

packages/editor/core/src/hooks/use-read-only-editor.tsx

@@ -68,10 +68,6 @@ export const useReadOnlyEditor = ({
       const markdownOutput = editorRef.current?.storage.markdown.getMarkdown();
       return markdownOutput;
     },
-    getHTML: (): string => {
-      const htmlOutput = editorRef.current?.getHTML() ?? "<p></p>";
-      return htmlOutput;
-    },
     scrollSummary: (marking: IMarking): void => {
       if (!editorRef.current) return;
       scrollSummary(editorRef.current, marking);

packages/editor/core/src/index.ts

@@ -9,7 +9,7 @@ export { isCellSelection } from "src/ui/extensions/table/table/utilities/is-cell
 // utils
 export * from "src/lib/utils";
 export * from "src/ui/extensions/table/table";
-export { startImageUpload } from "src/ui/plugins/image/image-upload-handler";
+export { startImageUpload } from "src/ui/plugins/upload-image";
 
 // components
 export { EditorContainer } from "src/ui/components/editor-container";
@@ -24,7 +24,6 @@ export * from "src/ui/menus/menu-items";
 export * from "src/lib/editor-commands";
 
 // types
-export type { CustomEditorProps, TFileHandler } from "src/hooks/use-editor";
 export type { DeleteImage } from "src/types/delete-image";
 export type { UploadImage } from "src/types/upload-image";
 export type { EditorRefApi, EditorReadOnlyRefApi } from "src/types/editor-ref-api";

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

@@ -1,5 +1,5 @@
 import { Editor, Range } from "@tiptap/core";
-import { startImageUpload } from "src/ui/plugins/image/image-upload-handler";
+import { startImageUpload } from "src/ui/plugins/upload-image";
 import { findTableAncestor } from "src/lib/utils";
 import { Selection } from "@tiptap/pm/state";
 import { UploadImage } from "src/types/upload-image";
@@ -194,7 +194,7 @@ export const insertImageCommand = (
   if (range) editor.chain().focus().deleteRange(range).run();
   const input = document.createElement("input");
   input.type = "file";
-  input.accept = ".jpeg, .jpg, .png, .webp, .svg";
+  input.accept = "image/*";
   input.onchange = async () => {
     if (input.files?.length) {
       const file = input.files[0];

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

@@ -1,7 +1,5 @@
-import { Extensions, generateJSON, getSchema } from "@tiptap/core";
 import { Selection } from "@tiptap/pm/state";
 import { clsx, type ClassValue } from "clsx";
-import { CoreEditorExtensionsWithoutProps } from "src/ui/extensions/core-without-props";
 import { twMerge } from "tailwind-merge";
 interface EditorClassNames {
   noBorder?: boolean;
@@ -60,20 +58,3 @@ export const isValidHttpUrl = (string: string): boolean => {
 
   return url.protocol === "http:" || url.protocol === "https:";
 };
-
-/**
- * @description return an object with contentJSON and editorSchema
- * @description contentJSON- ProseMirror JSON from HTML content
- * @description editorSchema- editor schema from extensions
- * @param {string} html
- * @returns {object} {contentJSON, editorSchema}
- */
-export const generateJSONfromHTML = (html: string) => {
-  const extensions = CoreEditorExtensionsWithoutProps();
-  const contentJSON = generateJSON(html ?? "<p></p>", extensions as Extensions);
-  const editorSchema = getSchema(extensions as Extensions);
-  return {
-    contentJSON,
-    editorSchema,
-  };
-};

packages/editor/core/src/types/editor-ref-api.ts

@@ -3,7 +3,6 @@ import { EditorMenuItemNames } from "src/ui/menus/menu-items";
 
 export type EditorReadOnlyRefApi = {
   getMarkDown: () => string;
-  getHTML: () => string;
   clearEditor: () => void;
   setEditorValue: (content: string) => void;
   scrollSummary: (marking: IMarking) => void;
@@ -15,5 +14,4 @@ export interface EditorRefApi extends EditorReadOnlyRefApi {
   isMenuItemActive: (itemName: EditorMenuItemNames) => boolean;
   onStateChange: (callback: () => void) => () => void;
   setFocusAtPosition: (position: number) => void;
-  isEditorReadyToDiscard: () => boolean;
 }

packages/editor/core/src/ui/extensions/core-without-props.tsx

@@ -1,121 +0,0 @@
-import TaskItem from "@tiptap/extension-task-item";
-import TaskList from "@tiptap/extension-task-list";
-import TextStyle from "@tiptap/extension-text-style";
-import TiptapUnderline from "@tiptap/extension-underline";
-import Placeholder from "@tiptap/extension-placeholder";
-import { Markdown } from "tiptap-markdown";
-
-import { Table } from "src/ui/extensions/table/table";
-import { TableCell } from "src/ui/extensions/table/table-cell/table-cell";
-import { TableHeader } from "src/ui/extensions/table/table-header/table-header";
-import { TableRow } from "src/ui/extensions/table/table-row/table-row";
-
-import { isValidHttpUrl } from "src/lib/utils";
-
-import { CustomCodeBlockExtension } from "src/ui/extensions/code";
-import { CustomKeymap } from "src/ui/extensions/keymap";
-import { CustomQuoteExtension } from "src/ui/extensions/quote";
-
-import { CustomLinkExtension } from "src/ui/extensions/custom-link";
-import { CustomCodeInlineExtension } from "src/ui/extensions/code-inline";
-import { CustomTypographyExtension } from "src/ui/extensions/typography";
-import { CustomHorizontalRule } from "src/ui/extensions/horizontal-rule/horizontal-rule";
-import { CustomCodeMarkPlugin } from "src/ui/extensions/custom-code-inline/inline-code-plugin";
-import { MentionsWithoutProps } from "src/ui/mentions/mention-without-props";
-import { ImageExtensionWithoutProps } from "src/ui/extensions/image/image-extension-without-props";
-
-import StarterKit from "@tiptap/starter-kit";
-
-export const CoreEditorExtensionsWithoutProps = () => [
-  StarterKit.configure({
-    bulletList: {
-      HTMLAttributes: {
-        class: "list-disc pl-7 space-y-2",
-      },
-    },
-    orderedList: {
-      HTMLAttributes: {
-        class: "list-decimal pl-7 space-y-2",
-      },
-    },
-    listItem: {
-      HTMLAttributes: {
-        class: "not-prose space-y-2",
-      },
-    },
-    code: false,
-    codeBlock: false,
-    horizontalRule: false,
-    blockquote: false,
-    dropcursor: {
-      color: "rgba(var(--color-text-100))",
-      width: 1,
-    },
-  }),
-  CustomQuoteExtension,
-  CustomHorizontalRule.configure({
-    HTMLAttributes: {
-      class: "my-4 border-custom-border-400",
-    },
-  }),
-  CustomKeymap,
-  // ListKeymap,
-  CustomLinkExtension.configure({
-    openOnClick: true,
-    autolink: true,
-    linkOnPaste: true,
-    protocols: ["http", "https"],
-    validate: (url: string) => isValidHttpUrl(url),
-    HTMLAttributes: {
-      class:
-        "text-custom-primary-300 underline underline-offset-[3px] hover:text-custom-primary-500 transition-colors cursor-pointer",
-    },
-  }),
-  CustomTypographyExtension,
-  ImageExtensionWithoutProps().configure({
-    HTMLAttributes: {
-      class: "rounded-md",
-    },
-  }),
-  TiptapUnderline,
-  TextStyle,
-  TaskList.configure({
-    HTMLAttributes: {
-      class: "not-prose pl-2 space-y-2",
-    },
-  }),
-  TaskItem.configure({
-    HTMLAttributes: {
-      class: "flex",
-    },
-    nested: true,
-  }),
-  CustomCodeBlockExtension.configure({
-    HTMLAttributes: {
-      class: "",
-    },
-  }),
-  CustomCodeMarkPlugin,
-  CustomCodeInlineExtension,
-  Markdown.configure({
-    html: true,
-    transformPastedText: true,
-  }),
-  Table,
-  TableHeader,
-  TableCell,
-  TableRow,
-  MentionsWithoutProps(),
-  Placeholder.configure({
-    placeholder: ({ editor, node }) => {
-      if (node.type.name === "heading") return `Heading ${node.attrs.level}`;
-
-      const shouldHidePlaceholder =
-        editor.isActive("table") || editor.isActive("codeBlock") || editor.isActive("image");
-      if (shouldHidePlaceholder) return "";
-
-      return "Press '/' for commands...";
-    },
-    includeChildren: true,
-  }),
-];

packages/editor/core/src/ui/extensions/drop.tsx

@@ -1,7 +1,7 @@
 import { Extension } from "@tiptap/core";
 import { Plugin, PluginKey } from "prosemirror-state";
 import { UploadImage } from "src/types/upload-image";
-import { startImageUpload } from "src/ui/plugins/image/image-upload-handler";
+import { startImageUpload } from "../plugins/upload-image";
 
 export const DropHandlerExtension = (uploadFile: UploadImage) =>
   Extension.create({

packages/editor/core/src/ui/extensions/image/image-extension-without-props.tsx

@@ -1,33 +0,0 @@
-import ImageExt from "@tiptap/extension-image";
-import { insertLineBelowImageAction } from "./utilities/insert-line-below-image";
-import { insertLineAboveImageAction } from "./utilities/insert-line-above-image";
-
-export const ImageExtensionWithoutProps = () =>
-  ImageExt.extend({
-    addKeyboardShortcuts() {
-      return {
-        ArrowDown: insertLineBelowImageAction,
-        ArrowUp: insertLineAboveImageAction,
-      };
-    },
-
-    // storage to keep track of image states Map<src, isDeleted>
-    addStorage() {
-      return {
-        images: new Map<string, boolean>(),
-        uploadInProgress: false,
-      };
-    },
-
-    addAttributes() {
-      return {
-        ...this.parent?.(),
-        width: {
-          default: "35%",
-        },
-        height: {
-          default: null,
-        },
-      };
-    },
-  });

packages/editor/core/src/ui/extensions/image/index.tsx

@@ -1,16 +1,25 @@
-import { UploadImagesPlugin } from "src/ui/plugins/image/upload-image";
+import { EditorState, Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
+import { Node as ProseMirrorNode } from "@tiptap/pm/model";
+import { UploadImagesPlugin } from "src/ui/plugins/upload-image";
 import ImageExt from "@tiptap/extension-image";
-import { TrackImageDeletionPlugin } from "src/ui/plugins/image/delete-image";
+import { onNodeDeleted, onNodeRestored } from "src/ui/plugins/delete-image";
 import { DeleteImage } from "src/types/delete-image";
 import { RestoreImage } from "src/types/restore-image";
 import { insertLineBelowImageAction } from "./utilities/insert-line-below-image";
 import { insertLineAboveImageAction } from "./utilities/insert-line-above-image";
-import { TrackImageRestorationPlugin } from "src/ui/plugins/image/restore-image";
-import { IMAGE_NODE_TYPE } from "src/ui/plugins/image/constants";
-import { ImageExtensionStorage } from "src/ui/plugins/image/types/image-node";
 
-export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreImage, cancelUploadImage?: () => void) =>
-  ImageExt.extend<any, ImageExtensionStorage>({
+interface ImageNode extends ProseMirrorNode {
+  attrs: {
+    src: string;
+    id: string;
+  };
+}
+
+const deleteKey = new PluginKey("delete-image");
+const IMAGE_NODE_TYPE = "image";
+
+export const ImageExtension = (deleteImage: DeleteImage, restoreFile: RestoreImage, cancelUploadImage?: () => void) =>
+  ImageExt.extend({
     addKeyboardShortcuts() {
       return {
         ArrowDown: insertLineBelowImageAction,
@@ -20,8 +29,77 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreIm
     addProseMirrorPlugins() {
       return [
         UploadImagesPlugin(this.editor, cancelUploadImage),
-        TrackImageDeletionPlugin(this.editor, deleteImage),
-        TrackImageRestorationPlugin(this.editor, restoreImage),
+        new Plugin({
+          key: deleteKey,
+          appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
+            const newImageSources = new Set<string>();
+            newState.doc.descendants((node) => {
+              if (node.type.name === IMAGE_NODE_TYPE) {
+                newImageSources.add(node.attrs.src);
+              }
+            });
+
+            transactions.forEach((transaction) => {
+              // transaction could be a selection
+              if (!transaction.docChanged) return;
+
+              const removedImages: ImageNode[] = [];
+
+              // iterate through all the nodes in the old state
+              oldState.doc.descendants((oldNode, oldPos) => {
+                // if the node is not an image, then return as no point in checking
+                if (oldNode.type.name !== IMAGE_NODE_TYPE) return;
+
+                // Check if the node has been deleted or replaced
+                if (!newImageSources.has(oldNode.attrs.src)) {
+                  removedImages.push(oldNode as ImageNode);
+                }
+              });
+
+              removedImages.forEach(async (node) => {
+                const src = node.attrs.src;
+                this.storage.images.set(src, true);
+                await onNodeDeleted(src, deleteImage);
+              });
+            });
+
+            return null;
+          },
+        }),
+        new Plugin({
+          key: new PluginKey("imageRestoration"),
+          appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
+            const oldImageSources = new Set<string>();
+            oldState.doc.descendants((node) => {
+              if (node.type.name === IMAGE_NODE_TYPE) {
+                oldImageSources.add(node.attrs.src);
+              }
+            });
+
+            transactions.forEach((transaction) => {
+              if (!transaction.docChanged) return;
+
+              const addedImages: ImageNode[] = [];
+
+              newState.doc.descendants((node, pos) => {
+                if (node.type.name !== IMAGE_NODE_TYPE) return;
+                if (pos < 0 || pos > newState.doc.content.size) return;
+                if (oldImageSources.has(node.attrs.src)) return;
+                addedImages.push(node as ImageNode);
+              });
+
+              addedImages.forEach(async (image) => {
+                const wasDeleted = this.storage.images.get(image.attrs.src);
+                if (wasDeleted === undefined) {
+                  this.storage.images.set(image.attrs.src, false);
+                } else if (wasDeleted === true) {
+                  await onNodeRestored(image.attrs.src, restoreFile);
+                }
+              });
+            });
+            return null;
+          },
+        }),
       ];
     },
 
@@ -35,7 +113,7 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreIm
       imageSources.forEach(async (src) => {
         try {
           const assetUrlWithWorkspaceId = new URL(src).pathname.substring(1);
-          await restoreImage(assetUrlWithWorkspaceId);
+          await restoreFile(assetUrlWithWorkspaceId);
         } catch (error) {
           console.error("Error restoring image: ", error);
         }
@@ -45,7 +123,7 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreIm
     // storage to keep track of image states Map<src, isDeleted>
     addStorage() {
       return {
-        deletedImageSet: new Map<string, boolean>(),
+        images: new Map<string, boolean>(),
         uploadInProgress: false,
       };
     },

packages/editor/core/src/ui/extensions/index.tsx

@@ -141,11 +141,8 @@ export const CoreEditorExtensions = ({
     placeholder: ({ editor, node }) => {
       if (node.type.name === "heading") return `Heading ${node.attrs.level}`;
 
-      if (editor.storage.image.uploadInProgress) return "";
-
       const shouldHidePlaceholder =
         editor.isActive("table") || editor.isActive("codeBlock") || editor.isActive("image");
-
       if (shouldHidePlaceholder) return "";
 
       if (placeholder) {

packages/editor/core/src/ui/mentions/mention-without-props.tsx

@@ -1,79 +0,0 @@
-import { CustomMention } from "./custom";
-import { ReactRenderer } from "@tiptap/react";
-import { Editor } from "@tiptap/core";
-import tippy from "tippy.js";
-
-import { MentionList } from "./mention-list";
-
-export const MentionsWithoutProps = () =>
-  CustomMention.configure({
-    HTMLAttributes: {
-      class: "mention",
-    },
-    // mentionHighlights: mentionHighlights,
-    suggestion: {
-      // @ts-expect-error - Tiptap types are incorrect
-      render: () => {
-        let component: ReactRenderer | null = null;
-        let popup: any | null = null;
-
-        return {
-          onStart: (props: { editor: Editor; clientRect: DOMRect }) => {
-            if (!props.clientRect) {
-              return;
-            }
-            component = new ReactRenderer(MentionList, {
-              props: { ...props },
-              editor: props.editor,
-            });
-            props.editor.storage.mentionsOpen = true;
-            // @ts-expect-error - Tippy types are incorrect
-            popup = tippy("body", {
-              getReferenceClientRect: props.clientRect,
-              appendTo: () => document.querySelector(".active-editor") ?? document.querySelector("#editor-container"),
-              content: component.element,
-              showOnCreate: true,
-              interactive: true,
-              trigger: "manual",
-              placement: "bottom-start",
-            });
-          },
-          onUpdate: (props: { editor: Editor; clientRect: DOMRect }) => {
-            component?.updateProps(props);
-
-            if (!props.clientRect) {
-              return;
-            }
-
-            popup &&
-              popup[0].setProps({
-                getReferenceClientRect: props.clientRect,
-              });
-          },
-
-          onKeyDown: (props: { event: KeyboardEvent }) => {
-            if (props.event.key === "Escape") {
-              popup?.[0].hide();
-
-              return true;
-            }
-
-            const navigationKeys = ["ArrowUp", "ArrowDown", "Enter"];
-
-            if (navigationKeys.includes(props.event.key)) {
-              // @ts-expect-error - Tippy types are incorrect
-              component?.ref?.onKeyDown(props);
-              event?.stopPropagation();
-              return true;
-            }
-            return false;
-          },
-          onExit: (props: { editor: Editor; event: KeyboardEvent }) => {
-            props.editor.storage.mentionsOpen = false;
-            popup?.[0].destroy();
-            component?.destroy();
-          },
-        };
-      },
-    },
-  });

packages/editor/core/src/ui/menus/menu-items/index.tsx

@@ -239,5 +239,8 @@ export function getEditorMenuItems(editor: Editor | null, uploadFile: UploadImag
   ];
 }
 
-export type EditorMenuItemNames =
-  ReturnType<typeof getEditorMenuItems> extends (infer U)[] ? (U extends { key: infer N } ? N : never) : never;
+export type EditorMenuItemNames = ReturnType<typeof getEditorMenuItems> extends (infer U)[]
+  ? U extends { key: infer N }
+    ? N
+    : never
+  : never;