chore: paginated the response

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

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

.github/workflows/build-branch.yml

@@ -36,7 +36,7 @@ env:
 jobs:
   branch_build_setup:
     name: Build Setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     outputs:
       gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
       gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
@@ -160,17 +160,20 @@ jobs:
   branch_build_push_admin:
     if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Admin Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Admin Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
           build-context: .
@@ -183,17 +186,20 @@ jobs:
   branch_build_push_web:
     if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Web Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Web Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
           build-context: .
@@ -206,17 +212,20 @@ jobs:
   branch_build_push_space:
     if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Space Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Space Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
           build-context: .
@@ -229,17 +238,20 @@ jobs:
   branch_build_push_live:
     if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Live Collaboration Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Live Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
           build-context: .
@@ -252,17 +264,20 @@ jobs:
   branch_build_push_apiserver:
     if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push API Server Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Backend Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
           build-context: ./apiserver
@@ -275,17 +290,20 @@ jobs:
   branch_build_push_proxy:
     if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Proxy Docker Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
+      - id: checkout_files
+        name: Checkout Files
+        uses: actions/checkout@v4
       - name: Proxy Build and Push
-        uses: makeplane/actions/build-push@v1.0.0
+        uses: ./.github/actions/build-push-ce
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
           release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
           build-context: ./nginx
@@ -298,7 +316,7 @@ jobs:
   attach_assets_to_build:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Attach Assets to Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
       - name: Checkout
@@ -323,7 +341,7 @@ jobs:
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs:
       [
         branch_build_setup,

README.md

@@ -6,7 +6,6 @@
 </a>
 </p>
 <h1 align="center"><b>Plane</b></h1>
-<p align="center"><b>Open-source project management that unlocks customer value</b></p>
 
 <p align="center">
 <a href="https://discord.com/invite/A92xrEGCge">
@@ -58,7 +57,7 @@ Prefer full control over your data and infrastructure? Install and run Plane on
 | Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://developers.plane.so/self-hosting/methods/docker-compose)         |
 | Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://developers.plane.so/self-hosting/methods/kubernetes) |
 
-`Instance admins` can configure instance settings with [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
+`Instance admins` can manage and customize settings using [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
 
 ## 🌟 Features
 
@@ -118,9 +117,9 @@ Setting up your local environment is simple and straightforward. Follow these st
 
 That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
 
-## ⚙️ Built with
-[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)
-[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)
+## Built with
+[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)<br/>
+[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)<br/>
 [![Node JS](https://img.shields.io/badge/node.js-339933?style=for-the-badge&logo=Node.js&logoColor=white)](https://nodejs.org/en)
 
 ## 📸 Screenshots

admin/.eslintrc.js

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

admin/Dockerfile.admin

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

admin/Dockerfile.dev

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

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

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

admin/app/workspace/create/form.tsx

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

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

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

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

@@ -6,11 +6,12 @@ import { useSearchParams } from "next/navigation";
 import { Eye, EyeOff } from "lucide-react";
 // plane internal packages
 import { API_BASE_URL, E_PASSWORD_STRENGTH } from "@plane/constants";
-import { AuthService } from "@plane/services";
 import { Button, Checkbox, Input, Spinner } from "@plane/ui";
 import { getPasswordStrength } from "@plane/utils";
 // components
 import { Banner, PasswordStrengthMeter } from "@/components/common";
+// services
+import { AuthService } from "@/services/auth.service";
 
 // service initialization
 const authService = new AuthService();

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

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

admin/core/services/api.service.ts

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

admin/core/services/auth.service.ts

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

admin/core/services/instance.service.ts

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

admin/core/services/user.service.ts

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

admin/core/services/workspace.service.ts

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

admin/core/store/instance.store.ts

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

admin/core/store/user.store.ts

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

admin/core/store/workspace.store.ts

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

admin/package.json

@@ -18,12 +18,11 @@
     "@plane/types": "*",
     "@plane/ui": "*",
     "@plane/utils": "*",
-    "@plane/services": "*",
     "@sentry/nextjs": "^8.32.0",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
-    "axios": "^1.7.9",
+    "axios": "^1.7.4",
     "lodash": "^4.17.21",
     "lucide-react": "^0.356.0",
     "mobx": "^6.12.0",
@@ -35,18 +34,19 @@
     "react-dom": "^18.3.1",
     "react-hook-form": "7.51.5",
     "swr": "^2.2.4",
+    "tailwindcss": "3.3.2",
     "uuid": "^9.0.1",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
     "@plane/eslint-config": "*",
-    "@plane/tailwind-config": "*",
     "@plane/typescript-config": "*",
     "@types/node": "18.16.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "@types/uuid": "^9.0.8",
     "@types/zxcvbn": "^4.4.4",
+    "tailwind-config-custom": "*",
     "typescript": "5.3.3"
   }
 }

admin/tailwind.config.js

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

apiserver/plane/api/serializers/cycle.py

@@ -6,7 +6,6 @@ from .base import BaseSerializer
 from plane.db.models import Cycle, CycleIssue
 from plane.utils.timezone_converter import convert_to_utc
 
-
 class CycleSerializer(BaseSerializer):
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)
@@ -31,20 +30,11 @@ class CycleSerializer(BaseSerializer):
             and data.get("end_date", None) is not None
         ):
             project_id = self.initial_data.get("project_id") or self.instance.project_id
-            is_start_date_end_date_equal = (
-                True
-                if str(data.get("start_date")) == str(data.get("end_date"))
-                else False
-            )
             data["start_date"] = convert_to_utc(
-                date=str(data.get("start_date").date()),
-                project_id=project_id,
-                is_start_date=True,
+                str(data.get("start_date").date()), project_id, is_start_date=True
             )
             data["end_date"] = convert_to_utc(
-                date=str(data.get("end_date", None).date()),
-                project_id=project_id,
-                is_start_date_end_date_equal=is_start_date_end_date_equal,
+                str(data.get("end_date", None).date()), project_id
             )
         return data
 

apiserver/plane/api/views/intake.py

@@ -109,6 +109,16 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
             )
 
+        # Create or get state
+        state, _ = State.objects.get_or_create(
+            name="Triage",
+            group="triage",
+            description="Default state for managing all Intake Issues",
+            project_id=project_id,
+            color="#ff7700",
+            is_triage=True,
+        )
+
         # create an issue
         issue = Issue.objects.create(
             name=request.data.get("issue", {}).get("name"),
@@ -118,6 +128,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             ),
             priority=request.data.get("issue", {}).get("priority", "none"),
             project_id=project_id,
+            state=state,
         )
 
         # create an intake issue

apiserver/plane/api/views/issue.py

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

apiserver/plane/api/views/project.py

@@ -258,9 +258,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                 ProjectSerializer(project).data, cls=DjangoJSONEncoder
             )
 
-            intake_view = request.data.get(
-                "inbox_view", request.data.get("intake_view", project.intake_view)
-            )
+            intake_view = request.data.get("inbox_view", project.intake_view)
 
             if project.archived_at:
                 return Response(
@@ -288,6 +286,16 @@ class ProjectAPIEndpoint(BaseAPIView):
                             is_default=True,
                         )
 
+                    # Create the triage state in Backlog group
+                    State.objects.get_or_create(
+                        name="Triage",
+                        group="triage",
+                        description="Default state for managing all Intake Issues",
+                        project_id=pk,
+                        color="#ff7700",
+                        is_triage=True,
+                    )
+
                 project = self.get_queryset().filter(pk=serializer.data["id"]).first()
 
                 model_activity.delay(

apiserver/plane/app/serializers/__init__.py

@@ -19,10 +19,6 @@ from .workspace import (
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
     WorkspaceUserPropertiesSerializer,
-    WorkspaceUserLinkSerializer,
-    WorkspaceRecentVisitSerializer,
-    WorkspaceHomePreferenceSerializer,
-    StickySerializer,
 )
 from .project import (
     ProjectSerializer,
@@ -128,3 +124,5 @@ from .draft import (
     DraftIssueSerializer,
     DraftIssueDetailSerializer,
 )
+
+from .sticky import StickySerializer

apiserver/plane/app/serializers/cycle.py

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

apiserver/plane/app/serializers/dashboard.py

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

apiserver/plane/app/serializers/favorite.py

@@ -53,6 +53,7 @@ def get_entity_model_and_serializer(entity_type):
     }
     return entity_map.get(entity_type, (None, None))
 
+
 class UserFavoriteSerializer(serializers.ModelSerializer):
     entity_data = serializers.SerializerMethodField()
 

apiserver/plane/app/serializers/page.py

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

apiserver/plane/app/serializers/sticky.py

@@ -0,0 +1,16 @@
+# Module imports
+from .base import BaseSerializer
+
+
+from plane.db.models import Sticky
+
+
+class StickySerializer(BaseSerializer):
+    class Meta:
+        model = Sticky
+        fields = "__all__"
+        read_only_fields = ["workspace", "owner"]
+        extra_kwargs = {
+            'name': {'required': False},
+        }
+        

apiserver/plane/app/serializers/webhook.py

@@ -116,7 +116,7 @@ class WebhookSerializer(DynamicBaseSerializer):
     class Meta:
         model = Webhook
         fields = "__all__"
-        read_only_fields = ["workspace", "secret_key", "deleted_at"]
+        read_only_fields = ["workspace", "secret_key"]
 
 
 class WebhookLogSerializer(DynamicBaseSerializer):

apiserver/plane/app/serializers/workspace.py

@@ -1,34 +1,19 @@
 # Third party imports
 from rest_framework import serializers
-from rest_framework import status
-from rest_framework.response import Response
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
 from .user import UserLiteSerializer, UserAdminLiteSerializer
 
-
 from plane.db.models import (
     Workspace,
     WorkspaceMember,
     WorkspaceMemberInvite,
     WorkspaceTheme,
     WorkspaceUserProperties,
-    WorkspaceUserLink,
-    UserRecentVisit,
-    Issue,
-    Page,
-    Project,
-    ProjectMember,
-    WorkspaceHomePreference,
-    Sticky,
 )
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 
-# Django imports
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
-
 
 class WorkSpaceSerializer(DynamicBaseSerializer):
     owner = UserLiteSerializer(read_only=True)
@@ -121,140 +106,3 @@ class WorkspaceUserPropertiesSerializer(BaseSerializer):
         model = WorkspaceUserProperties
         fields = "__all__"
         read_only_fields = ["workspace", "user"]
-
-
-class WorkspaceUserLinkSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserLink
-        fields = "__all__"
-        read_only_fields = ["workspace", "owner"]
-
-    def to_internal_value(self, data):
-        url = data.get("url", "")
-        if url and not url.startswith(("http://", "https://")):
-            data["url"] = "http://" + url
-
-        return super().to_internal_value(data)
-
-    def validate_url(self, value):
-        url_validator = URLValidator()
-        try:
-            url_validator(value)
-        except ValidationError:
-            raise serializers.ValidationError({"error": "Invalid URL format."})
-
-        return value
-
-
-class IssueRecentVisitSerializer(serializers.ModelSerializer):
-    project_identifier = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "name",
-            "state",
-            "priority",
-            "assignees",
-            "type",
-            "sequence_id",
-            "project_id",
-            "project_identifier",
-        ]
-
-    def get_project_identifier(self, obj):
-        project = obj.project
-
-        return project.identifier if project else None
-
-
-class ProjectRecentVisitSerializer(serializers.ModelSerializer):
-    project_members = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Project
-        fields = ["id", "name", "logo_props", "project_members", "identifier"]
-
-    def get_project_members(self, obj):
-        members = ProjectMember.objects.filter(
-            project_id=obj.id, member__is_bot=False, is_active=True
-        ).values_list("member", flat=True)
-
-        return members
-
-
-class PageRecentVisitSerializer(serializers.ModelSerializer):
-    project_id = serializers.SerializerMethodField()
-    project_identifier = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Page
-        fields = [
-            "id",
-            "name",
-            "logo_props",
-            "project_id",
-            "owned_by",
-            "project_identifier",
-        ]
-
-    def get_project_id(self, obj):
-        return (
-            obj.project_id
-            if hasattr(obj, "project_id")
-            else obj.projects.values_list("id", flat=True).first()
-        )
-
-    def get_project_identifier(self, obj):
-        project = obj.projects.first()
-
-        return project.identifier if project else None
-
-
-def get_entity_model_and_serializer(entity_type):
-    entity_map = {
-        "issue": (Issue, IssueRecentVisitSerializer),
-        "page": (Page, PageRecentVisitSerializer),
-        "project": (Project, ProjectRecentVisitSerializer),
-    }
-    return entity_map.get(entity_type, (None, None))
-
-
-class WorkspaceRecentVisitSerializer(BaseSerializer):
-    entity_data = serializers.SerializerMethodField()
-
-    class Meta:
-        model = UserRecentVisit
-        fields = ["id", "entity_name", "entity_identifier", "entity_data", "visited_at"]
-        read_only_fields = ["workspace", "owner", "created_by", "updated_by"]
-
-    def get_entity_data(self, obj):
-        entity_name = obj.entity_name
-        entity_identifier = obj.entity_identifier
-
-        entity_model, entity_serializer = get_entity_model_and_serializer(entity_name)
-
-        if entity_model and entity_serializer:
-            try:
-                entity = entity_model.objects.get(pk=entity_identifier)
-
-                return entity_serializer(entity).data
-            except entity_model.DoesNotExist:
-                return None
-        return None
-
-
-class WorkspaceHomePreferenceSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceHomePreference
-        fields = ["key", "is_enabled", "sort_order"]
-        read_only_fields = ["workspace", "created_by", "updated_by"]
-
-
-class StickySerializer(BaseSerializer):
-    class Meta:
-        model = Sticky
-        fields = "__all__"
-        read_only_fields = ["workspace", "owner"]
-        extra_kwargs = {"name": {"required": False}}

apiserver/plane/app/urls/__init__.py

@@ -13,6 +13,7 @@ from .page import urlpatterns as page_urls
 from .project import urlpatterns as project_urls
 from .search import urlpatterns as search_urls
 from .state import urlpatterns as state_urls
+from .sticky import urlpatterns as sticky_urls
 from .user import urlpatterns as user_urls
 from .views import urlpatterns as view_urls
 from .webhook import urlpatterns as webhook_urls
@@ -34,6 +35,7 @@ urlpatterns = [
     *project_urls,
     *search_urls,
     *state_urls,
+    *sticky_urls,
     *user_urls,
     *view_urls,
     *workspace_urls,

apiserver/plane/app/urls/page.py

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

apiserver/plane/app/urls/search.py

@@ -16,7 +16,7 @@ urlpatterns = [
         name="project-issue-search",
     ),
     path(
-        "workspaces/<str:slug>/entity-search/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/entity-search/",
         SearchEndpoint.as_view(),
         name="entity-search",
     ),

apiserver/plane/app/urls/sticky.py

@@ -0,0 +1,20 @@
+from django.urls import path
+
+
+from plane.app.views import StickyViewSet
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/stickies/",
+        StickyViewSet.as_view({"get": "list", "post": "create"}),
+        name="workspace-sticky",
+    ),
+    path(
+        "workspaces/<str:slug>/stickies/<uuid:pk>/",
+        StickyViewSet.as_view(
+            {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
+        ),
+        name="workspace-sticky",
+    ),
+]

apiserver/plane/app/urls/workspace.py

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

apiserver/plane/app/views/__init__.py

@@ -41,13 +41,10 @@ from .workspace.base import (
 
 from .workspace.draft import WorkspaceDraftIssueViewSet
 
-from .workspace.home import WorkspaceHomePreferenceViewSet
-
 from .workspace.favorite import (
     WorkspaceFavoriteEndpoint,
     WorkspaceFavoriteGroupEndpoint,
 )
-from .workspace.recent_visit import UserRecentVisitViewSet
 
 from .workspace.member import (
     WorkSpaceMemberViewSet,
@@ -60,6 +57,7 @@ from .workspace.invite import (
     WorkspaceJoinEndpoint,
     UserWorkspaceInvitationsViewSet,
 )
+from .workspace.sticky import StickyViewSet
 from .workspace.label import WorkspaceLabelsEndpoint
 from .workspace.state import WorkspaceStatesEndpoint
 from .workspace.user import (
@@ -75,8 +73,6 @@ from .workspace.user import (
 from .workspace.estimate import WorkspaceEstimatesEndpoint
 from .workspace.module import WorkspaceModulesEndpoint
 from .workspace.cycle import WorkspaceCyclesEndpoint
-from .workspace.quick_link import QuickLinkViewSet
-from .workspace.sticky import WorkspaceStickyViewSet
 
 from .state.base import StateViewSet
 from .view.base import (
@@ -160,7 +156,6 @@ from .page.base import (
     PageLogEndpoint,
     SubPagesEndpoint,
     PagesDescriptionViewSet,
-    PageDuplicateEndpoint,
 )
 from .page.version import PageVersionEndpoint
 

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

@@ -54,7 +54,11 @@ from plane.bgtasks.recent_visited_task import recent_visited_task
 # Module imports
 from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.webhook_task import model_activity
-from plane.utils.timezone_converter import convert_to_utc, user_timezone_converter
+from plane.utils.timezone_converter import (
+    convert_utc_to_project_timezone,
+    convert_to_utc,
+    user_timezone_converter,
+)
 
 
 class CycleViewSet(BaseViewSet):
@@ -132,18 +136,6 @@ class CycleViewSet(BaseViewSet):
                     ),
                 )
             )
-            .annotate(
-                pending_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group__in=["backlog", "unstarted", "started"],
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
-                    ),
-                )
-            )
             .annotate(
                 status=Case(
                     When(
@@ -151,7 +143,10 @@ class CycleViewSet(BaseViewSet):
                         & Q(end_date__gte=current_time_in_utc),
                         then=Value("CURRENT"),
                     ),
-                    When(start_date__gt=current_time_in_utc, then=Value("UPCOMING")),
+                    When(
+                        start_date__gt=current_time_in_utc,
+                        then=Value("UPCOMING"),
+                    ),
                     When(end_date__lt=current_time_in_utc, then=Value("COMPLETED")),
                     When(
                         Q(start_date__isnull=True) & Q(end_date__isnull=True),
@@ -226,7 +221,6 @@ class CycleViewSet(BaseViewSet):
                 "is_favorite",
                 "total_issues",
                 "completed_issues",
-                "pending_issues",
                 "assignee_ids",
                 "status",
                 "version",
@@ -258,7 +252,6 @@ class CycleViewSet(BaseViewSet):
             # meta fields
             "is_favorite",
             "total_issues",
-            "pending_issues",
             "completed_issues",
             "assignee_ids",
             "status",
@@ -266,9 +259,7 @@ class CycleViewSet(BaseViewSet):
             "created_by",
         )
         datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(
-            data, datetime_fields, request.user.user_timezone
-        )
+        data = user_timezone_converter(data, datetime_fields, request.user.user_timezone)
         return Response(data, status=status.HTTP_200_OK)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
@@ -280,9 +271,7 @@ class CycleViewSet(BaseViewSet):
             request.data.get("start_date", None) is not None
             and request.data.get("end_date", None) is not None
         ):
-            serializer = CycleWriteSerializer(
-                data=request.data, context={"project_id": project_id}
-            )
+            serializer = CycleWriteSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(project_id=project_id, owned_by=request.user)
                 cycle = (
@@ -317,11 +306,6 @@ class CycleViewSet(BaseViewSet):
                     .first()
                 )
 
-                datetime_fields = ["start_date", "end_date"]
-                cycle = user_timezone_converter(
-                    cycle, datetime_fields, request.user.user_timezone
-                )
-
                 # Send the model activity
                 model_activity.delay(
                     model_name="cycle",
@@ -374,9 +358,7 @@ class CycleViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-        serializer = CycleWriteSerializer(
-            cycle, data=request.data, partial=True, context={"project_id": project_id}
-        )
+        serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             cycle = queryset.values(
@@ -406,11 +388,6 @@ class CycleViewSet(BaseViewSet):
                 "created_by",
             ).first()
 
-            datetime_fields = ["start_date", "end_date"]
-            cycle = user_timezone_converter(
-                cycle, datetime_fields, request.user.user_timezone
-            )
-
             # Send the model activity
             model_activity.delay(
                 model_name="cycle",
@@ -480,9 +457,7 @@ class CycleViewSet(BaseViewSet):
 
         queryset = queryset.first()
         datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(
-            data, datetime_fields, request.user.user_timezone
-        )
+        data = user_timezone_converter(data, datetime_fields, request.user.user_timezone)
 
         recent_visited_task.delay(
             slug=slug,
@@ -558,17 +533,8 @@ class CycleDateCheckEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        is_start_date_end_date_equal = (
-            True if str(start_date) == str(end_date) else False
-        )
-        start_date = convert_to_utc(
-            date=str(start_date), project_id=project_id, is_start_date=True
-        )
-        end_date = convert_to_utc(
-            date=str(end_date),
-            project_id=project_id,
-            is_start_date_end_date_equal=is_start_date_end_date_equal,
-        )
+        start_date = convert_to_utc(str(start_date), project_id, is_start_date=True)
+        end_date = convert_to_utc(str(end_date), project_id)
 
         # Check if any cycle intersects in the given interval
         cycles = Cycle.objects.filter(

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

@@ -32,15 +32,15 @@ from plane.app.serializers import (
     WidgetSerializer,
 )
 from plane.db.models import (
-    DeprecatedDashboard,
-    DeprecatedDashboardWidget,
+    Dashboard,
+    DashboardWidget,
     Issue,
     IssueActivity,
     FileAsset,
     IssueLink,
     IssueRelation,
     Project,
-    DeprecatedWidget,
+    Widget,
     WorkspaceMember,
     CycleIssue,
 )
@@ -53,10 +53,10 @@ from .. import BaseAPIView
 def dashboard_overview_stats(self, request, slug):
     assigned_issues = (
         Issue.issue_objects.filter(
-            (Q(assignees__in=[request.user]) & Q(issue_assignee__deleted_at__isnull=True)),
             project__project_projectmember__is_active=True,
             project__project_projectmember__member=request.user,
             workspace__slug=slug,
+            assignees__in=[request.user],
         )
         .filter(
             Q(
@@ -133,13 +133,10 @@ def dashboard_overview_stats(self, request, slug):
 
     completed_issues_count = (
         Issue.issue_objects.filter(
-            (
-                Q(assignees__in=[request.user])
-                & Q(issue_assignee__deleted_at__isnull=True)
-            ),
             workspace__slug=slug,
             project__project_projectmember__is_active=True,
             project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
             state__group="completed",
         )
         .filter(
@@ -179,13 +176,10 @@ def dashboard_assigned_issues(self, request, slug):
     # get all the assigned issues
     assigned_issues = (
         Issue.issue_objects.filter(
-            (
-                Q(assignees__in=[request.user])
-                & Q(issue_assignee__deleted_at__isnull=True)
-            ),
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
+            assignees__in=[request.user],
         )
         .filter(**filters)
         .select_related("workspace", "project", "state", "parent")
@@ -693,7 +687,7 @@ class DashboardEndpoint(BaseAPIView):
         if not dashboard_id:
             dashboard_type = request.GET.get("dashboard_type", None)
             if dashboard_type == "home":
-                dashboard, created = DeprecatedDashboard.objects.get_or_create(
+                dashboard, created = Dashboard.objects.get_or_create(
                     type_identifier=dashboard_type,
                     owned_by=request.user,
                     is_default=True,
@@ -713,24 +707,24 @@ class DashboardEndpoint(BaseAPIView):
 
                     updated_dashboard_widgets = []
                     for widget_key in widgets_to_fetch:
-                        widget = DeprecatedWidget.objects.filter(
-                            key=widget_key
-                        ).values_list("id", flat=True)
+                        widget = Widget.objects.filter(key=widget_key).values_list(
+                            "id", flat=True
+                        )
                         if widget:
                             updated_dashboard_widgets.append(
-                                DeprecatedDashboardWidget(
+                                DashboardWidget(
                                     widget_id=widget, dashboard_id=dashboard.id
                                 )
                             )
 
-                    DeprecatedDashboardWidget.objects.bulk_create(
+                    DashboardWidget.objects.bulk_create(
                         updated_dashboard_widgets, batch_size=100
                     )
 
                 widgets = (
-                    DeprecatedWidget.objects.annotate(
+                    Widget.objects.annotate(
                         is_visible=Exists(
-                            DeprecatedDashboardWidget.objects.filter(
+                            DashboardWidget.objects.filter(
                                 widget_id=OuterRef("pk"),
                                 dashboard_id=dashboard.id,
                                 is_visible=True,
@@ -739,7 +733,7 @@ class DashboardEndpoint(BaseAPIView):
                     )
                     .annotate(
                         dashboard_filters=Subquery(
-                            DeprecatedDashboardWidget.objects.filter(
+                            DashboardWidget.objects.filter(
                                 widget_id=OuterRef("pk"),
                                 dashboard_id=dashboard.id,
                                 filters__isnull=False,
@@ -798,7 +792,7 @@ class DashboardEndpoint(BaseAPIView):
 
 class WidgetsEndpoint(BaseAPIView):
     def patch(self, request, dashboard_id, widget_id):
-        dashboard_widget = DeprecatedDashboardWidget.objects.filter(
+        dashboard_widget = DashboardWidget.objects.filter(
             widget_id=widget_id, dashboard_id=dashboard_id
         ).first()
         dashboard_widget.is_visible = request.data.get(

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

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

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

@@ -120,12 +120,10 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
 
         # Get the presigned URL
         storage = S3Storage(request=request)
-
         # Generate a presigned URL to share an S3 object
         presigned_url = storage.generate_presigned_post(
             object_name=asset_key, file_type=type, file_size=size_limit
         )
-
         # Return the presigned URL
         return Response(
             {

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

@@ -268,20 +268,27 @@ class IssueRelationViewSet(BaseViewSet):
             )
 
     def remove_relation(self, request, slug, project_id, issue_id):
+        relation_type = request.data.get("relation_type", None)
         related_issue = request.data.get("related_issue", None)
 
-        issue_relations = IssueRelation.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-        ).filter(
-            Q(issue_id=related_issue, related_issue_id=issue_id) |
-            Q(issue_id=issue_id, related_issue_id=related_issue)
-        )
-        issue_relations = issue_relations.first()
+        if relation_type in ["blocking", "start_after", "finish_after"]:
+            issue_relation = IssueRelation.objects.get(
+                workspace__slug=slug,
+                project_id=project_id,
+                issue_id=related_issue,
+                related_issue_id=issue_id,
+            )
+        else:
+            issue_relation = IssueRelation.objects.get(
+                workspace__slug=slug,
+                project_id=project_id,
+                issue_id=issue_id,
+                related_issue_id=related_issue,
+            )
         current_instance = json.dumps(
-            IssueRelationSerializer(issue_relations).data, cls=DjangoJSONEncoder
+            IssueRelationSerializer(issue_relation).data, cls=DjangoJSONEncoder
         )
-        issue_relations.delete()
+        issue_relation.delete()
         issue_activity.delay(
             type="issue_relation.activity.deleted",
             requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),

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

@@ -121,8 +121,6 @@ class PageViewSet(BaseViewSet):
             context={
                 "project_id": project_id,
                 "owned_by_id": request.user.id,
-                "description": request.data.get("description", {}),
-                "description_binary": request.data.get("description_binary", None),
                 "description_html": request.data.get("description_html", "<p></p>"),
             },
         )
@@ -555,51 +553,3 @@ class PagesDescriptionViewSet(BaseViewSet):
             return Response({"message": "Updated successfully"})
         else:
             return Response({"error": "No binary data provided"})
-
-
-class PageDuplicateEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def post(self, request, slug, project_id, page_id):
-        page = Page.objects.filter(
-            pk=page_id, workspace__slug=slug, projects__id=project_id
-        ).first()
-
-        # get all the project ids where page is present
-        project_ids = ProjectPage.objects.filter(page_id=page_id).values_list(
-            "project_id", flat=True
-        )
-
-        page.pk = None
-        page.name = f"{page.name} (Copy)"
-        page.description_binary = None
-        page.owned_by = request.user
-        page.created_by = request.user
-        page.updated_by = request.user
-        page.save()
-
-        for project_id in project_ids:
-            ProjectPage.objects.create(
-                workspace_id=page.workspace_id,
-                project_id=project_id,
-                page_id=page.id,
-                created_by_id=page.created_by_id,
-                updated_by_id=page.updated_by_id,
-            )
-
-        page_transaction.delay(
-            {"description_html": page.description_html}, None, page.id
-        )
-        page = (
-            Page.objects.filter(pk=page.id)
-            .annotate(
-                project_ids=Coalesce(
-                    ArrayAgg(
-                        "projects__id", distinct=True, filter=~Q(projects__id=True)
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-            .first()
-        )
-        serializer = PageDetailSerializer(page)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)

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

@@ -416,6 +416,16 @@ class ProjectViewSet(BaseViewSet):
                             is_default=True,
                         )
 
+                    # Create the triage state in Backlog group
+                    State.objects.get_or_create(
+                        name="Triage",
+                        group="triage",
+                        description="Default state for managing all Intake Issues",
+                        project_id=pk,
+                        color="#ff7700",
+                        is_triage=True,
+                    )
+
                 project = self.get_queryset().filter(pk=serializer.data["id"]).first()
 
                 model_activity.delay(

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

@@ -34,7 +34,6 @@ from plane.db.models import (
     IssueView,
     ProjectMember,
     ProjectPage,
-    WorkspaceMember,
 )
 
 
@@ -253,463 +252,214 @@ class GlobalSearchEndpoint(BaseAPIView):
 
 
 class SearchEndpoint(BaseAPIView):
-    def get(self, request, slug):
+    def get(self, request, slug, project_id):
         query = request.query_params.get("query", False)
         query_types = request.query_params.get("query_type", "user_mention").split(",")
         query_types = [qt.strip() for qt in query_types]
         count = int(request.query_params.get("count", 5))
-        project_id = request.query_params.get("project_id", None)
-        issue_id = request.query_params.get("issue_id", None)
 
         response_data = {}
 
-        if project_id:
-            for query_type in query_types:
-                if query_type == "user_mention":
-                    fields = [
-                        "member__first_name",
-                        "member__last_name",
-                        "member__display_name",
+        for query_type in query_types:
+            if query_type == "user_mention":
+                fields = [
+                    "member__first_name",
+                    "member__last_name",
+                    "member__display_name",
+                ]
+                q = Q()
+
+                if query:
+                    for field in fields:
+                        q |= Q(**{f"{field}__icontains": query})
+                users = (
+                    ProjectMember.objects.filter(
+                        q, is_active=True, project_id=project_id, workspace__slug=slug
+                    )
+                    .annotate(
+                        member__avatar_url=Case(
+                            When(
+                                member__avatar_asset__isnull=False,
+                                then=Concat(
+                                    Value("/api/assets/v2/static/"),
+                                    "member__avatar_asset",
+                                    Value("/"),
+                                ),
+                            ),
+                            When(
+                                member__avatar_asset__isnull=True, then="member__avatar"
+                            ),
+                            default=Value(None),
+                            output_field=models.CharField(),
+                        )
+                    )
+                    .order_by("-created_at")
+                    .values("member__avatar_url", "member__display_name", "member__id")[
+                        :count
                     ]
-                    q = Q()
+                )
+                response_data["user_mention"] = list(users)
 
-                    if query:
-                        for field in fields:
+            elif query_type == "project":
+                fields = ["name", "identifier"]
+                q = Q()
+
+                if query:
+                    for field in fields:
+                        q |= Q(**{f"{field}__icontains": query})
+                projects = (
+                    Project.objects.filter(
+                        q,
+                        Q(project_projectmember__member=self.request.user)
+                        | Q(network=2),
+                        workspace__slug=slug,
+                    )
+                    .order_by("-created_at")
+                    .distinct()
+                    .values(
+                        "name", "id", "identifier", "logo_props", "workspace__slug"
+                    )[:count]
+                )
+                response_data["project"] = list(projects)
+
+            elif query_type == "issue":
+                fields = ["name", "sequence_id", "project__identifier"]
+                q = Q()
+
+                if query:
+                    for field in fields:
+                        if field == "sequence_id":
+                            sequences = re.findall(r"\b\d+\b", query)
+                            for sequence_id in sequences:
+                                q |= Q(**{"sequence_id": sequence_id})
+                        else:
                             q |= Q(**{f"{field}__icontains": query})
 
-                    users = (
-                        ProjectMember.objects.filter(
-                            q,
-                            is_active=True,
-                            workspace__slug=slug,
-                            member__is_bot=False,
-                            project_id=project_id,
-                        )
-                        .annotate(
-                            member__avatar_url=Case(
-                                When(
-                                    member__avatar_asset__isnull=False,
-                                    then=Concat(
-                                        Value("/api/assets/v2/static/"),
-                                        "member__avatar_asset",
-                                        Value("/"),
-                                    ),
-                                ),
-                                When(
-                                    member__avatar_asset__isnull=True,
-                                    then="member__avatar",
-                                ),
-                                default=Value(None),
-                                output_field=CharField(),
-                            )
-                        )
-                        .order_by("-created_at")
+                issues = (
+                    Issue.issue_objects.filter(
+                        q,
+                        project__project_projectmember__member=self.request.user,
+                        project__project_projectmember__is_active=True,
+                        workspace__slug=slug,
+                        project_id=project_id,
                     )
+                    .order_by("-created_at")
+                    .distinct()
+                    .values(
+                        "name",
+                        "id",
+                        "sequence_id",
+                        "project__identifier",
+                        "project_id",
+                        "priority",
+                        "state_id",
+                        "type_id",
+                    )[:count]
+                )
+                response_data["issue"] = list(issues)
 
-                    if issue_id:
-                        issue_created_by = (
-                            Issue.objects.filter(id=issue_id)
-                            .values_list("created_by_id", flat=True)
-                            .first()
-                        )
-                        users = (
-                            users.filter(Q(role__gt=10) | Q(member_id=issue_created_by))
-                            .distinct()
-                            .values(
-                                "member__avatar_url",
-                                "member__display_name",
-                                "member__id",
-                            )
-                        )
-                    else:
-                        users = (
-                            users.filter(Q(role__gt=10))
-                            .distinct()
-                            .values(
-                                "member__avatar_url",
-                                "member__display_name",
-                                "member__id",
-                            )
-                        )
+            elif query_type == "cycle":
+                fields = ["name"]
+                q = Q()
 
-                    response_data["user_mention"] = list(users[:count])
+                if query:
+                    for field in fields:
+                        q |= Q(**{f"{field}__icontains": query})
 
-                elif query_type == "project":
-                    fields = ["name", "identifier"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-                    projects = (
-                        Project.objects.filter(
-                            q,
-                            Q(project_projectmember__member=self.request.user)
-                            | Q(network=2),
-                            workspace__slug=slug,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name", "id", "identifier", "logo_props", "workspace__slug"
-                        )[:count]
+                cycles = (
+                    Cycle.objects.filter(
+                        q,
+                        project__project_projectmember__member=self.request.user,
+                        project__project_projectmember__is_active=True,
+                        workspace__slug=slug,
                     )
-                    response_data["project"] = list(projects)
-
-                elif query_type == "issue":
-                    fields = ["name", "sequence_id", "project__identifier"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            if field == "sequence_id":
-                                sequences = re.findall(r"\b\d+\b", query)
-                                for sequence_id in sequences:
-                                    q |= Q(**{"sequence_id": sequence_id})
-                            else:
-                                q |= Q(**{f"{field}__icontains": query})
-
-                    issues = (
-                        Issue.issue_objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                            project_id=project_id,
+                    .annotate(
+                        status=Case(
+                            When(
+                                Q(start_date__lte=timezone.now())
+                                & Q(end_date__gte=timezone.now()),
+                                then=Value("CURRENT"),
+                            ),
+                            When(start_date__gt=timezone.now(), then=Value("UPCOMING")),
+                            When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
+                            When(
+                                Q(start_date__isnull=True) & Q(end_date__isnull=True),
+                                then=Value("DRAFT"),
+                            ),
+                            default=Value("DRAFT"),
+                            output_field=CharField(),
                         )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "sequence_id",
-                            "project__identifier",
-                            "project_id",
-                            "priority",
-                            "state_id",
-                            "type_id",
-                        )[:count]
                     )
-                    response_data["issue"] = list(issues)
+                    .order_by("-created_at")
+                    .distinct()
+                    .values(
+                        "name",
+                        "id",
+                        "project_id",
+                        "project__identifier",
+                        "status",
+                        "workspace__slug",
+                    )[:count]
+                )
+                response_data["cycle"] = list(cycles)
 
-                elif query_type == "cycle":
-                    fields = ["name"]
-                    q = Q()
+            elif query_type == "module":
+                fields = ["name"]
+                q = Q()
 
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
+                if query:
+                    for field in fields:
+                        q |= Q(**{f"{field}__icontains": query})
 
-                    cycles = (
-                        Cycle.objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                            project_id=project_id,
-                        )
-                        .annotate(
-                            status=Case(
-                                When(
-                                    Q(start_date__lte=timezone.now())
-                                    & Q(end_date__gte=timezone.now()),
-                                    then=Value("CURRENT"),
-                                ),
-                                When(
-                                    start_date__gt=timezone.now(),
-                                    then=Value("UPCOMING"),
-                                ),
-                                When(
-                                    end_date__lt=timezone.now(), then=Value("COMPLETED")
-                                ),
-                                When(
-                                    Q(start_date__isnull=True)
-                                    & Q(end_date__isnull=True),
-                                    then=Value("DRAFT"),
-                                ),
-                                default=Value("DRAFT"),
-                                output_field=CharField(),
-                            )
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "project_id",
-                            "project__identifier",
-                            "status",
-                            "workspace__slug",
-                        )[:count]
+                modules = (
+                    Module.objects.filter(
+                        q,
+                        project__project_projectmember__member=self.request.user,
+                        project__project_projectmember__is_active=True,
+                        workspace__slug=slug,
                     )
-                    response_data["cycle"] = list(cycles)
+                    .order_by("-created_at")
+                    .distinct()
+                    .values(
+                        "name",
+                        "id",
+                        "project_id",
+                        "project__identifier",
+                        "status",
+                        "workspace__slug",
+                    )[:count]
+                )
+                response_data["module"] = list(modules)
 
-                elif query_type == "module":
-                    fields = ["name"]
-                    q = Q()
+            elif query_type == "page":
+                fields = ["name"]
+                q = Q()
 
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
+                if query:
+                    for field in fields:
+                        q |= Q(**{f"{field}__icontains": query})
 
-                    modules = (
-                        Module.objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                            project_id=project_id,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "project_id",
-                            "project__identifier",
-                            "status",
-                            "workspace__slug",
-                        )[:count]
+                pages = (
+                    Page.objects.filter(
+                        q,
+                        projects__project_projectmember__member=self.request.user,
+                        projects__project_projectmember__is_active=True,
+                        projects__id=project_id,
+                        workspace__slug=slug,
+                        access=0,
                     )
-                    response_data["module"] = list(modules)
+                    .order_by("-created_at")
+                    .distinct()
+                    .values(
+                        "name", "id", "logo_props", "projects__id", "workspace__slug"
+                    )[:count]
+                )
+                response_data["page"] = list(pages)
 
-                elif query_type == "page":
-                    fields = ["name"]
-                    q = Q()
+            else:
+                return Response(
+                    {"error": f"Invalid query type: {query_type}"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
 
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-
-                    pages = (
-                        Page.objects.filter(
-                            q,
-                            projects__project_projectmember__member=self.request.user,
-                            projects__project_projectmember__is_active=True,
-                            projects__id=project_id,
-                            workspace__slug=slug,
-                            access=0,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "logo_props",
-                            "projects__id",
-                            "workspace__slug",
-                        )[:count]
-                    )
-                    response_data["page"] = list(pages)
-            return Response(response_data, status=status.HTTP_200_OK)
-
-        else:
-            for query_type in query_types:
-                if query_type == "user_mention":
-                    fields = [
-                        "member__first_name",
-                        "member__last_name",
-                        "member__display_name",
-                    ]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-                    users = (
-                        WorkspaceMember.objects.filter(
-                            q,
-                            is_active=True,
-                            workspace__slug=slug,
-                            member__is_bot=False,
-                        )
-                        .annotate(
-                            member__avatar_url=Case(
-                                When(
-                                    member__avatar_asset__isnull=False,
-                                    then=Concat(
-                                        Value("/api/assets/v2/static/"),
-                                        "member__avatar_asset",
-                                        Value("/"),
-                                    ),
-                                ),
-                                When(
-                                    member__avatar_asset__isnull=True,
-                                    then="member__avatar",
-                                ),
-                                default=Value(None),
-                                output_field=models.CharField(),
-                            )
-                        )
-                        .order_by("-created_at")
-                        .values(
-                            "member__avatar_url", "member__display_name", "member__id"
-                        )[:count]
-                    )
-                    response_data["user_mention"] = list(users)
-
-                elif query_type == "project":
-                    fields = ["name", "identifier"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-                    projects = (
-                        Project.objects.filter(
-                            q,
-                            Q(project_projectmember__member=self.request.user)
-                            | Q(network=2),
-                            workspace__slug=slug,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name", "id", "identifier", "logo_props", "workspace__slug"
-                        )[:count]
-                    )
-                    response_data["project"] = list(projects)
-
-                elif query_type == "issue":
-                    fields = ["name", "sequence_id", "project__identifier"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            if field == "sequence_id":
-                                sequences = re.findall(r"\b\d+\b", query)
-                                for sequence_id in sequences:
-                                    q |= Q(**{"sequence_id": sequence_id})
-                            else:
-                                q |= Q(**{f"{field}__icontains": query})
-
-                    issues = (
-                        Issue.issue_objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "sequence_id",
-                            "project__identifier",
-                            "project_id",
-                            "priority",
-                            "state_id",
-                            "type_id",
-                        )[:count]
-                    )
-                    response_data["issue"] = list(issues)
-
-                elif query_type == "cycle":
-                    fields = ["name"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-
-                    cycles = (
-                        Cycle.objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                        )
-                        .annotate(
-                            status=Case(
-                                When(
-                                    Q(start_date__lte=timezone.now())
-                                    & Q(end_date__gte=timezone.now()),
-                                    then=Value("CURRENT"),
-                                ),
-                                When(
-                                    start_date__gt=timezone.now(),
-                                    then=Value("UPCOMING"),
-                                ),
-                                When(
-                                    end_date__lt=timezone.now(), then=Value("COMPLETED")
-                                ),
-                                When(
-                                    Q(start_date__isnull=True)
-                                    & Q(end_date__isnull=True),
-                                    then=Value("DRAFT"),
-                                ),
-                                default=Value("DRAFT"),
-                                output_field=CharField(),
-                            )
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "project_id",
-                            "project__identifier",
-                            "status",
-                            "workspace__slug",
-                        )[:count]
-                    )
-                    response_data["cycle"] = list(cycles)
-
-                elif query_type == "module":
-                    fields = ["name"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-
-                    modules = (
-                        Module.objects.filter(
-                            q,
-                            project__project_projectmember__member=self.request.user,
-                            project__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "project_id",
-                            "project__identifier",
-                            "status",
-                            "workspace__slug",
-                        )[:count]
-                    )
-                    response_data["module"] = list(modules)
-
-                elif query_type == "page":
-                    fields = ["name"]
-                    q = Q()
-
-                    if query:
-                        for field in fields:
-                            q |= Q(**{f"{field}__icontains": query})
-
-                    pages = (
-                        Page.objects.filter(
-                            q,
-                            projects__project_projectmember__member=self.request.user,
-                            projects__project_projectmember__is_active=True,
-                            workspace__slug=slug,
-                            access=0,
-                            is_global=True,
-                        )
-                        .order_by("-created_at")
-                        .distinct()
-                        .values(
-                            "name",
-                            "id",
-                            "logo_props",
-                            "projects__id",
-                            "workspace__slug",
-                        )[:count]
-                    )
-                    response_data["page"] = list(pages)
-            return Response(response_data, status=status.HTTP_200_OK)
+        return Response(response_data, status=status.HTTP_200_OK)

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

@@ -1,3 +1,5 @@
+# Python imports
+
 # Django imports
 from django.db.models import Q
 
@@ -7,7 +9,7 @@ from rest_framework.response import Response
 
 # Module imports
 from .base import BaseAPIView
-from plane.db.models import Issue, ProjectMember, IssueRelation
+from plane.db.models import Issue, ProjectMember
 from plane.utils.issue_search import search_issues
 
 
@@ -45,18 +47,17 @@ class IssueSearchEndpoint(BaseAPIView):
                 )
         if issue_relation == "true" and issue_id:
             issue = Issue.issue_objects.filter(pk=issue_id).first()
-            related_issue_ids = IssueRelation.objects.filter(
-                Q(related_issue=issue) | Q(issue=issue)
-            ).values_list(
-                "issue_id", "related_issue_id"
-            ).distinct()
-
-            related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
-
             if issue:
                 issues = issues.filter(
                     ~Q(pk=issue_id),
-                    ~Q(pk__in=related_issue_ids),
+                    ~(
+                        Q(issue_related__issue=issue)
+                        & Q(issue_related__deleted_at__isnull=True)
+                    ),
+                    ~(
+                        Q(issue_relation__related_issue=issue)
+                        & Q(issue_relation__deleted_at__isnull=True)
+                    ),
                 )
         if sub_issue == "true" and issue_id:
             issue = Issue.issue_objects.filter(pk=issue_id).first()

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

@@ -1,9 +1,6 @@
 # Python imports
 from itertools import groupby
 
-# Django imports
-from django.db.utils import IntegrityError
-
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
@@ -40,19 +37,11 @@ class StateViewSet(BaseViewSet):
     @invalidate_cache(path="workspaces/:slug/states/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
     def create(self, request, slug, project_id):
-        try:
-            serializer = StateSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(project_id=project_id)
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError as e:
-            if "already exists" in str(e):
-                return Response(
-                    {"name": "The state name is already taken"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
+        serializer = StateSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(project_id=project_id)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):

apiserver/plane/app/views/workspace/home.py

@@ -1,85 +0,0 @@
-# Module imports
-from ..base import BaseAPIView
-from plane.db.models.workspace import WorkspaceHomePreference
-from plane.app.permissions import allow_permission, ROLE
-from plane.db.models import Workspace
-from plane.app.serializers.workspace import WorkspaceHomePreferenceSerializer
-
-# Third party imports
-from rest_framework.response import Response
-from rest_framework import status
-
-
-class WorkspaceHomePreferenceViewSet(BaseAPIView):
-    model = WorkspaceHomePreference
-
-    def get_serializer_class(self):
-        return WorkspaceHomePreferenceSerializer
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
-        get_preference = WorkspaceHomePreference.objects.filter(
-            user=request.user, workspace_id=workspace.id
-        )
-
-        create_preference_keys = []
-
-        keys = [
-            key
-            for key, _ in WorkspaceHomePreference.HomeWidgetKeys.choices
-            if key not in ["quick_tutorial", "new_at_plane"]
-        ]
-
-        sort_order_counter = 1
-
-        for preference in keys:
-            if preference not in get_preference.values_list("key", flat=True):
-                create_preference_keys.append(preference)
-
-                sort_order = 1000 - sort_order_counter
-
-                preference = WorkspaceHomePreference.objects.bulk_create(
-                    [
-                        WorkspaceHomePreference(
-                            key=key,
-                            user=request.user,
-                            workspace=workspace,
-                            sort_order=sort_order,
-                        )
-                        for key in create_preference_keys
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-                sort_order_counter += 1
-
-        preference = WorkspaceHomePreference.objects.filter(
-            user=request.user, workspace_id=workspace.id
-        )
-
-        return Response(
-            preference.values("key", "is_enabled", "config", "sort_order"),
-            status=status.HTTP_200_OK,
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def patch(self, request, slug, key):
-        preference = WorkspaceHomePreference.objects.filter(
-            key=key, workspace__slug=slug, user=request.user
-        ).first()
-
-        if preference:
-            serializer = WorkspaceHomePreferenceSerializer(
-                preference, data=request.data, partial=True
-            )
-
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        return Response(
-            {"detail": "Preference not found"}, status=status.HTTP_400_BAD_REQUEST
-        )

apiserver/plane/app/views/workspace/quick_link.py

@@ -1,74 +0,0 @@
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-
-# Module imports
-from plane.db.models import WorkspaceUserLink, Workspace
-from plane.app.serializers import WorkspaceUserLinkSerializer
-from ..base import BaseViewSet
-from plane.app.permissions import allow_permission, ROLE
-
-
-class QuickLinkViewSet(BaseViewSet):
-    model = WorkspaceUserLink
-
-    def get_serializer_class(self):
-        return WorkspaceUserLinkSerializer
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def create(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-        serializer = WorkspaceUserLinkSerializer(data=request.data)
-
-        if serializer.is_valid():
-            serializer.save(workspace_id=workspace.id, owner=request.user)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def partial_update(self, request, slug, pk):
-        quick_link = WorkspaceUserLink.objects.filter(
-            pk=pk, workspace__slug=slug, owner=request.user
-        ).first()
-
-        if quick_link:
-            serializer = WorkspaceUserLinkSerializer(
-                quick_link, data=request.data, partial=True
-            )
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        return Response(
-            {"detail": "Quick link not found."}, status=status.HTTP_404_NOT_FOUND
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def retrieve(self, request, slug, pk):
-        try:
-            quick_link = WorkspaceUserLink.objects.get(
-                pk=pk, workspace__slug=slug, owner=request.user
-            )
-            serializer = WorkspaceUserLinkSerializer(quick_link)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except WorkspaceUserLink.DoesNotExist:
-            return Response(
-                {"error": "Quick link not found."}, status=status.HTTP_404_NOT_FOUND
-            )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def destroy(self, request, slug, pk):
-        quick_link = WorkspaceUserLink.objects.get(
-            pk=pk, workspace__slug=slug, owner=request.user
-        )
-        quick_link.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def list(self, request, slug):
-        quick_links = WorkspaceUserLink.objects.filter(
-            workspace__slug=slug, owner=request.user
-        )
-
-        serializer = WorkspaceUserLinkSerializer(quick_links, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/app/views/workspace/recent_visit.py

@@ -1,35 +0,0 @@
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-
-from plane.db.models import UserRecentVisit
-from plane.app.serializers import WorkspaceRecentVisitSerializer
-
-# Modules imports
-from ..base import BaseViewSet
-from plane.app.permissions import allow_permission, ROLE
-
-
-class UserRecentVisitViewSet(BaseViewSet):
-    model = UserRecentVisit
-
-    def get_serializer_class(self):
-        return WorkspaceRecentVisitSerializer
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def list(self, request, slug):
-        user_recent_visits = UserRecentVisit.objects.filter(
-            workspace__slug=slug, user=request.user
-        )
-
-        entity_name = request.query_params.get("entity_name")
-
-        if entity_name:
-            user_recent_visits = user_recent_visits.filter(entity_name=entity_name)
-
-        user_recent_visits = user_recent_visits.filter(
-            entity_name__in=["issue", "page", "project"]
-        )
-
-        serializer = WorkspaceRecentVisitSerializer(user_recent_visits[:20], many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/app/views/workspace/sticky.py

@@ -3,15 +3,16 @@ from rest_framework.response import Response
 from rest_framework import status
 
 # Module imports
-from plane.app.views.base import BaseViewSet
-from plane.app.permissions import ROLE, allow_permission
+from .. import BaseViewSet
+from plane.app.permissions import WorkSpaceBasePermission, ROLE, allow_permission
 from plane.db.models import Sticky, Workspace
 from plane.app.serializers import StickySerializer
 
 
-class WorkspaceStickyViewSet(BaseViewSet):
+class StickyViewSet(BaseViewSet):
     serializer_class = StickySerializer
     model = Sticky
+    permission_classes = [WorkSpaceBasePermission]
 
     def get_queryset(self):
         return self.filter_queryset(
@@ -23,9 +24,7 @@ class WorkspaceStickyViewSet(BaseViewSet):
             .distinct()
         )
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
     def create(self, request, slug):
         workspace = Workspace.objects.get(slug=slug)
         serializer = StickySerializer(data=request.data)
@@ -34,26 +33,19 @@ class WorkspaceStickyViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
     def list(self, request, slug):
-        query = request.query_params.get("query", False)
-        stickies = self.get_queryset().order_by("-sort_order")
-        if query:
-            stickies = stickies.filter(description_stripped__icontains=query)
-
         return self.paginate(
             request=request,
-            queryset=(stickies),
-            on_results=lambda stickies: StickySerializer(stickies, many=True).data,
-            default_per_page=20,
+            queryset=(self.get_queryset()),
+            on_results=lambda stickies: StickySerializer(
+                stickies, many=True
+            ).data,
         )
 
-    @allow_permission(allowed_roles=[], creator=True, model=Sticky, level="WORKSPACE")
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
-    @allow_permission(allowed_roles=[], creator=True, model=Sticky, level="WORKSPACE")
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], creator=True, level="WORKSPACE")
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)

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

@@ -375,11 +375,8 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
 
         state_distribution = (
             Issue.issue_objects.filter(
-                (
-                    Q(assignees__in=[user_id])
-                    & Q(issue_assignee__deleted_at__isnull=True)
-                ),
                 workspace__slug=slug,
+                assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,
             )
@@ -394,11 +391,8 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
 
         priority_distribution = (
             Issue.issue_objects.filter(
-                (
-                    Q(assignees__in=[user_id])
-                    & Q(issue_assignee__deleted_at__isnull=True)
-                ),
                 workspace__slug=slug,
+                assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,
             )
@@ -432,11 +426,8 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
 
         assigned_issues_count = (
             Issue.issue_objects.filter(
-                (
-                    Q(assignees__in=[user_id])
-                    & Q(issue_assignee__deleted_at__isnull=True)
-                ),
                 workspace__slug=slug,
+                assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,
             )
@@ -447,11 +438,8 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
         pending_issues_count = (
             Issue.issue_objects.filter(
                 ~Q(state__group__in=["completed", "cancelled"]),
-                (
-                    Q(assignees__in=[user_id])
-                    & Q(issue_assignee__deleted_at__isnull=True)
-                ),
                 workspace__slug=slug,
+                assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,
             )
@@ -461,11 +449,8 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
 
         completed_issues_count = (
             Issue.issue_objects.filter(
-                (
-                    Q(assignees__in=[user_id])
-                    & Q(issue_assignee__deleted_at__isnull=True)
-                ),
                 workspace__slug=slug,
+                assignees__in=[user_id],
                 state__group="completed",
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,

apiserver/plane/bgtasks/notification_task.py

@@ -32,6 +32,7 @@ from bs4 import BeautifulSoup
 
 def update_mentions_for_issue(issue, project, new_mentions, removed_mention):
     aggregated_issue_mentions = []
+
     for mention_id in new_mentions:
         aggregated_issue_mentions.append(
             IssueMention(
@@ -124,9 +125,7 @@ def extract_mentions(issue_instance):
         data = json.loads(issue_instance)
         html = data.get("description_html")
         soup = BeautifulSoup(html, "html.parser")
-        mention_tags = soup.find_all(
-            "mention-component", attrs={"entity_name": "user_mention"}
-        )
+        mention_tags = soup.find_all("mention-component", attrs={"target": "users"})
 
         mentions = [mention_tag["entity_identifier"] for mention_tag in mention_tags]
 
@@ -140,9 +139,7 @@ def extract_comment_mentions(comment_value):
     try:
         mentions = []
         soup = BeautifulSoup(comment_value, "html.parser")
-        mentions_tags = soup.find_all(
-            "mention-component", attrs={"entity_name": "user_mention"}
-        )
+        mentions_tags = soup.find_all("mention-component", attrs={"target": "users"})
         for mention_tag in mentions_tags:
             mentions.append(mention_tag["entity_identifier"])
         return list(set(mentions))
@@ -258,9 +255,12 @@ def notifications(
             new_mentions = get_new_mentions(
                 requested_instance=requested_data, current_instance=current_instance
             )
-            new_mentions = list(
-                set(new_mentions) & {str(member) for member in project_members}
-            )
+
+            new_mentions = [
+                str(mention)
+                for mention in new_mentions
+                if mention in set(project_members)
+            ]
             removed_mention = get_removed_mentions(
                 requested_instance=requested_data, current_instance=current_instance
             )

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -16,9 +16,9 @@ from plane.utils.exception_logger import log_exception
 
 
 @shared_task
-def workspace_invitation(email, workspace_id, token, current_site, inviter):
+def workspace_invitation(email, workspace_id, token, current_site, invitor):
     try:
-        user = User.objects.get(email=inviter)
+        user = User.objects.get(email=invitor)
 
         workspace = Workspace.objects.get(pk=workspace_id)
         workspace_member_invite = WorkspaceMemberInvite.objects.get(
@@ -26,7 +26,7 @@ def workspace_invitation(email, workspace_id, token, current_site, inviter):
         )
 
         # Relative link
-        relative_link = f"/workspace-invitations/?invitation_id={workspace_member_invite.id}&email={email}&slug={workspace.slug}"  # noqa: E501
+        relative_link = f"/workspace-invitations/?invitation_id={workspace_member_invite.id}&email={email}&slug={workspace.slug}"
 
         # The complete url including the domain
         abs_url = str(current_site) + relative_link
@@ -42,7 +42,7 @@ def workspace_invitation(email, workspace_id, token, current_site, inviter):
         ) = get_email_configuration()
 
         # Subject of the email
-        subject = f"{user.first_name or user.display_name or user.email} has invited you to join them in {workspace.name} on Plane"  # noqa: E501
+        subject = f"{user.first_name or user.display_name or user.email} has invited you to join them in {workspace.name} on Plane"
 
         context = {
             "email": email,
@@ -78,9 +78,11 @@ def workspace_invitation(email, workspace_id, token, current_site, inviter):
         )
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane").info("Email sent successfully")
+        logging.getLogger("plane").info("Email sent succesfully")
+
         return
-    except (Workspace.DoesNotExist, WorkspaceMemberInvite.DoesNotExist):
+    except (Workspace.DoesNotExist, WorkspaceMemberInvite.DoesNotExist) as e:
+        log_exception(e)
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/db/migrations/0088_sticky_sort_order_workspaceuserlink.py

@@ -1,124 +0,0 @@
-# Generated by Django 4.2.15 on 2024-12-24 14:57
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0087_remove_issueversion_description_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="sticky",
-            name="sort_order",
-            field=models.FloatField(default=65535),
-        ),
-        migrations.CreateModel(
-            name="WorkspaceUserLink",
-            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"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("title", models.CharField(blank=True, max_length=255, null=True)),
-                ("url", models.TextField()),
-                ("metadata", 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",
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="owner_workspace_user_link",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "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": "Workspace User Link",
-                "verbose_name_plural": "Workspace User Links",
-                "db_table": "workspace_user_links",
-                "ordering": ("-created_at",),
-            },
-        ),
-        migrations.AlterField(
-            model_name="pagelog",
-            name="entity_name",
-            field=models.CharField(max_length=30, verbose_name="Transaction Type"),
-        ),
-        migrations.AlterUniqueTogether(
-            name="webhook",
-            unique_together={("workspace", "url", "deleted_at")},
-        ),
-        migrations.AddConstraint(
-            model_name="webhook",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("workspace", "url"),
-                name="webhook_url_unique_url_when_deleted_at_null",
-            ),
-        ),
-    ]

apiserver/plane/db/migrations/0089_workspacehomepreference_and_more.py

@@ -1,120 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-02 07:47
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0088_sticky_sort_order_workspaceuserlink"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="WorkspaceHomePreference",
-            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"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("key", models.CharField(max_length=255)),
-                ("is_enabled", models.BooleanField(default=True)),
-                ("config", 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",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_user_home_preferences",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "workspace",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_user_home_preferences",
-                        to="db.workspace",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Workspace Home Preference",
-                "verbose_name_plural": "Workspace Home Preferences",
-                "db_table": "workspace_home_preferences",
-                "ordering": ("-created_at",),
-            },
-        ),
-        migrations.AddConstraint(
-            model_name="workspacehomepreference",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("workspace", "user", "key"),
-                name="workspace_user_home_preferences_unique_workspace_user_key_when_deleted_at_null",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="workspacehomepreference",
-            unique_together={("workspace", "user", "key", "deleted_at")},
-        ),
-        migrations.AlterField(
-            model_name="page",
-            name="name",
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name="sticky",
-            name="name",
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='workspacehomepreference',
-            name='sort_order',
-            field=models.PositiveIntegerField(default=65535),
-        ),
-    ]

apiserver/plane/db/migrations/0090_rename_dashboard_deprecateddashboard_and_more.py

@@ -1,87 +0,0 @@
- # Generated by Django 4.2.17 on 2025-01-09 14:43
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0089_workspacehomepreference_and_more'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='Dashboard',
-            new_name='DeprecatedDashboard',
-        ),
-        migrations.RenameModel(
-            old_name='DashboardWidget',
-            new_name='DeprecatedDashboardWidget',
-        ),
-        migrations.RenameModel(
-            old_name='Widget',
-            new_name='DeprecatedWidget',
-        ),
-        migrations.AlterModelOptions(
-            name='deprecateddashboard',
-            options={'ordering': ('-created_at',), 'verbose_name': 'DeprecatedDashboard', 'verbose_name_plural': 'DeprecatedDashboards'},
-        ),
-        migrations.AlterModelOptions(
-            name='deprecateddashboardwidget',
-            options={'ordering': ('-created_at',), 'verbose_name': 'Deprecated Dashboard Widget', 'verbose_name_plural': 'Deprecated Dashboard Widgets'},
-        ),
-        migrations.AlterModelOptions(
-            name='deprecatedwidget',
-            options={'ordering': ('-created_at',), 'verbose_name': 'DeprecatedWidget', 'verbose_name_plural': 'DeprecatedWidgets'},
-        ),
-        migrations.AlterField(
-            model_name='workspacehomepreference',
-            name='sort_order',
-            field=models.FloatField(default=65535),
-        ),
-        migrations.AlterModelTable(
-            name='deprecateddashboard',
-            table='deprecated_dashboards',
-        ),
-        migrations.AlterModelTable(
-            name='deprecateddashboardwidget',
-            table='deprecated_dashboard_widgets',
-        ),
-        migrations.AlterModelTable(
-            name='deprecatedwidget',
-            table='deprecated_widgets',
-        ),
-        migrations.CreateModel(
-            name='WorkspaceUserPreference',
-            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')),
-                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('key', models.CharField(max_length=255)),
-                ('is_pinned', models.BooleanField(default=False)),
-                ('sort_order', models.FloatField(default=65535)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_user_preferences', to=settings.AUTH_USER_MODEL)),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_user_preferences', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Workspace User Preference',
-                'verbose_name_plural': 'Workspace User Preferences',
-                'db_table': 'workspace_user_preferences',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.AddConstraint(
-            model_name='workspaceuserpreference',
-            constraint=models.UniqueConstraint(condition=models.Q(('deleted_at__isnull', True)), fields=('workspace', 'user', 'key'), name='workspace_user_preferences_unique_workspace_user_key_when_deleted_at_null'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='workspaceuserpreference',
-            unique_together={('workspace', 'user', 'key', 'deleted_at')},
-        ),
-    ]

apiserver/plane/db/models/__init__.py

@@ -3,7 +3,7 @@ from .api import APIActivityLog, APIToken
 from .asset import FileAsset
 from .base import BaseModel
 from .cycle import Cycle, CycleIssue, CycleUserProperties
-from .dashboard import DeprecatedDashboard, DeprecatedDashboardWidget, DeprecatedWidget
+from .dashboard import Dashboard, DashboardWidget, Widget
 from .deploy_board import DeployBoard
 from .draft import (
     DraftIssue,
@@ -68,8 +68,6 @@ from .workspace import (
     WorkspaceMemberInvite,
     WorkspaceTheme,
     WorkspaceUserProperties,
-    WorkspaceUserLink,
-    WorkspaceHomePreference
 )
 
 from .favorite import UserFavorite

apiserver/plane/db/models/dashboard.py

@@ -8,7 +8,7 @@ from ..mixins import TimeAuditModel
 from .base import BaseModel
 
 
-class DeprecatedDashboard(BaseModel):
+class Dashboard(BaseModel):
     DASHBOARD_CHOICES = (
         ("workspace", "Workspace"),
         ("project", "Project"),
@@ -36,13 +36,13 @@ class DeprecatedDashboard(BaseModel):
         return f"{self.name}"
 
     class Meta:
-        verbose_name = "DeprecatedDashboard"
-        verbose_name_plural = "DeprecatedDashboards"
-        db_table = "deprecated_dashboards"
+        verbose_name = "Dashboard"
+        verbose_name_plural = "Dashboards"
+        db_table = "dashboards"
         ordering = ("-created_at",)
 
 
-class DeprecatedWidget(TimeAuditModel):
+class Widget(TimeAuditModel):
     id = models.UUIDField(
         default=uuid.uuid4, unique=True, editable=False, db_index=True, primary_key=True
     )
@@ -55,18 +55,18 @@ class DeprecatedWidget(TimeAuditModel):
         return f"{self.key}"
 
     class Meta:
-        verbose_name = "DeprecatedWidget"
-        verbose_name_plural = "DeprecatedWidgets"
-        db_table = "deprecated_widgets"
+        verbose_name = "Widget"
+        verbose_name_plural = "Widgets"
+        db_table = "widgets"
         ordering = ("-created_at",)
 
 
-class DeprecatedDashboardWidget(BaseModel):
+class DashboardWidget(BaseModel):
     widget = models.ForeignKey(
-        DeprecatedWidget, on_delete=models.CASCADE, related_name="dashboard_widgets"
+        Widget, on_delete=models.CASCADE, related_name="dashboard_widgets"
     )
     dashboard = models.ForeignKey(
-        DeprecatedDashboard, on_delete=models.CASCADE, related_name="dashboard_widgets"
+        Dashboard, on_delete=models.CASCADE, related_name="dashboard_widgets"
     )
     is_visible = models.BooleanField(default=True)
     sort_order = models.FloatField(default=65535)
@@ -86,7 +86,7 @@ class DeprecatedDashboardWidget(BaseModel):
                 name="dashboard_widget_unique_widget_dashboard_when_deleted_at_null",
             )
         ]
-        verbose_name = "Deprecated Dashboard Widget"
-        verbose_name_plural = "Deprecated Dashboard Widgets"
-        db_table = "deprecated_dashboard_widgets"
+        verbose_name = "Dashboard Widget"
+        verbose_name_plural = "Dashboard Widgets"
+        db_table = "dashboard_widgets"
         ordering = ("-created_at",)

apiserver/plane/db/models/page.py

@@ -20,7 +20,7 @@ class Page(BaseModel):
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="pages"
     )
-    name = models.TextField(blank=True)
+    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>")
@@ -90,7 +90,7 @@ class PageLog(BaseModel):
     page = models.ForeignKey(Page, related_name="page_log", on_delete=models.CASCADE)
     entity_identifier = models.UUIDField(null=True)
     entity_name = models.CharField(
-        max_length=30, verbose_name="Transaction Type"
+        max_length=30, choices=TYPE_CHOICES, verbose_name="Transaction Type"
     )
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="workspace_page_log"

apiserver/plane/db/models/sticky.py

@@ -5,12 +5,9 @@ from django.db import models
 # Module imports
 from .base import BaseModel
 
-# Third party imports
-from plane.utils.html_processor import strip_tags
-
 
 class Sticky(BaseModel):
-    name = models.TextField(null=True, blank=True)
+    name = models.TextField()
 
     description = models.JSONField(blank=True, default=dict)
     description_html = models.TextField(blank=True, default="<p></p>")
@@ -27,31 +24,9 @@ class Sticky(BaseModel):
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="stickies"
     )
-    sort_order = models.FloatField(default=65535)
 
     class Meta:
         verbose_name = "Sticky"
         verbose_name_plural = "Stickies"
         db_table = "stickies"
         ordering = ("-created_at",)
-
-    def save(self, *args, **kwargs):
-        # Strip the html tags using html parser
-        self.description_stripped = (
-            None
-            if (self.description_html == "" or self.description_html is None)
-            else strip_tags(self.description_html)
-        )
-        if self._state.adding:
-            # Get the maximum sequence value from the database
-            last_id = Sticky.objects.filter(workspace=self.workspace).aggregate(
-                largest=models.Max("sort_order")
-            )["largest"]
-            # if last_id is not None
-            if last_id is not None:
-                self.sort_order = last_id + 10000
-
-        super(Sticky, self).save(*args, **kwargs)
-
-    def __str__(self):
-        return str(self.name)

apiserver/plane/db/models/webhook.py

@@ -47,18 +47,11 @@ class Webhook(BaseModel):
         return f"{self.workspace.slug} {self.url}"
 
     class Meta:
-        unique_together = ["workspace", "url", "deleted_at"]
+        unique_together = ["workspace", "url"]
         verbose_name = "Webhook"
         verbose_name_plural = "Webhooks"
         db_table = "webhooks"
         ordering = ("-created_at",)
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "url"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="webhook_url_unique_url_when_deleted_at_null",
-            )
-        ]
 
 
 class WebhookLog(BaseModel):

apiserver/plane/db/models/workspace.py

@@ -1,5 +1,4 @@
 # Python imports
-from django.db.models.functions import Ln
 import pytz
 
 # Django imports
@@ -323,105 +322,3 @@ class WorkspaceUserProperties(BaseModel):
 
     def __str__(self):
         return f"{self.workspace.name} {self.user.email}"
-
-
-class WorkspaceUserLink(WorkspaceBaseModel):
-    title = models.CharField(max_length=255, null=True, blank=True)
-    url = models.TextField()
-    metadata = models.JSONField(default=dict)
-    owner = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="owner_workspace_user_link",
-    )
-
-    class Meta:
-        verbose_name = "Workspace User Link"
-        verbose_name_plural = "Workspace User Links"
-        db_table = "workspace_user_links"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.workspace.id} {self.url}"
-
-
-class WorkspaceHomePreference(BaseModel):
-    """Preference for the home page of a workspace for a user"""
-
-    class HomeWidgetKeys(models.TextChoices):
-        QUICK_LINKS = "quick_links", "Quick Links"
-        RECENTS = "recents", "Recents"
-        MY_STICKIES = "my_stickies", "My Stickies"
-        NEW_AT_PLANE = "new_at_plane", "New at Plane"
-        QUICK_TUTORIAL = "quick_tutorial", "Quick Tutorial"
-
-    workspace = models.ForeignKey(
-        "db.Workspace",
-        on_delete=models.CASCADE,
-        related_name="workspace_user_home_preferences",
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="workspace_user_home_preferences",
-    )
-    key = models.CharField(max_length=255)
-    is_enabled = models.BooleanField(default=True)
-    config = models.JSONField(default=dict)
-    sort_order = models.FloatField(default=65535)
-
-    class Meta:
-        unique_together = ["workspace", "user", "key", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "user", "key"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_user_home_preferences_unique_workspace_user_key_when_deleted_at_null",
-            )
-        ]
-        verbose_name = "Workspace Home Preference"
-        verbose_name_plural = "Workspace Home Preferences"
-        db_table = "workspace_home_preferences"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.workspace.name} {self.user.email} {self.key}"
-
-
-
-class WorkspaceUserPreference(BaseModel):
-    """Preference for the workspace for a user"""
-
-    class UserPreferenceKeys(models.TextChoices):
-        CYCLES = "cycles", "Cycles"
-        VIEWS = "views", "Views"
-        ANALYTICS = "analytics", "Analytics"
-        PROJECTS = "projects", "Projects"
-
-    workspace = models.ForeignKey(
-        "db.Workspace",
-        on_delete=models.CASCADE,
-        related_name="workspace_user_preferences",
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="workspace_user_preferences",
-    )
-    key = models.CharField(max_length=255)
-    is_pinned = models.BooleanField(default=False)
-    sort_order = models.FloatField(default=65535)
-
-    class Meta:
-        unique_together = ["workspace", "user", "key", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "user", "key"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_user_preferences_unique_workspace_user_key_when_deleted_at_null",
-            )
-        ]
-        verbose_name = "Workspace User Preference"
-        verbose_name_plural = "Workspace User Preferences"
-        db_table = "workspace_user_preferences"
-        ordering = ("-created_at",)

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

@@ -290,12 +290,11 @@ class InstanceAdminSignInEndpoint(View):
         # Fetch the user
         user = User.objects.filter(email=email).first()
 
-        # Error out if the user is not present
-        if not user:
+        # is_active
+        if not user.is_active:
             exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["ADMIN_USER_DOES_NOT_EXIST"],
-                error_message="ADMIN_USER_DOES_NOT_EXIST",
-                payload={"email": email},
+                error_code=AUTHENTICATION_ERROR_CODES["ADMIN_USER_DEACTIVATED"],
+                error_message="ADMIN_USER_DEACTIVATED",
             )
             url = urljoin(
                 base_host(request=request, is_admin=True),
@@ -303,11 +302,12 @@ class InstanceAdminSignInEndpoint(View):
             )
             return HttpResponseRedirect(url)
 
-        # is_active
-        if not user.is_active:
+        # Error out if the user is not present
+        if not user:
             exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["ADMIN_USER_DEACTIVATED"],
-                error_message="ADMIN_USER_DEACTIVATED",
+                error_code=AUTHENTICATION_ERROR_CODES["ADMIN_USER_DOES_NOT_EXIST"],
+                error_message="ADMIN_USER_DOES_NOT_EXIST",
+                payload={"email": email},
             )
             url = urljoin(
                 base_host(request=request, is_admin=True),

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

@@ -132,33 +132,20 @@ class Command(BaseCommand):
                 "is_encrypted": False,
             },
             {
-                "key": "LLM_API_KEY",
-                "value": os.environ.get("LLM_API_KEY"),
-                "category": "AI",
+                "key": "OPENAI_API_KEY",
+                "value": os.environ.get("OPENAI_API_KEY"),
+                "category": "OPENAI",
                 "is_encrypted": True,
             },
             {
-                "key": "LLM_PROVIDER",
-                "value": os.environ.get("LLM_PROVIDER", "openai"),
-                "category": "AI",
-                "is_encrypted": False,
-            },
-            {
-                "key": "LLM_MODEL",
-                "value": os.environ.get("LLM_MODEL", "gpt-4o-mini"),
-                "category": "AI",
-                "is_encrypted": False,
-            },
-            # Deprecated, use LLM_MODEL
-            {
-                "key": "GPT_ENGINE",  
+                "key": "GPT_ENGINE",
                 "value": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
                 "category": "SMTP",
                 "is_encrypted": False,
             },
             {
                 "key": "UNSPLASH_ACCESS_KEY",
-                "value": os.environ.get("UNSPLASH_ACCESS_KEY", ""),
+                "value": os.environ.get("UNSPLASH_ACESS_KEY", ""),
                 "category": "UNSPLASH",
                 "is_encrypted": True,
             },

apiserver/plane/settings/common.py

@@ -361,18 +361,6 @@ ATTACHMENT_MIME_TYPES = [
     "application/vnd.openxmlformats-officedocument.presentationml.presentation",
     "text/plain",
     "application/rtf",
-    "application/vnd.oasis.opendocument.spreadsheet",
-    "application/vnd.oasis.opendocument.text",
-    "application/vnd.oasis.opendocument.presentation",
-    "application/vnd.oasis.opendocument.graphics",
-    # Microsoft Visio
-    "application/vnd.visio",
-    # Netpbm format
-    "image/x-portable-graymap",
-    "image/x-portable-bitmap",
-    "image/x-portable-pixmap",
-    # Open Office Bae
-    "application/vnd.oasis.opendocument.database",
     # Audio
     "audio/mpeg",
     "audio/wav",

apiserver/plane/space/views/intake.py

@@ -130,6 +130,15 @@ class IntakeIssuePublicViewSet(BaseViewSet):
                 {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
             )
 
+        # Create or get state
+        state, _ = State.objects.get_or_create(
+            name="Triage",
+            group="backlog",
+            description="Default state for managing all Intake Issues",
+            project_id=project_deploy_board.project_id,
+            color="#ff7700",
+        )
+
         # create an issue
         issue = Issue.objects.create(
             name=request.data.get("issue", {}).get("name"),
@@ -139,6 +148,7 @@ class IntakeIssuePublicViewSet(BaseViewSet):
             ),
             priority=request.data.get("issue", {}).get("priority", "low"),
             project_id=project_deploy_board.project_id,
+            state=state,
         )
 
         # Create an Issue Activity

apiserver/plane/utils/timezone_converter.py

@@ -3,7 +3,6 @@ from plane.db.models import Project
 from datetime import datetime, time
 from datetime import timedelta
 
-
 def user_timezone_converter(queryset, datetime_fields, user_timezone):
     # Create a timezone object for the user's timezone
     user_tz = pytz.timezone(user_timezone)
@@ -29,9 +28,7 @@ def user_timezone_converter(queryset, datetime_fields, user_timezone):
         return queryset_values
 
 
-def convert_to_utc(
-    date, project_id, is_start_date=False, is_start_date_end_date_equal=False
-):
+def convert_to_utc(date, project_id, is_start_date=False):
     """
     Converts a start date string to the project's local timezone at 12:00 AM
     and then converts it to UTC for storage.
@@ -63,12 +60,7 @@ def convert_to_utc(
 
     # If it's an start date, add one minute
     if is_start_date:
-        localized_datetime += timedelta(minutes=0, seconds=1)
-
-    # If it's start an end date are equal, add 23 hours, 59 minutes, and 59 seconds
-    # to make it the end of the day
-    if is_start_date_end_date_equal:
-        localized_datetime += timedelta(hours=23, minutes=59, seconds=59)
+        localized_datetime += timedelta(minutes=1)
 
     # Convert the localized datetime to UTC
     utc_datetime = localized_datetime.astimezone(pytz.utc)

apiserver/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.18
+Django==4.2.17
 # rest framework
 djangorestframework==3.15.2
 # postgres 
@@ -37,7 +37,7 @@ uvicorn==0.29.0
 # sockets
 channels==4.1.0
 # ai
-litellm==1.51.0
+openai==1.25.0
 # slack
 slack-sdk==3.27.1
 # apm

live/.prettierignore

@@ -1,6 +0,0 @@
-.next
-.turbo
-out/
-dist/
-build/
-node_modules/

live/.prettierrc

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

live/Dockerfile.dev

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

live/Dockerfile.live

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS base
+FROM node:18-alpine AS base
 # The web Dockerfile is copy-pasted into our main docs at /docs/handbook/deploying-with-docker.
 # Make sure you update this Dockerfile, the Dockerfile in the web workspace and copy that over to Dockerfile in the docs.
 

live/package.json

@@ -16,18 +16,18 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@hocuspocus/extension-database": "^2.15.0",
-    "@hocuspocus/extension-logger": "^2.15.0",
-    "@hocuspocus/extension-redis": "^2.15.0",
-    "@hocuspocus/server": "^2.15.0",
+    "@hocuspocus/extension-database": "^2.11.3",
+    "@hocuspocus/extension-logger": "^2.11.3",
+    "@hocuspocus/extension-redis": "^2.13.5",
+    "@hocuspocus/server": "^2.11.3",
     "@plane/constants": "*",
     "@plane/editor": "*",
     "@plane/types": "*",
     "@sentry/node": "^8.28.0",
     "@sentry/profiling-node": "^8.28.0",
-    "@tiptap/core": "2.10.4",
-    "@tiptap/html": "2.11.0",
-    "axios": "^1.7.9",
+    "@tiptap/core": "^2.4.0",
+    "@tiptap/html": "^2.3.0",
+    "axios": "^1.7.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
@@ -40,9 +40,9 @@
     "pino-http": "^10.3.0",
     "pino-pretty": "^11.2.2",
     "uuid": "^10.0.0",
-    "y-prosemirror": "^1.2.15",
+    "y-prosemirror": "^1.2.9",
     "y-protocols": "^1.0.6",
-    "yjs": "^13.6.20"
+    "yjs": "^13.6.14"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",

live/src/core/helpers/convert-document.ts

@@ -1,44 +0,0 @@
-// plane editor
-import {
-  getAllDocumentFormatsFromDocumentEditorBinaryData,
-  getAllDocumentFormatsFromRichTextEditorBinaryData,
-  getBinaryDataFromDocumentEditorHTMLString,
-  getBinaryDataFromRichTextEditorHTMLString,
-} from "@plane/editor";
-// plane types
-import { TDocumentPayload } from "@plane/types";
-
-type TArgs = {
-  document_html: string;
-  variant: "rich" | "document";
-};
-
-export const convertHTMLDocumentToAllFormats = (args: TArgs): TDocumentPayload => {
-  const { document_html, variant } = args;
-
-  let allFormats: TDocumentPayload;
-
-  if (variant === "rich") {
-    const contentBinary = getBinaryDataFromRichTextEditorHTMLString(document_html);
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromRichTextEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else if (variant === "document") {
-    const contentBinary = getBinaryDataFromDocumentEditorHTMLString(document_html);
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromDocumentEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else {
-    throw new Error(`Invalid variant provided: ${variant}`);
-  }
-
-  return allFormats;
-};

live/src/core/types/common.d.ts

@@ -6,8 +6,3 @@ export type TDocumentTypes = "project_page" | TAdditionalDocumentTypes;
 export type HocusPocusServerContext = {
   cookie: string;
 };
-
-export type TConvertDocumentRequestBody = {
-  description_html: string;
-  variant: "rich" | "document";
-};

live/src/server.ts

@@ -1,19 +1,20 @@
+import "@/core/config/sentry-config.js";
+
+import express from "express";
+import expressWs from "express-ws";
 import * as Sentry from "@sentry/node";
 import compression from "compression";
-import cors from "cors";
-import expressWs from "express-ws";
-import express from "express";
 import helmet from "helmet";
-// config
-import "@/core/config/sentry-config.js";
-// hocuspocus server
+
+// cors
+import cors from "cors";
+
+// core hocuspocus server
 import { getHocusPocusServer } from "@/core/hocuspocus-server.js";
+
 // helpers
-import { convertHTMLDocumentToAllFormats } from "@/core/helpers/convert-document.js";
 import { logger, manualLogger } from "@/core/helpers/logger.js";
 import { errorHandler } from "@/core/helpers/error-handler.js";
-// types
-import { TConvertDocumentRequestBody } from "@/core/types/common.js";
 
 const app = express();
 expressWs(app);
@@ -28,7 +29,7 @@ app.use(
   compression({
     level: 6,
     threshold: 5 * 1000,
-  })
+  }),
 );
 
 // Logging middleware
@@ -61,31 +62,6 @@ router.ws("/collaboration", (ws, req) => {
   }
 });
 
-router.post("/convert-document", (req, res) => {
-  const { description_html, variant } = req.body as TConvertDocumentRequestBody;
-  try {
-    if (description_html === undefined || variant === undefined) {
-      res.status(400).send({
-        message: "Missing required fields",
-      });
-      return;
-    }
-    const { description, description_binary } = convertHTMLDocumentToAllFormats({
-      document_html: description_html,
-      variant,
-    });
-    res.status(200).json({
-      description,
-      description_binary,
-    });
-  } catch (error) {
-    manualLogger.error("Error in /convert-document endpoint:", error);
-    res.status(500).send({
-      message: `Internal server error. ${error}`,
-    });
-  }
-});
-
 app.use(process.env.LIVE_BASE_PATH || "/live", router);
 
 app.use((_req, res) => {
@@ -106,7 +82,9 @@ const gracefulShutdown = async () => {
   try {
     // Close the HocusPocus server WebSocket connections
     await HocusPocusServer.destroy();
-    manualLogger.info("HocusPocus server WebSocket connections closed gracefully.");
+    manualLogger.info(
+      "HocusPocus server WebSocket connections closed gracefully.",
+    );
 
     // Close the Express server
     liveServer.close(() => {

packages/constants/src/analytics.ts

@@ -1,78 +0,0 @@
-// types
-import { TXAxisValues, TYAxisValues } from "@plane/types";
-
-export const ANALYTICS_TABS = [
-  { key: "scope_and_demand", title: "Scope and Demand" },
-  { key: "custom", title: "Custom Analytics" },
-];
-
-export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =
-  [
-    {
-      value: "state_id",
-      label: "State name",
-    },
-    {
-      value: "state__group",
-      label: "State group",
-    },
-    {
-      value: "priority",
-      label: "Priority",
-    },
-    {
-      value: "labels__id",
-      label: "Label",
-    },
-    {
-      value: "assignees__id",
-      label: "Assignee",
-    },
-    {
-      value: "estimate_point__value",
-      label: "Estimate point",
-    },
-    {
-      value: "issue_cycle__cycle_id",
-      label: "Cycle",
-    },
-    {
-      value: "issue_module__module_id",
-      label: "Module",
-    },
-    {
-      value: "completed_at",
-      label: "Completed date",
-    },
-    {
-      value: "target_date",
-      label: "Due date",
-    },
-    {
-      value: "start_date",
-      label: "Start date",
-    },
-    {
-      value: "created_at",
-      label: "Created date",
-    },
-  ];
-
-export const ANALYTICS_Y_AXIS_VALUES: { value: TYAxisValues; label: string }[] =
-  [
-    {
-      value: "issue_count",
-      label: "Issue Count",
-    },
-    {
-      value: "estimate",
-      label: "Estimate",
-    },
-  ];
-
-export const ANALYTICS_DATE_KEYS = [
-  "completed_at",
-  "target_date",
-  "start_date",
-  "created_at",
-];

packages/constants/src/auth.ts

@@ -7,7 +7,7 @@ export enum E_PASSWORD_STRENGTH {
 
 export const PASSWORD_MIN_LENGTH = 8;
 
-export const SPACE_PASSWORD_CRITERIA = [
+export const PASSWORD_CRITERIA = [
   {
     key: "min_8_char",
     label: "Min 8 characters",

packages/constants/src/emoji.ts

@@ -1,10 +0,0 @@
-export const ISSUE_REACTION_EMOJI_CODES = [
-  "128077",
-  "128078",
-  "128516",
-  "128165",
-  "128533",
-  "129505",
-  "9992",
-  "128064",
-];

packages/constants/src/endpoints.ts

@@ -23,7 +23,3 @@ export const WEBSITE_URL =
 // support email
 export const SUPPORT_EMAIL =
   process.env.NEXT_PUBLIC_SUPPORT_EMAIL || "support@plane.so";
-// marketing links
-export const MARKETING_PRICING_PAGE_LINK = "https://plane.so/pricing";
-export const MARKETING_CONTACT_US_PAGE_LINK = "https://plane.so/contact";
-export const MARKETING_PLANE_ONE_PAGE_LINK = "https://plane.so/one";

packages/constants/src/error.ts

@@ -1,5 +0,0 @@
-export enum E_ARCHIVE_ERROR_CODES {
-  "INVALID_ARCHIVE_STATE_GROUP" = 4091,
-  "INVALID_ISSUE_START_DATE" = 4101,
-  "INVALID_ISSUE_TARGET_DATE" = 4102,
-}

packages/constants/src/event.ts

@@ -1 +0,0 @@
-export const SIDEBAR_CLICKED = "Sidenav clicked";

packages/constants/src/filter.ts

@@ -1,4 +0,0 @@
-export enum E_SORT_ORDER {
-  ASC = "asc",
-  DESC = "desc",
-}

packages/constants/src/index.ts

@@ -1,11 +1,7 @@
 export * from "./ai";
-export * from "./analytics";
 export * from "./auth";
 export * from "./endpoints";
-export * from "./event";
 export * from "./file";
-export * from "./filter";
-export * from "./graph";
 export * from "./instance";
 export * from "./issue";
 export * from "./metadata";
@@ -13,4 +9,3 @@ export * from "./state";
 export * from "./swr";
 export * from "./user";
 export * from "./workspace";
-export * from "./stickies";

packages/constants/src/state.ts

@@ -43,26 +43,3 @@ export const ARCHIVABLE_STATE_GROUPS = [
   STATE_GROUPS.completed.key,
   STATE_GROUPS.cancelled.key,
 ];
-
-export const PROGRESS_STATE_GROUPS_DETAILS = [
-  {
-    key: "completed_issues",
-    title: "Completed",
-    color: "#16A34A",
-  },
-  {
-    key: "started_issues",
-    title: "Started",
-    color: "#F59E0B",
-  },
-  {
-    key: "unstarted_issues",
-    title: "Unstarted",
-    color: "#3A3A3A",
-  },
-  {
-    key: "backlog_issues",
-    title: "Backlog",
-    color: "#A3A3A3",
-  },
-];

packages/constants/src/stickies.ts

@@ -1 +0,0 @@
-export const STICKIES_PER_PAGE = 30;

packages/constants/src/user.ts

@@ -19,20 +19,3 @@ export type TUserStatus = {
   status: EUserStatus | undefined;
   message?: string;
 };
-
-export enum EUserPermissionsLevel {
-  WORKSPACE = "WORKSPACE",
-  PROJECT = "PROJECT",
-}
-
-export enum EUserWorkspaceRoles {
-  ADMIN = 20,
-  MEMBER = 15,
-  GUEST = 5,
-}
-
-export enum EUserProjectRoles {
-  ADMIN = 20,
-  MEMBER = 15,
-  GUEST = 5,
-}

packages/constants/src/workspace.ts

@@ -1,5 +1,5 @@
 export const ORGANIZATION_SIZE = [
-  "Just myself", // TODO: translate
+  "Just myself",
   "2-10",
   "11-50",
   "51-200",

packages/editor/package.json

@@ -12,12 +12,14 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
+      "import": "./dist/index.mjs",
+      "module": "./dist/index.mjs"
     },
     "./lib": {
       "require": "./dist/lib.js",
       "types": "./dist/lib.d.mts",
-      "import": "./dist/lib.mjs"
+      "import": "./dist/lib.mjs",
+      "module": "./dist/lib.mjs"
     }
   },
   "scripts": {
@@ -34,28 +36,27 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.4",
-    "@hocuspocus/provider": "^2.15.0",
+    "@hocuspocus/provider": "^2.13.5",
     "@plane/types": "*",
     "@plane/ui": "*",
     "@plane/utils": "*",
-    "@tiptap/core": "2.10.4",
-    "@tiptap/extension-blockquote": "2.10.4",
-    "@tiptap/extension-character-count": "2.11.0",
-    "@tiptap/extension-collaboration": "2.11.0",
-    "@tiptap/extension-image": "2.11.0",
-    "@tiptap/extension-list-item": "2.11.0",
-    "@tiptap/extension-mention": "2.11.0",
-    "@tiptap/extension-placeholder": "2.11.0",
-    "@tiptap/extension-task-item": "2.11.0",
-    "@tiptap/extension-task-list": "2.11.0",
-    "@tiptap/extension-text-align": "2.11.0",
-    "@tiptap/extension-text-style": "2.11.0",
-    "@tiptap/extension-underline": "2.11.0",
-    "@tiptap/html": "2.11.0",
-    "@tiptap/pm": "2.11.0",
-    "@tiptap/react": "2.11.0",
-    "@tiptap/starter-kit": "2.11.0",
-    "@tiptap/suggestion": "2.11.0",
+    "@tiptap/core": "^2.1.13",
+    "@tiptap/extension-blockquote": "^2.1.13",
+    "@tiptap/extension-character-count": "^2.6.5",
+    "@tiptap/extension-collaboration": "^2.3.2",
+    "@tiptap/extension-image": "^2.1.13",
+    "@tiptap/extension-list-item": "^2.1.13",
+    "@tiptap/extension-mention": "^2.1.13",
+    "@tiptap/extension-placeholder": "^2.3.0",
+    "@tiptap/extension-task-item": "^2.1.13",
+    "@tiptap/extension-task-list": "^2.1.13",
+    "@tiptap/extension-text-align": "^2.8.0",
+    "@tiptap/extension-text-style": "^2.7.1",
+    "@tiptap/extension-underline": "^2.1.13",
+    "@tiptap/pm": "^2.1.13",
+    "@tiptap/react": "^2.1.13",
+    "@tiptap/starter-kit": "^2.1.13",
+    "@tiptap/suggestion": "^2.0.13",
     "class-variance-authority": "^0.7.0",
     "highlight.js": "^11.8.0",
     "jsx-dom-cjs": "^8.0.3",
@@ -64,22 +65,23 @@
     "lucide-react": "^0.378.0",
     "prosemirror-codemark": "^0.4.2",
     "prosemirror-utils": "^1.2.2",
+    "react-moveable": "^0.54.2",
     "tippy.js": "^6.3.7",
-    "tiptap-markdown": "^0.8.10",
+    "tiptap-markdown": "^0.8.9",
     "uuid": "^10.0.0",
     "y-indexeddb": "^9.0.12",
-    "y-prosemirror": "^1.2.15",
+    "y-prosemirror": "^1.2.5",
     "y-protocols": "^1.0.6",
-    "yjs": "^13.6.20"
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@plane/eslint-config": "*",
-    "@plane/tailwind-config": "*",
     "@plane/typescript-config": "*",
     "@types/node": "18.15.3",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "postcss": "^8.4.38",
+    "tailwind-config-custom": "*",
     "tsup": "^7.2.0",
     "typescript": "5.3.3"
   },

packages/editor/src/ce/extensions/document-extensions.tsx

@@ -1,6 +1,5 @@
 import { HocuspocusProvider } from "@hocuspocus/provider";
 import { Extensions } from "@tiptap/core";
-import { AnyExtension } from "@tiptap/core";
 import { SlashCommands } from "@/extensions";
 // plane editor types
 import { TIssueEmbedConfig } from "@/plane-editor/types";
@@ -14,24 +13,15 @@ type Props = {
   userDetails: TUserDetails;
 };
 
-type ExtensionConfig = {
-  isEnabled: (disabledExtensions: TExtensions[]) => boolean;
-  getExtension: (props: Props) => AnyExtension;
-};
-
-const extensionRegistry: ExtensionConfig[] = [
-  {
-    isEnabled: (disabledExtensions) => !disabledExtensions.includes("slash-commands"),
-    getExtension: () => SlashCommands({}),
-  },
-];
-
 export const DocumentEditorAdditionalExtensions = (_props: Props) => {
-  const { disabledExtensions = [] } = _props;
+  const { disabledExtensions } = _props;
+  const extensions: Extensions = disabledExtensions?.includes("slash-commands")
+    ? []
+    : [
+        SlashCommands({
+          disabledExtensions,
+        }),
+      ];
 
-  const documentExtensions = extensionRegistry
-    .filter((config) => config.isEnabled(disabledExtensions))
-    .map((config) => config.getExtension(_props));
-
-  return documentExtensions;
+  return extensions;
 };

packages/editor/src/ce/extensions/slash-commands.tsx

@@ -4,7 +4,7 @@ import { TSlashCommandAdditionalOption } from "@/extensions";
 import { TExtensions } from "@/types";
 
 type Props = {
-  disabledExtensions?: TExtensions[];
+  disabledExtensions: TExtensions[];
 };
 
 export const coreEditorAdditionalSlashCommandOptions = (props: Props): TSlashCommandAdditionalOption[] => {

packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx

@@ -71,7 +71,7 @@ export const BubbleMenuColorSelector: FC<Props> = (props) => {
               <button
                 type="button"
                 className="flex-shrink-0 size-6 grid place-items-center rounded text-custom-text-300 border-[0.5px] border-custom-border-400 hover:bg-custom-background-80 transition-colors"
-                onClick={() => TextColorItem(editor).command({ color: undefined })}
+                onClick={() => TextColorItem(editor).command(undefined)}
               >
                 <Ban className="size-4" />
               </button>
@@ -94,7 +94,7 @@ export const BubbleMenuColorSelector: FC<Props> = (props) => {
               <button
                 type="button"
                 className="flex-shrink-0 size-6 grid place-items-center rounded text-custom-text-300 border-[0.5px] border-custom-border-400 hover:bg-custom-background-80 transition-colors"
-                onClick={() => BackgroundColorItem(editor).command({ color: undefined })}
+                onClick={() => BackgroundColorItem(editor).command(undefined)}
               >
                 <Ban className="size-4" />
               </button>

packages/editor/src/core/components/menus/bubble-menu/root.tsx

@@ -87,9 +87,12 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
   }, []);
 
   return (
-    <BubbleMenu {...bubbleMenuProps}>
+    <BubbleMenu
+      {...bubbleMenuProps}
+      className="flex py-2 divide-x divide-custom-border-200 rounded-lg border border-custom-border-200 bg-custom-background-100 shadow-custom-shadow-rg"
+    >
       {!isSelecting && (
-        <div className="flex py-2 divide-x divide-custom-border-200 rounded-lg border border-custom-border-200 bg-custom-background-100 shadow-custom-shadow-rg">
+        <>
           <div className="px-2">
             {!props.editor.isActive("table") && (
               <BubbleMenuNodeSelector
@@ -158,7 +161,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
               editor.commands.setTextSelection(pos ?? 0);
             }}
           />
-        </div>
+        </>
       )}
     </BubbleMenu>
   );

packages/editor/src/core/components/menus/menu-items.ts

@@ -202,7 +202,8 @@ export const ImageItem = (editor: Editor): EditorMenuItem<"image"> => ({
   key: "image",
   name: "Image",
   isActive: () => editor?.isActive("image") || editor?.isActive("imageComponent"),
-  command: () => insertImage({ editor, event: "insert", pos: editor.state.selection.from }),
+  command: ({ savedSelection }) =>
+    insertImage({ editor, event: "insert", pos: savedSelection?.from ?? editor.state.selection.from }),
   icon: ImageIcon,
 });
 

packages/editor/src/core/constants/document-collaborative-events.ts

@@ -3,6 +3,4 @@ export const DocumentCollaborativeEvents = {
   unlock: { client: "unlocked", server: "unlock" },
   archive: { client: "archived", server: "archive" },
   unarchive: { client: "unarchived", server: "unarchive" },
-  "make-public": { client: "made-public", server: "make-public" },
-  "make-private": { client: "made-private", server: "make-private" },
 } as const;

packages/editor/src/core/extensions/custom-image/components/image-node.tsx

@@ -1,5 +1,5 @@
-import { Editor, NodeViewProps, NodeViewWrapper } from "@tiptap/react";
 import { useEffect, useRef, useState } from "react";
+import { Editor, NodeViewProps, NodeViewWrapper } from "@tiptap/react";
 // extensions
 import { CustomImageBlock, CustomImageUploader, ImageAttributes } from "@/extensions/custom-image";
 

packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsx

@@ -1,5 +1,5 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ExternalLink, Maximize, Minus, Plus, X } from "lucide-react";
-import { useCallback, useEffect, useMemo, useState, useRef } from "react";
 // plane utils
 import { cn } from "@plane/utils";
 
@@ -14,77 +14,46 @@ type Props = {
   toggleFullScreenMode: (val: boolean) => void;
 };
 
-const MIN_ZOOM = 0.5;
-const MAX_ZOOM = 2;
-const ZOOM_SPEED = 0.05;
-const ZOOM_STEPS = [0.5, 1, 1.5, 2];
+const MAGNIFICATION_VALUES = [0.5, 0.75, 1, 1.5, 1.75, 2];
 
 export const ImageFullScreenAction: React.FC<Props> = (props) => {
   const { image, isOpen: isFullScreenEnabled, toggleFullScreenMode } = props;
   const { src, width, aspectRatio } = image;
-
-  const [magnification, setMagnification] = useState<number>(1);
-  const [initialMagnification, setInitialMagnification] = useState(1);
-  const [isDragging, setIsDragging] = useState(false);
-  const dragStart = useRef({ x: 0, y: 0 });
-  const dragOffset = useRef({ x: 0, y: 0 });
+  // states
+  const [magnification, setMagnification] = useState(1);
+  // refs
   const modalRef = useRef<HTMLDivElement>(null);
-  const imgRef = useRef<HTMLImageElement>(null);
-
+  // derived values
   const widthInNumber = useMemo(() => Number(width?.replace("px", "")), [width]);
-
-  const setImageRef = useCallback(
-    (node: HTMLImageElement | null) => {
-      if (!node || !isFullScreenEnabled) return;
-
-      imgRef.current = node;
-
-      const viewportWidth = window.innerWidth * 0.9;
-      const viewportHeight = window.innerHeight * 0.75;
-      const imageWidth = widthInNumber;
-      const imageHeight = imageWidth / aspectRatio;
-
-      const widthRatio = viewportWidth / imageWidth;
-      const heightRatio = viewportHeight / imageHeight;
-
-      setInitialMagnification(Math.min(widthRatio, heightRatio));
-      setMagnification(1);
-
-      // Reset image position
-      node.style.left = "0px";
-      node.style.top = "0px";
-    },
-    [isFullScreenEnabled, widthInNumber, aspectRatio]
-  );
-
+  // close handler
   const handleClose = useCallback(() => {
-    if (isDragging) return;
     toggleFullScreenMode(false);
-    setMagnification(1);
-    setInitialMagnification(1);
-  }, [isDragging, toggleFullScreenMode]);
-
-  const handleMagnification = useCallback((direction: "increase" | "decrease") => {
-    setMagnification((prev) => {
-      // Find the appropriate target zoom level based on current magnification
-      let targetZoom: number;
-      if (direction === "increase") {
-        targetZoom = ZOOM_STEPS.find((step) => step > prev) ?? MAX_ZOOM;
-      } else {
-        // Reverse the array to find the next lower step
-        targetZoom = [...ZOOM_STEPS].reverse().find((step) => step < prev) ?? MIN_ZOOM;
-      }
-
-      // Reset position when zoom matches initial magnification
-      if (targetZoom === 1 && imgRef.current) {
-        imgRef.current.style.left = "0px";
-        imgRef.current.style.top = "0px";
-      }
-
-      return targetZoom;
-    });
-  }, []);
-
+    setTimeout(() => {
+      setMagnification(1);
+    }, 200);
+  }, [toggleFullScreenMode]);
+  // download handler
+  const handleOpenInNewTab = () => {
+    const link = document.createElement("a");
+    link.href = src;
+    link.target = "_blank";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+  // magnification decrease handler
+  const handleDecreaseMagnification = useCallback(() => {
+    const currentIndex = MAGNIFICATION_VALUES.indexOf(magnification);
+    if (currentIndex === 0) return;
+    setMagnification(MAGNIFICATION_VALUES[currentIndex - 1]);
+  }, [magnification]);
+  // magnification increase handler
+  const handleIncreaseMagnification = useCallback(() => {
+    const currentIndex = MAGNIFICATION_VALUES.indexOf(magnification);
+    if (currentIndex === MAGNIFICATION_VALUES.length - 1) return;
+    setMagnification(MAGNIFICATION_VALUES[currentIndex + 1]);
+  }, [magnification]);
+  // keydown handler
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
       if (e.key === "Escape" || e.key === "+" || e.key === "=" || e.key === "-") {
@@ -92,113 +61,43 @@ export const ImageFullScreenAction: React.FC<Props> = (props) => {
         e.stopPropagation();
 
         if (e.key === "Escape") handleClose();
-        if (e.key === "+" || e.key === "=") handleMagnification("increase");
-        if (e.key === "-") handleMagnification("decrease");
+        if (e.key === "+" || e.key === "=") handleIncreaseMagnification();
+        if (e.key === "-") handleDecreaseMagnification();
       }
     },
-    [handleClose, handleMagnification]
+    [handleClose, handleDecreaseMagnification, handleIncreaseMagnification]
   );
+  // click outside handler
+  const handleClickOutside = useCallback(
+    (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+      if (modalRef.current && e.target === modalRef.current) {
+        handleClose();
+      }
+    },
+    [handleClose]
+  );
+  // register keydown listener
+  useEffect(() => {
+    if (isFullScreenEnabled) {
+      document.addEventListener("keydown", handleKeyDown);
 
-  const handleMouseDown = (e: React.MouseEvent) => {
-    if (!imgRef.current) return;
-
-    const imgWidth = imgRef.current.offsetWidth * magnification;
-    const imgHeight = imgRef.current.offsetHeight * magnification;
-    const viewportWidth = window.innerWidth;
-    const viewportHeight = window.innerHeight;
-
-    if (imgWidth > viewportWidth || imgHeight > viewportHeight) {
-      e.preventDefault();
-      e.stopPropagation();
-      setIsDragging(true);
-      dragStart.current = { x: e.clientX, y: e.clientY };
-      dragOffset.current = {
-        x: parseInt(imgRef.current.style.left || "0"),
-        y: parseInt(imgRef.current.style.top || "0"),
+      return () => {
+        document.removeEventListener("keydown", handleKeyDown);
       };
     }
-  };
-
-  const handleMouseMove = useCallback(
-    (e: MouseEvent) => {
-      if (!isDragging || !imgRef.current) return;
-
-      const dx = e.clientX - dragStart.current.x;
-      const dy = e.clientY - dragStart.current.y;
-
-      // Apply the scale factor to the drag movement
-      const scaledDx = dx / magnification;
-      const scaledDy = dy / magnification;
-
-      imgRef.current.style.left = `${dragOffset.current.x + scaledDx}px`;
-      imgRef.current.style.top = `${dragOffset.current.y + scaledDy}px`;
-    },
-    [isDragging, magnification]
-  );
-
-  const handleMouseUp = useCallback(() => {
-    if (!isDragging || !imgRef.current) return;
-    setIsDragging(false);
-  }, [isDragging]);
-
-  const handleWheel = useCallback(
-    (e: WheelEvent) => {
-      if (!imgRef.current || !isFullScreenEnabled) return;
-
-      e.preventDefault();
-
-      // Handle pinch-to-zoom
-      if (e.ctrlKey) {
-        const delta = e.deltaY;
-        setMagnification((prev) => {
-          const newZoom = prev * (1 - delta * ZOOM_SPEED);
-          const clampedZoom = Math.min(Math.max(newZoom, MIN_ZOOM), MAX_ZOOM);
-
-          // Reset position when zoom matches initial magnification
-          if (clampedZoom === 1 && imgRef.current) {
-            imgRef.current.style.left = "0px";
-            imgRef.current.style.top = "0px";
-          }
-
-          return clampedZoom;
-        });
-        return;
-      }
-    },
-    [isFullScreenEnabled, magnification]
-  );
-
-  // Event listeners
-  useEffect(() => {
-    if (!isFullScreenEnabled) return;
-
-    document.addEventListener("keydown", handleKeyDown);
-    window.addEventListener("mousemove", handleMouseMove);
-    window.addEventListener("mouseup", handleMouseUp);
-    window.addEventListener("wheel", handleWheel, { passive: false });
-
-    return () => {
-      document.removeEventListener("keydown", handleKeyDown);
-      window.removeEventListener("mousemove", handleMouseMove);
-      window.removeEventListener("mouseup", handleMouseUp);
-      window.removeEventListener("wheel", handleWheel);
-    };
-  }, [isFullScreenEnabled, handleKeyDown, handleMouseMove, handleMouseUp, handleWheel]);
+  }, [handleKeyDown, isFullScreenEnabled]);
 
   return (
     <>
       <div
-        className={cn("fixed inset-0 size-full z-20 bg-black/90 opacity-0 pointer-events-none transition-opacity", {
-          "opacity-100 pointer-events-auto": isFullScreenEnabled,
-          "cursor-default": !isDragging,
-          "cursor-grabbing": isDragging,
-        })}
+        className={cn(
+          "fixed inset-0 size-full z-20 bg-black/90 opacity-0 pointer-events-none cursor-default transition-opacity",
+          {
+            "opacity-100 pointer-events-auto": isFullScreenEnabled,
+          }
+        )}
       >
-        <div
-          ref={modalRef}
-          onMouseDown={(e) => e.target === modalRef.current && handleClose()}
-          className="relative size-full grid place-items-center overflow-hidden"
-        >
+        <div ref={modalRef} onClick={handleClickOutside} className="relative size-full grid place-items-center">
           <button
             type="button"
             onClick={handleClose}
@@ -207,49 +106,41 @@ export const ImageFullScreenAction: React.FC<Props> = (props) => {
             <X className="size-8 text-white/60 hover:text-white transition-colors" />
           </button>
           <img
-            ref={setImageRef}
             src={src}
-            className="read-only-image rounded-lg"
+            className="read-only-image rounded-lg transition-all duration-200"
             style={{
-              width: `${widthInNumber * initialMagnification}px`,
-              maxWidth: "none",
-              maxHeight: "none",
+              width: `${widthInNumber * magnification}px`,
               aspectRatio,
-              position: "relative",
-              transform: `scale(${magnification})`,
-              transformOrigin: "center",
-              transition: "width 0.2s ease, transform 0.2s ease",
             }}
-            onMouseDown={handleMouseDown}
           />
-          <div className="fixed bottom-10 left-1/2 -translate-x-1/2 flex items-center justify-center gap-1 rounded-md border border-white/20 py-2 divide-x divide-white/20 bg-black">
-            <div className="flex items-center">
-              <button
-                type="button"
-                onClick={() => handleMagnification("decrease")}
-                className="size-6 grid place-items-center text-white/60 hover:text-white disabled:text-white/30 transition-colors duration-200"
-                disabled={magnification <= MIN_ZOOM}
-              >
-                <Minus className="size-4" />
-              </button>
-              <span className="text-sm w-12 text-center text-white">{Math.round(100 * magnification)}%</span>
-              <button
-                type="button"
-                onClick={() => handleMagnification("increase")}
-                className="size-6 grid place-items-center text-white/60 hover:text-white disabled:text-white/30 transition-colors duration-200"
-                disabled={magnification >= MAX_ZOOM}
-              >
-                <Plus className="size-4" />
-              </button>
-            </div>
+        </div>
+        <div className="fixed bottom-10 left-1/2 -translate-x-1/2 flex items-center justify-center gap-1 rounded-md border border-white/20 py-2 divide-x divide-white/20 bg-black">
+          <div className="flex items-center">
             <button
               type="button"
-              onClick={() => window.open(src, "_blank")}
-              className="flex-shrink-0 size-8 grid place-items-center text-white/60 hover:text-white transition-colors duration-200"
+              onClick={handleDecreaseMagnification}
+              className="size-6 grid place-items-center text-white/60 hover:text-white disabled:text-white/30 transition-colors duration-200"
+              disabled={magnification === MAGNIFICATION_VALUES[0]}
             >
-              <ExternalLink className="size-4" />
+              <Minus className="size-4" />
+            </button>
+            <span className="text-sm w-12 text-center text-white">{(100 * magnification).toFixed(0)}%</span>
+            <button
+              type="button"
+              onClick={handleIncreaseMagnification}
+              className="size-6 grid place-items-center text-white/60 hover:text-white disabled:text-white/30 transition-colors duration-200"
+              disabled={magnification === MAGNIFICATION_VALUES[MAGNIFICATION_VALUES.length - 1]}
+            >
+              <Plus className="size-4" />
             </button>
           </div>
+          <button
+            type="button"
+            onClick={handleOpenInNewTab}
+            className="flex-shrink-0 size-8 grid place-items-center text-white/60 hover:text-white transition-colors duration-200"
+          >
+            <ExternalLink className="size-4" />
+          </button>
         </div>
       </div>
       <button