made changes for web-2425

.env.example

@@ -8,13 +8,6 @@ PGDATA="/var/lib/postgresql/data"
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 
-# RabbitMQ Settings
-RABBITMQ_HOST="plane-mq"
-RABBITMQ_PORT="5672"
-RABBITMQ_USER="plane"
-RABBITMQ_PASSWORD="plane"
-RABBITMQ_VHOST="plane"
-
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"

.gitattributes

@@ -1 +0,0 @@
-*.sh text eol=lf

.github/workflows/build-branch.yml

@@ -2,12 +2,6 @@ name: Branch Build
 
 on:
   workflow_dispatch:
-    inputs:
-      arm64:
-        description: "Build for ARM64 architecture"
-        required: false
-        default: false
-        type: boolean
   push:
     branches:
       - master
@@ -17,8 +11,6 @@ on:
 
 env:
   TARGET_BRANCH: ${{ github.ref_name || github.event.release.target_commitish }}
-  ARM64_BUILD: ${{ github.event.inputs.arm64 }}
-  IS_PRERELEASE: ${{ github.event.release.prerelease }}
 
 jobs:
   branch_build_setup:
@@ -35,14 +27,12 @@ jobs:
       build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
       build_space: ${{ steps.changed_files.outputs.space_any_changed }}
       build_web: ${{ steps.changed_files.outputs.web_any_changed }}
-      build_live: ${{ steps.changed_files.outputs.live_any_changed }}
-      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
 
     steps:
       - id: set_env_variables
         name: Set Environment Variables
         run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ] || [ "${{ env.ARM64_BUILD }}" == "true" ] || ([ "${{ github.event_name }}" == "release" ] && [ "${{ env.IS_PRERELEASE }}" != "true" ]); then
+          if [ "${{ env.TARGET_BRANCH }}" == "master" ] || [ "${{ github.event_name }}" == "release" ]; then
             echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
             echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
             echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
@@ -54,8 +44,6 @@ jobs:
             echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
           fi
           echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-          flat_branch_name=$(echo ${{ env.TARGET_BRANCH }} | sed 's/[^a-zA-Z0-9\._]/-/g')
-          echo "FLAT_BRANCH_NAME=${flat_branch_name}" >> $GITHUB_OUTPUT
 
       - id: checkout_files
         name: Checkout Files
@@ -91,21 +79,13 @@ jobs:
               - 'yarn.lock'
               - 'tsconfig.json'
               - 'turbo.json'
-            live:
-              - live/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
 
   branch_build_push_web:
     if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Web Docker Image
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      FRONTEND_TAG: makeplane/plane-frontend:${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      FRONTEND_TAG: makeplane/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -115,10 +95,7 @@ jobs:
       - name: Set Frontend Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-frontend:${{ github.event.release.tag_name }}
-            if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-frontend:stable
-            fi
+            TAG=makeplane/plane-frontend:stable,makeplane/plane-frontend:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
             TAG=makeplane/plane-frontend:latest
           else
@@ -157,11 +134,10 @@ jobs:
 
   branch_build_push_admin:
     if: ${{ needs.branch_build_setup.outputs.build_admin== 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Admin Docker Image
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      ADMIN_TAG: makeplane/plane-admin:${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      ADMIN_TAG: makeplane/plane-admin:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -171,10 +147,7 @@ jobs:
       - name: Set Admin Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-admin:${{ github.event.release.tag_name }}
-            if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-admin:stable
-            fi
+            TAG=makeplane/plane-admin:stable,makeplane/plane-admin:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
             TAG=makeplane/plane-admin:latest
           else
@@ -213,11 +186,10 @@ jobs:
 
   branch_build_push_space:
     if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Space Docker Image
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      SPACE_TAG: makeplane/plane-space:${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      SPACE_TAG: makeplane/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -227,10 +199,7 @@ jobs:
       - name: Set Space Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-space:${{ github.event.release.tag_name }}
-            if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-space:stable
-            fi
+            TAG=makeplane/plane-space:stable,makeplane/plane-space:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
             TAG=makeplane/plane-space:latest
           else
@@ -269,11 +238,10 @@ jobs:
 
   branch_build_push_apiserver:
     if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push API Server Docker Image
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      BACKEND_TAG: makeplane/plane-backend:${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      BACKEND_TAG: makeplane/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -283,10 +251,7 @@ jobs:
       - name: Set Backend Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-backend:${{ github.event.release.tag_name }}
-            if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-backend:stable
-            fi
+            TAG=makeplane/plane-backend:stable,makeplane/plane-backend:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
             TAG=makeplane/plane-backend:latest
           else
@@ -323,69 +288,12 @@ jobs:
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
-  branch_build_push_live:
-    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Live Collaboration Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    env:
-      LIVE_TAG: makeplane/plane-live:${{ needs.branch_build_setup.outputs.flat_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
-    steps:
-      - name: Set Live Docker Tag
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-live:${{ github.event.release.tag_name }}
-            if [ "${{ github.event.release.prerelease }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-live:stable
-            fi
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-live:latest
-          else
-            TAG=${{ env.LIVE_TAG }}
-          fi
-          echo "LIVE_TAG=${TAG}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Build and Push Live Server to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          file: ./live/Dockerfile.live
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.LIVE_TAG }}
-          push: true
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
   branch_build_push_proxy:
     if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Proxy Docker Image
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      PROXY_TAG: makeplane/plane-proxy:${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      PROXY_TAG: makeplane/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -395,10 +303,7 @@ jobs:
       - name: Set Proxy Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-proxy:${{ github.event.release.tag_name }}
-            if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-              TAG=${TAG},makeplane/plane-proxy:stable
-            fi
+            TAG=makeplane/plane-proxy:stable,makeplane/plane-proxy:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
             TAG=makeplane/plane-proxy:latest
           else

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

@@ -8,6 +8,7 @@ on:
 
 env:
   CURRENT_BRANCH: ${{ github.ref_name }}
+  SOURCE_BRANCH: ${{ vars.SYNC_SOURCE_BRANCH_NAME }} # The sync branch such as "sync/ce"
   TARGET_BRANCH: ${{ vars.SYNC_TARGET_BRANCH_NAME }} # The target branch that you would like to merge changes like develop
   GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows
   REVIEWER: ${{ vars.SYNC_PR_REVIEWER }}
@@ -15,7 +16,22 @@ env:
   ACCOUNT_USER_EMAIL: ${{ vars.ACCOUNT_USER_EMAIL }}
 
 jobs:
+  Check_Branch:
+    runs-on: ubuntu-latest
+    outputs:
+      BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }}
+    steps:
+      - name: Check if current branch matches the secret
+        id: check-branch
+        run: |
+          if [ "$CURRENT_BRANCH" = "$SOURCE_BRANCH" ]; then
+            echo "MATCH=true" >> $GITHUB_OUTPUT
+          else
+            echo "MATCH=false" >> $GITHUB_OUTPUT
+          fi
   Create_PR:
+    if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
+    needs: [Check_Branch]
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -43,11 +59,11 @@ jobs:
       - name: Create PR to Target Branch
         run: |
           # get all pull requests and check if there is already a PR
-          PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $CURRENT_BRANCH --state open --json number | jq '.[] | .number')
+          PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $SOURCE_BRANCH --state open --json number | jq '.[] | .number')
           if [ -n "$PR_EXISTS" ]; then
             echo "Pull Request already exists: $PR_EXISTS"
           else
             echo "Creating new pull request"
-            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $CURRENT_BRANCH --title "sync: community changes" --body "")
+            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH --title "sync: community changes" --body "")
             echo "Pull Request created: $PR_URL"
           fi

.github/workflows/repo-sync.yml

@@ -35,9 +35,8 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
-          RUN_ID="${{ github.run_id }}"
           TARGET_REPO="${{ vars.SYNC_TARGET_REPO }}"
-          TARGET_BRANCH="sync/${RUN_ID}"
+          TARGET_BRANCH="${{ vars.SYNC_TARGET_BRANCH_NAME }}"
           SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
 
           git checkout $SOURCE_BRANCH

.idx/dev.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }: {
-
-  # Which nixpkgs channel to use.
-  channel = "stable-23.11"; # or "unstable"
-
-  # Use https://search.nixos.org/packages to find packages
-  packages = [
-    pkgs.nodejs_20
-    pkgs.python3
-  ];
-
-  services.docker.enable = true;
-  services.postgres.enable = true;
-  services.redis.enable = true;
-
-}

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

@@ -10,9 +10,8 @@ import {
 // components
 import { AuthenticationMethodCard } from "@/components/authentication";
 // helpers
+import { UpgradeButton } from "@/components/common/upgrade-button";
 import { getBaseAuthenticationModes } from "@/helpers/authentication.helper";
-// plane admin components
-import { UpgradeButton } from "@/plane-admin/components/common";
 // images
 import OIDCLogo from "@/public/logos/oidc-logo.svg";
 import SAMLLogo from "@/public/logos/saml-logo.svg";
@@ -28,24 +27,24 @@ export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) =>
   updateConfig,
   resolvedTheme,
 }) => [
-  ...getBaseAuthenticationModes({ disabled, updateConfig, resolvedTheme }),
-  {
-    key: "oidc",
-    name: "OIDC",
-    description: "Authenticate your users via the OpenID Connect protocol.",
-    icon: <Image src={OIDCLogo} height={22} width={22} alt="OIDC Logo" />,
-    config: <UpgradeButton />,
-    unavailable: true,
-  },
-  {
-    key: "saml",
-    name: "SAML",
-    description: "Authenticate your users via the Security Assertion Markup Language protocol.",
-    icon: <Image src={SAMLLogo} height={22} width={22} alt="SAML Logo" className="pl-0.5" />,
-    config: <UpgradeButton />,
-    unavailable: true,
-  },
-];
+    ...getBaseAuthenticationModes({ disabled, updateConfig, resolvedTheme }),
+    {
+      key: "oidc",
+      name: "OIDC",
+      description: "Authenticate your users via the OpenID Connect protocol.",
+      icon: <Image src={OIDCLogo} height={22} width={22} alt="OIDC Logo" />,
+      config: <UpgradeButton />,
+      unavailable: true,
+    },
+    {
+      key: "saml",
+      name: "SAML",
+      description: "Authenticate your users via the Security Assertion Markup Language protocol.",
+      icon: <Image src={SAMLLogo} height={22} width={22} alt="SAML Logo" className="pl-0.5" />,
+      config: <UpgradeButton />,
+      unavailable: true,
+    },
+  ];
 
 export const AuthenticationModes: React.FC<TAuthenticationModeProps> = observer((props) => {
   const { disabled, updateConfig } = props;

admin/ce/components/common/index.ts

@@ -1 +0,0 @@
-export * from "./upgrade-button";

admin/ce/store/root.store.ts

@@ -1,19 +0,0 @@
-import { enableStaticRendering } from "mobx-react";
-// stores
-import { CoreRootStore } from "@/store/root.store";
-
-enableStaticRendering(typeof window === "undefined");
-
-export class RootStore extends CoreRootStore {
-  constructor() {
-    super();
-  }
-
-  hydrate(initialData: any) {
-    super.hydrate(initialData);
-  }
-
-  resetOnSignOut() {
-    super.resetOnSignOut();
-  }
-}

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

@@ -2,12 +2,11 @@
 
 import { FC, useEffect, useRef } from "react";
 import { observer } from "mobx-react";
-// plane helpers
-import { useOutsideClickDetector } from "@plane/helpers";
-// components
-import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";
 // hooks
+import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";
 import { useTheme } from "@/hooks/store";
+import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
+// components
 
 export interface IInstanceSidebar {}
 

admin/core/components/authentication/auth-banner.tsx

@@ -1,29 +0,0 @@
-import { FC } from "react";
-import { Info, X } from "lucide-react";
-// helpers
-import { TAuthErrorInfo } from "@/helpers/authentication.helper";
-
-type TAuthBanner = {
-  bannerData: TAuthErrorInfo | undefined;
-  handleBannerData?: (bannerData: TAuthErrorInfo | undefined) => void;
-};
-
-export const AuthBanner: FC<TAuthBanner> = (props) => {
-  const { bannerData, handleBannerData } = props;
-
-  if (!bannerData) return <></>;
-  return (
-    <div className="relative flex items-center p-2 rounded-md gap-2 border border-custom-primary-100/50 bg-custom-primary-100/10">
-      <div className="w-4 h-4 flex-shrink-0 relative flex justify-center items-center">
-        <Info size={16} className="text-custom-primary-100" />
-      </div>
-      <div className="w-full text-sm font-medium text-custom-primary-100">{bannerData?.message}</div>
-      <div
-        className="relative ml-auto w-6 h-6 rounded-sm flex justify-center items-center transition-all cursor-pointer hover:bg-custom-primary-100/20 text-custom-primary-100/80"
-        onClick={() => handleBannerData && handleBannerData(undefined)}
-      >
-        <X className="w-4 h-4 flex-shrink-0" />
-      </div>
-    </div>
-  );
-};

admin/core/components/authentication/index.ts

@@ -1,4 +1,3 @@
-export * from "./auth-banner";
 export * from "./email-config-switch";
 export * from "./password-config-switch";
 export * from "./authentication-method-card";

admin/core/components/common/index.ts

@@ -8,3 +8,4 @@ export * from "./empty-state";
 export * from "./logo-spinner";
 export * from "./page-header";
 export * from "./code-block";
+export * from "./upgrade-button";

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

@@ -8,16 +8,8 @@ import { Button, Input, Spinner } from "@plane/ui";
 // components
 import { Banner } from "@/components/common";
 // helpers
-import {
-  authErrorHandler,
-  EAuthenticationErrorCodes,
-  EErrorAlertType,
-  TAuthErrorInfo,
-} from "@/helpers/authentication.helper";
-
 import { API_BASE_URL } from "@/helpers/common.helper";
 import { AuthService } from "@/services/auth.service";
-import { AuthBanner } from "../authentication";
 // ui
 // icons
 
@@ -61,7 +53,6 @@ export const InstanceSignInForm: FC = (props) => {
   const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
   const [formData, setFormData] = useState<TFormData>(defaultFromData);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [errorInfo, setErrorInfo] = useState<TAuthErrorInfo | undefined>(undefined);
 
   const handleFormChange = (key: keyof TFormData, value: string | boolean) =>
     setFormData((prev) => ({ ...prev, [key]: value }));
@@ -100,15 +91,6 @@ export const InstanceSignInForm: FC = (props) => {
     [formData.email, formData.password, isSubmitting]
   );
 
-  useEffect(() => {
-    if (errorCode) {
-      const errorDetail = authErrorHandler(errorCode?.toString() as EAuthenticationErrorCodes);
-      if (errorDetail) {
-        setErrorInfo(errorDetail);
-      }
-    }
-  }, [errorCode]);
-
   return (
     <div className="flex-grow container mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 py-10 lg:pt-28 transition-all">
       <div className="relative flex flex-col space-y-6">
@@ -121,11 +103,7 @@ export const InstanceSignInForm: FC = (props) => {
           </p>
         </div>
 
-        {errorData.type && errorData?.message ? (
-          <Banner type="error" message={errorData?.message} />
-        ) : (
-          <>{errorInfo && <AuthBanner bannerData={errorInfo} handleBannerData={(value) => setErrorInfo(value)} />}</>
-        )}
+        {errorData.type && errorData?.message && <Banner type="error" message={errorData?.message} />}
 
         <form
           className="space-y-4"

admin/core/hooks/use-outside-click-detector.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import React, { useEffect } from "react";
+
+const useOutsideClickDetector = (ref: React.RefObject<HTMLElement>, callback: () => void) => {
+  const handleClick = (event: MouseEvent) => {
+    if (ref.current && !ref.current.contains(event.target as Node)) {
+      callback();
+    }
+  };
+
+  useEffect(() => {
+    document.addEventListener("mousedown", handleClick);
+
+    return () => {
+      document.removeEventListener("mousedown", handleClick);
+    };
+  });
+};
+
+export default useOutsideClickDetector;

admin/core/layouts/admin-layout.tsx

@@ -18,7 +18,6 @@ export const AdminLayout: FC<TAdminLayout> = observer((props) => {
   const { children } = props;
   // router
   const router = useRouter();
-  // store hooks
   const { isUserLoggedIn } = useUser();
 
   useEffect(() => {

admin/core/lib/store-provider.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { ReactNode, createContext } from "react";
-// plane admin store
-import { RootStore } from "@/plane-admin/store/root.store";
+// store
+import { RootStore } from "@/store/root.store";
 
 let rootStore = new RootStore();
 

admin/core/store/instance.store.ts

@@ -13,7 +13,7 @@ import { EInstanceStatus, TInstanceStatus } from "@/helpers/instance.helper";
 // services
 import { InstanceService } from "@/services/instance.service";
 // root store
-import { CoreRootStore } from "@/store/root.store";
+import { RootStore } from "@/store/root.store";
 
 export interface IInstanceStore {
   // issues
@@ -46,7 +46,7 @@ export class InstanceStore implements IInstanceStore {
   // service
   instanceService;
 
-  constructor(private store: CoreRootStore) {
+  constructor(private store: RootStore) {
     makeObservable(this, {
       // observable
       isLoading: observable.ref,

admin/core/store/root.store.ts

@@ -6,7 +6,7 @@ import { IUserStore, UserStore } from "./user.store";
 
 enableStaticRendering(typeof window === "undefined");
 
-export abstract class CoreRootStore {
+export class RootStore {
   theme: IThemeStore;
   instance: IInstanceStore;
   user: IUserStore;

admin/core/store/theme.store.ts

@@ -1,6 +1,6 @@
 import { action, observable, makeObservable } from "mobx";
 // root store
-import { CoreRootStore } from "@/store/root.store";
+import { RootStore } from "@/store/root.store";
 
 type TTheme = "dark" | "light";
 export interface IThemeStore {
@@ -21,7 +21,7 @@ export class ThemeStore implements IThemeStore {
   isSidebarCollapsed: boolean | undefined = undefined;
   theme: string | undefined = undefined;
 
-  constructor(private store: CoreRootStore) {
+  constructor(private store: RootStore) {
     makeObservable(this, {
       // observables
       isNewUserPopup: observable.ref,

admin/core/store/user.store.ts

@@ -6,7 +6,7 @@ import { EUserStatus, TUserStatus } from "@/helpers/user.helper";
 import { AuthService } from "@/services/auth.service";
 import { UserService } from "@/services/user.service";
 // root store
-import { CoreRootStore } from "@/store/root.store";
+import { RootStore } from "@/store/root.store";
 
 export interface IUserStore {
   // observables
@@ -31,7 +31,7 @@ export class UserStore implements IUserStore {
   userService;
   authService;
 
-  constructor(private store: CoreRootStore) {
+  constructor(private store: RootStore) {
     makeObservable(this, {
       // observables
       isLoading: observable.ref,

admin/ee/components/common/index.ts

@@ -1 +0,0 @@
-export * from "ce/components/common";

admin/ee/store/root.store.ts

@@ -1 +0,0 @@
-export * from "ce/store/root.store";

admin/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.

admin/package.json

@@ -12,10 +12,9 @@
   },
   "dependencies": {
     "@headlessui/react": "^1.7.19",
-    "@plane/constants": "*",
-    "@plane/helpers": "*",
     "@plane/types": "*",
     "@plane/ui": "*",
+    "@plane/constants": "*",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
@@ -30,7 +29,7 @@
     "postcss": "^8.4.38",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-hook-form": "7.51.5",
+    "react-hook-form": "^7.51.0",
     "swr": "^2.2.4",
     "tailwindcss": "3.3.2",
     "uuid": "^9.0.1",
@@ -46,6 +45,6 @@
     "eslint-config-custom": "*",
     "tailwind-config-custom": "*",
     "tsconfig": "*",
-    "typescript": "5.4.5"
+    "typescript": "^5.4.2"
   }
-}
+}

apiserver/.env.example

@@ -15,18 +15,12 @@ POSTGRES_DB="plane"
 POSTGRES_PORT=5432
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
 
+
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
 
-# RabbitMQ Settings
-RABBITMQ_HOST="plane-mq"
-RABBITMQ_PORT="5672"
-RABBITMQ_USER="plane"
-RABBITMQ_PASSWORD="plane"
-RABBITMQ_VHOST="plane"
-
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"

apiserver/plane/api/serializers/__init__.py

@@ -10,7 +10,6 @@ from .issue import (
     IssueAttachmentSerializer,
     IssueActivitySerializer,
     IssueExpandSerializer,
-    IssueLiteSerializer,
 )
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer

apiserver/plane/api/serializers/base.py

@@ -67,7 +67,6 @@ class BaseSerializer(serializers.ModelSerializer):
                     # Import all the expandable serializers
                     from . import (
                         IssueSerializer,
-                        IssueLiteSerializer,
                         ProjectLiteSerializer,
                         StateLiteSerializer,
                         UserLiteSerializer,
@@ -87,7 +86,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         "actor": UserLiteSerializer,
                         "owned_by": UserLiteSerializer,
                         "members": UserLiteSerializer,
-                        "parent": IssueLiteSerializer,
                     }
                     # Check if field in expansion  then expand the field
                     if expand in expansion:

apiserver/plane/api/serializers/issue.py

@@ -1,3 +1,6 @@
+from django.core.exceptions import ValidationError
+from django.core.validators import URLValidator
+
 # Django imports
 from django.utils import timezone
 from lxml import html
@@ -27,9 +30,6 @@ from .module import ModuleLiteSerializer, ModuleSerializer
 from .state import StateLiteSerializer
 from .user import UserLiteSerializer
 
-# Django imports
-from django.core.exceptions import ValidationError
-from django.core.validators import URLValidator
 
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
@@ -274,17 +274,6 @@ class IssueSerializer(BaseSerializer):
         return data
 
 
-class IssueLiteSerializer(BaseSerializer):
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "sequence_id",
-            "project_id",
-        ]
-        read_only_fields = fields
-
-
 class LabelSerializer(BaseSerializer):
     class Meta:
         model = Label
@@ -315,7 +304,7 @@ class IssueLinkSerializer(BaseSerializer):
             "created_at",
             "updated_at",
         ]
-    
+
     def validate_url(self, value):
         # Check URL format
         validate_url = URLValidator()

apiserver/plane/api/serializers/module.py

@@ -71,16 +71,6 @@ class ModuleSerializer(BaseSerializer):
         project_id = self.context["project_id"]
         workspace_id = self.context["workspace_id"]
 
-        module_name = validated_data.get("name")
-        if module_name:
-            # Lookup for the module name in the module table for that project
-            if Module.objects.filter(
-                name=module_name, project_id=project_id
-            ).exists():
-                raise serializers.ValidationError(
-                    {"error": "Module with this name already exists"}
-                )
-
         module = Module.objects.create(**validated_data, project_id=project_id)
         if members is not None:
             ModuleMember.objects.bulk_create(
@@ -103,19 +93,6 @@ class ModuleSerializer(BaseSerializer):
 
     def update(self, instance, validated_data):
         members = validated_data.pop("members", None)
-        module_name = validated_data.get("name")
-        if module_name:
-            # Lookup for the module name in the module table for that project
-            if (
-                Module.objects.filter(
-                    name=module_name, project=instance.project
-                )
-                .exclude(id=instance.id)
-                .exists()
-            ):
-                raise serializers.ValidationError(
-                    {"error": "Module with this name already exists"}
-                )
 
         if members is not None:
             ModuleMember.objects.filter(module=instance).delete()

apiserver/plane/api/views/inbox.py

@@ -1,7 +1,7 @@
 # Python imports
 import json
 
-# Django imports
+# Django improts
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
 from django.db.models import Q, Value, UUIDField
@@ -184,8 +184,13 @@ class InboxIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id
         ).first()
 
+        project = Project.objects.get(
+            workspace__slug=slug,
+            pk=project_id,
+        )
+
         # Inbox view
-        if inbox is None:
+        if inbox is None and not project.inbox_view:
             return Response(
                 {
                     "error": "Inbox is not enabled for this project enable it through the project's api"
@@ -210,7 +215,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
         )
 
         # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
             request.user.id
         ):
             return Response(
@@ -244,8 +249,9 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 project_id=project_id,
             )
-            # Only allow guests to edit name and description
-            if project_member.role <= 5:
+            # Only allow guests and viewers to edit name and description
+            if project_member.role <= 10:
+                # viewers and guests since only viewers and guests
                 issue_data = {
                     "name": issue_data.get("name", issue.name),
                     "description_html": issue_data.get(
@@ -285,7 +291,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                 )
 
         # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 5:
+        if project_member.role > 10:
             serializer = InboxIssueSerializer(
                 inbox_issue, data=request.data, partial=True
             )

apiserver/plane/api/views/member.py

@@ -133,7 +133,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
             workspace_member = WorkspaceMember.objects.create(
                 workspace=workspace,
                 member=user,
-                role=request.data.get("role", 5),
+                role=request.data.get("role", 10),
             )
             workspace_member.save()
 
@@ -142,7 +142,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
             project_member = ProjectMember.objects.create(
                 project=project,
                 member=user,
-                role=request.data.get("role", 5),
+                role=request.data.get("role", 10),
             )
             project_member.save()
 

apiserver/plane/api/views/module.py

@@ -298,11 +298,7 @@ class ModuleAPIEndpoint(BaseAPIView):
             actor_id=str(request.user.id),
             issue_id=None,
             project_id=str(project_id),
-            current_instance=json.dumps(
-                {
-                    "module_name": str(module.name),
-                }
-            ),
+            current_instance=None,
             epoch=int(timezone.now().timestamp()),
         )
         module.delete()

apiserver/plane/app/permissions/base.py

@@ -8,6 +8,7 @@ from enum import Enum
 class ROLE(Enum):
     ADMIN = 20
     MEMBER = 15
+    VIEWER = 10
     GUEST = 5
 
 

apiserver/plane/app/permissions/project.py

@@ -7,6 +7,7 @@ from plane.db.models import ProjectMember, WorkspaceMember
 # Permission Mappings
 Admin = 20
 Member = 15
+Viewer = 10
 Guest = 5
 
 

apiserver/plane/app/permissions/workspace.py

@@ -6,8 +6,9 @@ from plane.db.models import WorkspaceMember
 
 
 # Permission Mappings
-Admin = 20
-Member = 15
+Owner = 20
+Admin = 15
+Member = 10
 Guest = 5
 
 
@@ -30,7 +31,7 @@ class WorkSpaceBasePermission(BasePermission):
             return WorkspaceMember.objects.filter(
                 member=request.user,
                 workspace__slug=view.workspace_slug,
-                role__in=[Admin, Member],
+                role__in=[Owner, Admin],
                 is_active=True,
             ).exists()
 
@@ -39,7 +40,7 @@ class WorkSpaceBasePermission(BasePermission):
             return WorkspaceMember.objects.filter(
                 member=request.user,
                 workspace__slug=view.workspace_slug,
-                role=Admin,
+                role=Owner,
                 is_active=True,
             ).exists()
 
@@ -52,7 +53,7 @@ class WorkspaceOwnerPermission(BasePermission):
         return WorkspaceMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role=Admin,
+            role=Owner,
         ).exists()
 
 
@@ -64,7 +65,7 @@ class WorkSpaceAdminPermission(BasePermission):
         return WorkspaceMember.objects.filter(
             member=request.user,
             workspace__slug=view.workspace_slug,
-            role__in=[Admin, Member],
+            role__in=[Owner, Admin],
             is_active=True,
         ).exists()
 
@@ -85,7 +86,7 @@ class WorkspaceEntityPermission(BasePermission):
         return WorkspaceMember.objects.filter(
             member=request.user,
             workspace__slug=view.workspace_slug,
-            role__in=[Admin, Member],
+            role__in=[Owner, Admin],
             is_active=True,
         ).exists()
 

apiserver/plane/app/serializers/__init__.py

@@ -44,7 +44,6 @@ from .cycle import (
     CycleIssueSerializer,
     CycleWriteSerializer,
     CycleUserPropertiesSerializer,
-    CycleAnalyticsSerializer,
 )
 from .asset import FileAssetSerializer
 from .issue import (
@@ -93,7 +92,6 @@ from .page import (
     SubPageSerializer,
     PageDetailSerializer,
     PageVersionSerializer,
-    PageVersionDetailSerializer,
 )
 
 from .estimate import (

apiserver/plane/app/serializers/cycle.py

@@ -7,7 +7,6 @@ from .issue import IssueStateSerializer
 from plane.db.models import (
     Cycle,
     CycleIssue,
-    CycleAnalytics,
     CycleUserProperties,
 )
 
@@ -94,7 +93,6 @@ class CycleIssueSerializer(BaseSerializer):
             "cycle",
         ]
 
-
 class CycleUserPropertiesSerializer(BaseSerializer):
     class Meta:
         model = CycleUserProperties
@@ -104,9 +102,3 @@ class CycleUserPropertiesSerializer(BaseSerializer):
             "project",
             "cycle" "user",
         ]
-
-
-class CycleAnalyticsSerializer(BaseSerializer):
-    class Meta:
-        model = CycleAnalytics
-        fields = "__all__"

apiserver/plane/app/serializers/issue.py

@@ -437,21 +437,17 @@ class IssueLinkSerializer(BaseSerializer):
             "issue",
         ]
 
-    def to_internal_value(self, data):
-        # Modify the URL before validation by appending http:// if missing
-        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):
-        # Use Django's built-in URLValidator for validation
-        url_validator = URLValidator()
+        # Check URL format
+        validate_url = URLValidator()
         try:
-            url_validator(value)
+            validate_url(value)
         except ValidationError:
-            raise serializers.ValidationError({"error": "Invalid URL format."})
+            raise serializers.ValidationError("Invalid URL format.")
+
+        # Check URL scheme
+        if not value.startswith(("http://", "https://")):
+            raise serializers.ValidationError("Invalid URL scheme.")
 
         return value
 
@@ -537,7 +533,7 @@ class IssueReactionSerializer(BaseSerializer):
             "project",
             "issue",
             "actor",
-            "deleted_at",
+            "deleted_at"
         ]
 
 
@@ -556,13 +552,7 @@ class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
         fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "comment",
-            "actor",
-            "deleted_at",
-        ]
+        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
 
 
 class IssueVoteSerializer(BaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -5,10 +5,6 @@ from rest_framework import serializers
 from .base import BaseSerializer, DynamicBaseSerializer
 from .project import ProjectLiteSerializer
 
-# Django imports
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
-
 from plane.db.models import (
     User,
     Module,
@@ -68,16 +64,6 @@ class ModuleWriteSerializer(BaseSerializer):
         members = validated_data.pop("member_ids", None)
         project = self.context["project"]
 
-        module_name = validated_data.get("name")
-        if module_name:
-            # Lookup for the module name in the module table for that project
-            if Module.objects.filter(
-                name=module_name, project=project
-            ).exists():
-                raise serializers.ValidationError(
-                    {"error": "Module with this name already exists"}
-                )
-
         module = Module.objects.create(**validated_data, project=project)
         if members is not None:
             ModuleMember.objects.bulk_create(
@@ -100,19 +86,6 @@ class ModuleWriteSerializer(BaseSerializer):
 
     def update(self, instance, validated_data):
         members = validated_data.pop("member_ids", None)
-        module_name = validated_data.get("name")
-        if module_name:
-            # Lookup for the module name in the module table for that project
-            if (
-                Module.objects.filter(
-                    name=module_name, project=instance.project
-                )
-                .exclude(id=instance.id)
-                .exists()
-            ):
-                raise serializers.ValidationError(
-                    {"error": "Module with this name already exists"}
-                )
 
         if members is not None:
             ModuleMember.objects.filter(module=instance).delete()
@@ -182,48 +155,16 @@ class ModuleLinkSerializer(BaseSerializer):
             "module",
         ]
 
-    def to_internal_value(self, data):
-        # Modify the URL before validation by appending http:// if missing
-        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):
-        # Use Django's built-in URLValidator for validation
-        url_validator = URLValidator()
-        try:
-            url_validator(value)
-        except ValidationError:
-            raise serializers.ValidationError({"error": "Invalid URL format."})
-
-        return value
-
+    # Validation if url already exists
     def create(self, validated_data):
-        validated_data["url"] = self.validate_url(validated_data.get("url"))
         if ModuleLink.objects.filter(
             url=validated_data.get("url"),
             module_id=validated_data.get("module_id"),
         ).exists():
-            raise serializers.ValidationError({"error": "URL already exists."})
-        return super().create(validated_data)
-
-    def update(self, instance, validated_data):
-        validated_data["url"] = self.validate_url(validated_data.get("url"))
-        if (
-            ModuleLink.objects.filter(
-                url=validated_data.get("url"),
-                module_id=instance.module_id,
-            )
-            .exclude(pk=instance.id)
-            .exists()
-        ):
             raise serializers.ValidationError(
                 {"error": "URL already exists for this Issue"}
             )
-
-        return super().update(instance, validated_data)
+        return ModuleLink.objects.create(**validated_data)
 
 
 class ModuleSerializer(DynamicBaseSerializer):
@@ -288,14 +229,7 @@ class ModuleDetailSerializer(ModuleSerializer):
     cancelled_estimate_points = serializers.FloatField(read_only=True)
 
     class Meta(ModuleSerializer.Meta):
-        fields = ModuleSerializer.Meta.fields + [
-            "link_module",
-            "sub_issues",
-            "backlog_estimate_points",
-            "unstarted_estimate_points",
-            "started_estimate_points",
-            "cancelled_estimate_points",
-        ]
+        fields = ModuleSerializer.Meta.fields + ["link_module", "sub_issues", "backlog_estimate_points", "unstarted_estimate_points", "started_estimate_points", "cancelled_estimate_points"]
 
 
 class ModuleUserPropertiesSerializer(BaseSerializer):

apiserver/plane/app/serializers/page.py

@@ -167,40 +167,7 @@ class PageLogSerializer(BaseSerializer):
 class PageVersionSerializer(BaseSerializer):
     class Meta:
         model = PageVersion
-        fields = [
-            "id",
-            "workspace",
-            "page",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-        read_only_fields = [
-            "workspace",
-            "page",
-        ]
-
-
-class PageVersionDetailSerializer(BaseSerializer):
-    class Meta:
-        model = PageVersion
-        fields = [
-            "id",
-            "workspace",
-            "page",
-            "last_saved_at",
-            "description_binary",
-            "description_html",
-            "description_json",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
+        fields = "__all__"
         read_only_fields = [
             "workspace",
             "page",

apiserver/plane/app/serializers/user.py

@@ -16,39 +16,26 @@ from .base import BaseSerializer
 class UserSerializer(BaseSerializer):
     class Meta:
         model = User
-        # Exclude password field from the serializer
-        fields = [
-            field.name
-            for field in User._meta.fields
-            if field.name != "password"
-        ]
-        # Make all system fields and email read only
+        fields = "__all__"
         read_only_fields = [
             "id",
-            "username",
-            "mobile_number",
-            "email",
-            "token",
             "created_at",
             "updated_at",
             "is_superuser",
             "is_staff",
-            "is_managed",
             "last_active",
             "last_login_time",
             "last_logout_time",
             "last_login_ip",
             "last_logout_ip",
             "last_login_uagent",
-            "last_location",
-            "last_login_medium",
-            "created_location",
+            "token_updated_at",
             "is_bot",
             "is_password_autoset",
             "is_email_verified",
             "is_active",
-            "token_updated_at",
         ]
+        extra_kwargs = {"password": {"write_only": True}}
 
         # If the user has already filled first name or last name then he is onboarded
         def get_is_onboarded(self, obj):
@@ -176,7 +163,6 @@ class UserAdminLiteSerializer(BaseSerializer):
             "is_bot",
             "display_name",
             "email",
-            "last_login_medium",
         ]
         read_only_fields = [
             "id",
@@ -222,15 +208,9 @@ class ProfileSerializer(BaseSerializer):
     class Meta:
         model = Profile
         fields = "__all__"
-        read_only_fields = [
-            "user",
-        ]
 
 
 class AccountSerializer(BaseSerializer):
     class Meta:
         model = Account
         fields = "__all__"
-        read_only_fields = [
-            "user",
-        ]

apiserver/plane/app/serializers/webhook.py

@@ -40,7 +40,7 @@ class WebhookSerializer(DynamicBaseSerializer):
 
         for addr in ip_addresses:
             ip = ipaddress.ip_address(addr[4][0])
-            if ip.is_loopback:
+            if ip.is_private or ip.is_loopback:
                 raise serializers.ValidationError(
                     {"url": "URL resolves to a blocked IP address."}
                 )
@@ -92,7 +92,7 @@ class WebhookSerializer(DynamicBaseSerializer):
 
             for addr in ip_addresses:
                 ip = ipaddress.ip_address(addr[4][0])
-                if ip.is_loopback:
+                if ip.is_private or ip.is_loopback:
                     raise serializers.ValidationError(
                         {"url": "URL resolves to a blocked IP address."}
                     )

apiserver/plane/app/urls/cycle.py

@@ -6,10 +6,7 @@ from plane.app.views import (
     CycleIssueViewSet,
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
-    CycleProgressEndpoint,
-    CycleAnalyticsEndpoint,
     TransferCycleIssueEndpoint,
-    CycleIssueStateAnalyticsEndpoint,
     CycleUserPropertiesEndpoint,
     CycleArchiveUnarchiveEndpoint,
 )
@@ -109,19 +106,4 @@ urlpatterns = [
         CycleArchiveUnarchiveEndpoint.as_view(),
         name="cycle-archive-unarchive",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/progress/",
-        CycleProgressEndpoint.as_view(),
-        name="project-cycle",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/analytics/",
-        CycleAnalyticsEndpoint.as_view(),
-        name="project-cycle",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-progress/",
-        CycleIssueStateAnalyticsEndpoint.as_view(),
-        name="project-cycle-progress",
-    ),
 ]

apiserver/plane/app/urls/issue.py

@@ -20,7 +20,6 @@ from plane.app.views import (
     IssueViewSet,
     LabelViewSet,
     BulkArchiveIssuesEndpoint,
-    IssuePaginatedViewSet,
 )
 
 urlpatterns = [
@@ -39,12 +38,6 @@ urlpatterns = [
         ),
         name="project-issue",
     ),
-    # updated v1 paginated issues
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/v2/issues/",
-        IssuePaginatedViewSet.as_view({"get": "list"}),
-        name="project-issues-paginated",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:pk>/",
         IssueViewSet.as_view(
@@ -310,5 +303,5 @@ urlpatterns = [
             }
         ),
         name="project-issue-draft",
-    ),
+    )
 ]

apiserver/plane/app/views/__init__.py

@@ -98,11 +98,10 @@ from .cycle.base import (
     CycleUserPropertiesEndpoint,
     CycleViewSet,
     TransferCycleIssueEndpoint,
-    CycleAnalyticsEndpoint,
-    CycleProgressEndpoint,
-    CycleIssueStateAnalyticsEndpoint,
 )
-from .cycle.issue import CycleIssueViewSet
+from .cycle.issue import (
+    CycleIssueViewSet,
+)
 from .cycle.archive import (
     CycleArchiveUnarchiveEndpoint,
 )
@@ -113,7 +112,6 @@ from .issue.base import (
     IssueViewSet,
     IssueUserDisplayPropertyEndpoint,
     BulkDeleteIssuesEndpoint,
-    IssuePaginatedViewSet,
 )
 
 from .issue.activity import (

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

@@ -21,11 +21,7 @@ from plane.app.permissions import allow_permission, ROLE
 class AnalyticsEndpoint(BaseAPIView):
 
     @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ],
-        level="WORKSPACE",
+        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
     )
     def get(self, request, slug):
         x_axis = request.GET.get("x_axis", False)
@@ -207,11 +203,7 @@ class AnalyticViewViewset(BaseViewSet):
 class SavedAnalyticEndpoint(BaseAPIView):
 
     @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ],
-        level="WORKSPACE",
+        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
     )
     def get(self, request, slug, analytic_id):
         analytic_view = AnalyticView.objects.get(
@@ -244,11 +236,7 @@ class SavedAnalyticEndpoint(BaseAPIView):
 class ExportAnalyticsEndpoint(BaseAPIView):
 
     @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ],
-        level="WORKSPACE",
+        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
     )
     def post(self, request, slug):
         x_axis = request.data.get("x_axis", False)
@@ -314,7 +302,9 @@ class ExportAnalyticsEndpoint(BaseAPIView):
 
 class DefaultAnalyticsEndpoint(BaseAPIView):
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
+    @allow_permission(
+        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST], level="WORKSPACE"
+    )
     def get(self, request, slug):
         filters = issue_filters(request.GET, "GET")
         base_issues = Issue.issue_objects.filter(

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

@@ -288,12 +288,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             .distinct()
         )
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def get(self, request, slug, project_id, pk=None):
         if pk is None:
             queryset = (

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

@@ -24,8 +24,6 @@ from plane.db.models import (
     Issue,
     IssueAttachment,
     IssueLink,
-    CycleIssueStateProgress,
-    Project,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -82,12 +80,7 @@ class CycleIssueViewSet(BaseViewSet):
         )
 
     @method_decorator(gzip_page)
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def list(self, request, slug, project_id, cycle_id):
         order_by_param = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
@@ -270,10 +263,6 @@ class CycleIssueViewSet(BaseViewSet):
         ]
         new_issues = list(set(issues) - set(existing_issues))
 
-        # Fetch issue details
-        issue_objects = Issue.objects.filter(id__in=new_issues)
-        issue_dict = {issue.id: issue for issue in issue_objects}
-
         # New issues to create
         created_records = CycleIssue.objects.bulk_create(
             [
@@ -290,42 +279,6 @@ class CycleIssueViewSet(BaseViewSet):
             batch_size=10,
         )
 
-        # estimate_type = Project.objects.filter(
-        #     workspace__slug=slug,
-        #     pk=project_id,
-        #     estimate__isnull=False,
-        #     estimate__type="points",
-        # ).exists()
-
-        # for issue_id in new_issues:
-        #     print(issue_id, "issue id")
-        #     print(issue_dict[issue_id].state_id, "state_id")
-
-        # CycleIssueStateProgress.objects.bulk_create(
-        #     [
-        #         CycleIssueStateProgress(
-        #             cycle_id=cycle_id,
-        #             state_id=str(issue_dict[issue_id].state_id),
-        #             issue_id=issue_id,
-        #             state_group=issue_dict[issue_id].state.group,
-        #             type="ADDED",
-        #             estimate_id=issue_dict[issue_id].estimate_id,
-        #             estimate_value=(
-        #                 issue_dict[issue_id].estimate_point.value
-        #                 if estimate_type
-        #                 else None
-        #             ),
-        #             project_id=project_id,
-        #             workspace_id=cycle.workspace_id,
-        #             created_by_id=request.user.id,
-        #             updated_by_id=request.user.id,
-        #         )
-        #         print(issue_id, "issue id")
-        #         for issue_id in new_issues
-        #     ],
-        #     batch_size=10,
-        # )
-
         # Updated Issues
         updated_records = []
         update_cycle_issue_activity = []
@@ -378,28 +331,6 @@ class CycleIssueViewSet(BaseViewSet):
             project_id=project_id,
             cycle_id=cycle_id,
         )
-        issue = Issue.objects.get(pk=issue_id)
-        estimate_type = Project.objects.filter(
-            workspace__slug=slug,
-            pk=project_id,
-            estimate__isnull=False,
-            estimate__type="points",
-        ).exists()
-
-        CycleIssueStateProgress.objects.create(
-            cycle_id=cycle_id,
-            state_id=issue.state_id,
-            issue_id=issue_id,
-            state_group=issue.state.group,
-            type="REMOVED",
-            estimate_id=issue.estimate_id,
-            estimate_value=(
-                issue.estimate_point.value if estimate_type else None
-            ),
-            project_id=project_id,
-            created_by_id=request.user.id,
-            updated_by_id=request.user.id,
-        )
         issue_activity.delay(
             type="cycle.activity.deleted",
             requested_data=json.dumps(

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

@@ -52,28 +52,23 @@ from .. import BaseAPIView
 
 
 def dashboard_overview_stats(self, request, slug):
+    extra_filters = {}
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug,
+        member=request.user,
+        role=5,
+        is_active=True,
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
     assigned_issues = (
         Issue.issue_objects.filter(
             project__project_projectmember__is_active=True,
             project__project_projectmember__member=request.user,
             workspace__slug=slug,
             assignees__in=[request.user],
-        ).filter(
-            Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=True,
-            )
-            | Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=False,
-                created_by=self.request.user,
-            )
-            |
-            # For other roles (role < 5), show all issues
-            Q(project__project_projectmember__role__gt=5),
-            project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
         )
+        .filter(**extra_filters)
         .count()
     )
 
@@ -85,22 +80,8 @@ def dashboard_overview_stats(self, request, slug):
             project__project_projectmember__member=request.user,
             workspace__slug=slug,
             assignees__in=[request.user],
-        ).filter(
-            Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=True,
-            )
-            | Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=False,
-                created_by=self.request.user,
-            )
-            |
-            # For other roles (role < 5), show all issues
-            Q(project__project_projectmember__role__gt=5),
-            project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
         )
+        .filter(**extra_filters)
         .count()
     )
 
@@ -110,22 +91,8 @@ def dashboard_overview_stats(self, request, slug):
             project__project_projectmember__is_active=True,
             project__project_projectmember__member=request.user,
             created_by_id=request.user.id,
-        ).filter(
-            Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=True,
-            )
-            | Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=False,
-                created_by=self.request.user,
-            )
-            |
-            # For other roles (role < 5), show all issues
-            Q(project__project_projectmember__role__gt=5),
-            project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
         )
+        .filter(**extra_filters)
         .count()
     )
 
@@ -136,22 +103,8 @@ def dashboard_overview_stats(self, request, slug):
             project__project_projectmember__member=request.user,
             assignees__in=[request.user],
             state__group="completed",
-        ).filter(
-            Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=True,
-            )
-            | Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=False,
-                created_by=self.request.user,
-            )
-            |
-            # For other roles (role < 5), show all issues
-            Q(project__project_projectmember__role__gt=5),
-            project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
         )
+        .filter(**extra_filters)
         .count()
     )
 
@@ -621,42 +574,105 @@ def dashboard_recent_projects(self, request, slug):
 
 
 def dashboard_recent_collaborators(self, request, slug):
-    project_members_with_activities = (
-        WorkspaceMember.objects.filter(
+    # Subquery to count activities for each project member
+    activity_count_subquery = (
+        IssueActivity.objects.filter(
             workspace__slug=slug,
+            actor=OuterRef("member"),
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+        )
+        .values("actor")
+        .annotate(num_activities=Count("pk"))
+        .values("num_activities")
+    )
+
+    # Get all project members and annotate them with activity counts
+    project_members_with_activities = (
+        ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
             is_active=True,
         )
         .annotate(
-            active_issue_count=Count(
-                Case(
-                    When(
-                        member__issue_assignee__issue__state__group__in=[
-                            "unstarted",
-                            "started",
-                        ],
-                        member__issue_assignee__issue__workspace__slug=slug,
-                        member__issue_assignee__issue__project__project_projectmember__member=request.user,
-                        member__issue_assignee__issue__project__project_projectmember__is_active=True,
-                        then=F("member__issue_assignee__issue__id"),
-                    ),
-                    distinct=True,
-                    output_field=IntegerField(),
-                ),
-                distinct=True,
+            num_activities=Coalesce(
+                Subquery(activity_count_subquery),
+                Value(0),
+                output_field=IntegerField(),
+            ),
+            is_current_user=Case(
+                When(member=request.user, then=Value(0)),
+                default=Value(1),
+                output_field=IntegerField(),
             ),
-            user_id=F("member_id"),
         )
-        .values("user_id", "active_issue_count")
-        .order_by("-active_issue_count")
+        .values_list("member", flat=True)
+        .order_by("is_current_user", "-num_activities")
         .distinct()
     )
-    return Response(
-        (project_members_with_activities),
-        status=status.HTTP_200_OK,
+    search = request.query_params.get("search", None)
+    if search:
+        project_members_with_activities = (
+            project_members_with_activities.filter(
+                Q(member__display_name__icontains=search)
+                | Q(member__first_name__icontains=search)
+                | Q(member__last_name__icontains=search)
+            )
+        )
+
+    return self.paginate(
+        request=request,
+        queryset=project_members_with_activities,
+        controller=lambda qs: self.get_results_controller(qs, slug),
     )
 
 
 class DashboardEndpoint(BaseAPIView):
+    def get_results_controller(self, project_members_with_activities, slug):
+        user_active_issue_counts = (
+            User.objects.filter(
+                id__in=project_members_with_activities,
+            )
+            .annotate(
+                active_issue_count=Count(
+                    Case(
+                        When(
+                            issue_assignee__issue__state__group__in=[
+                                "unstarted",
+                                "started",
+                            ],
+                            issue_assignee__issue__workspace__slug=slug,
+                            issue_assignee__issue__project__project_projectmember__is_active=True,
+                            then=F("issue_assignee__issue__id"),
+                        ),
+                        output_field=IntegerField(),
+                    ),
+                    distinct=True,
+                )
+            )
+            .values("active_issue_count", user_id=F("id"))
+        )
+        # Create a dictionary to store the active issue counts by user ID
+        active_issue_counts_dict = {
+            user["user_id"]: user["active_issue_count"]
+            for user in user_active_issue_counts
+        }
+
+        # Preserve the sequence of project members with activities
+        paginated_results = [
+            {
+                "user_id": member_id,
+                "active_issue_count": active_issue_counts_dict.get(
+                    member_id, 0
+                ),
+            }
+            for member_id in project_members_with_activities
+        ]
+        return paginated_results
+
     def create(self, request, slug):
         serializer = DashboardSerializer(data=request.data)
         if serializer.is_valid():

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

@@ -28,12 +28,7 @@ def generate_random_name(length=10):
 
 class ProjectEstimatePointEndpoint(BaseAPIView):
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def get(self, request, slug, project_id):
         project = Project.objects.get(workspace__slug=slug, pk=project_id)
         if project.estimate_id is not None:

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

@@ -16,7 +16,9 @@ from rest_framework.response import Response
 
 # Module imports
 from ..base import BaseViewSet
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import (
+    allow_permission, ROLE
+)
 from plane.db.models import (
     Inbox,
     InboxIssue,
@@ -165,12 +167,11 @@ class InboxIssueViewSet(BaseViewSet):
             )
         ).distinct()
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def list(self, request, slug, project_id):
-        inbox_id = Inbox.objects.get(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
-        )
-        project = Project.objects.get(pk=project_id) 
+        ).first()
         filters = issue_filters(request.GET, "GET", "issue__")
         inbox_issue = (
             InboxIssue.objects.filter(
@@ -200,16 +201,13 @@ class InboxIssueViewSet(BaseViewSet):
         if inbox_status:
             inbox_issue = inbox_issue.filter(status__in=inbox_status)
 
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-        ):
+        if ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            role=5,
+            is_active=True,
+        ).exists():
             inbox_issue = inbox_issue.filter(created_by=request.user)
         return self.paginate(
             request=request,
@@ -342,7 +340,7 @@ class InboxIssueViewSet(BaseViewSet):
             is_active=True,
         )
         # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
             request.user.id
         ):
             return Response(
@@ -375,8 +373,9 @@ class InboxIssueViewSet(BaseViewSet):
                 workspace__slug=slug,
                 project_id=project_id,
             )
-            # Only allow guests to edit name and description
-            if project_member.role <= 5:
+            # Only allow guests and viewers to edit name and description
+            if project_member.role <= 10:
+                # viewers and guests since only viewers and guests
                 issue_data = {
                     "name": issue_data.get("name", issue.name),
                     "description_html": issue_data.get(
@@ -418,7 +417,7 @@ class InboxIssueViewSet(BaseViewSet):
                 )
 
         # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 5:
+        if project_member.role > 10:
             serializer = InboxIssueSerializer(
                 inbox_issue, data=request.data, partial=True
             )
@@ -518,19 +517,14 @@ class InboxIssueViewSet(BaseViewSet):
             return Response(serializer, status=status.HTTP_200_OK)
 
     @allow_permission(
-        allowed_roles=[
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER],
         creator=True,
         model=Issue,
     )
     def retrieve(self, request, slug, project_id, pk):
-        inbox_id = Inbox.objects.get(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
-        )
-        project = Project.objects.get(pk=project_id)
+        ).first()
         inbox_issue = (
             InboxIssue.objects.select_related("issue")
             .prefetch_related(
@@ -557,21 +551,6 @@ class InboxIssueViewSet(BaseViewSet):
             )
             .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id)
         )
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not inbox_issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         issue = InboxIssueDetailSerializer(inbox_issue).data
         return Response(
             issue,

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

@@ -19,11 +19,7 @@ from plane.app.serializers import (
     IssueActivitySerializer,
     IssueCommentSerializer,
 )
-from plane.app.permissions import (
-    ProjectEntityPermission,
-    allow_permission,
-    ROLE,
-)
+from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
 from plane.db.models import (
     IssueActivity,
     IssueComment,
@@ -37,13 +33,7 @@ class IssueActivityEndpoint(BaseAPIView):
     ]
 
     @method_decorator(gzip_page)
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def get(self, request, slug, project_id, issue_id):
         filters = {}
         if request.GET.get("created_at__gt", None) is not None:

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

@@ -97,12 +97,7 @@ class IssueArchiveViewSet(BaseViewSet):
         )
 
     @method_decorator(gzip_page)
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def list(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
         show_sub_issues = request.GET.get("show_sub_issues", "true")
@@ -218,12 +213,7 @@ class IssueArchiveViewSet(BaseViewSet):
                 ),
             )
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def retrieve(self, request, slug, project_id, pk=None):
         issue = (
             self.get_queryset()

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

@@ -64,13 +64,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def get(self, request, slug, project_id, issue_id):
         issue_attachments = IssueAttachment.objects.filter(
             issue_id=issue_id, workspace__slug=slug, project_id=project_id

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

@@ -42,7 +42,6 @@ from plane.db.models import (
     IssueSubscriber,
     Project,
     ProjectMember,
-    CycleIssueStateProgress,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -58,12 +57,11 @@ from plane.utils.paginator import (
 from .. import BaseAPIView, BaseViewSet
 from plane.utils.user_timezone_converter import user_timezone_converter
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.utils.global_paginator import paginate
-from plane.bgtasks.webhook_task import model_activity
 
 
 class IssueListEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def get(self, request, slug, project_id):
         issue_ids = request.GET.get("issues", False)
 
@@ -233,9 +231,8 @@ class IssueViewSet(BaseViewSet):
         ).distinct()
 
     @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def list(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
         filters = issue_filters(request.query_params, "GET")
         order_by_param = request.GET.get("order_by", "-created_at")
 
@@ -266,16 +263,13 @@ class IssueViewSet(BaseViewSet):
             entity_identifier=project_id,
             user_id=request.user.id,
         )
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-        ):
+        if ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            role=5,
+            is_active=True,
+        ).exists():
             issue_queryset = issue_queryset.filter(created_by=request.user)
 
         if group_by:
@@ -431,31 +425,13 @@ class IssueViewSet(BaseViewSet):
             issue = user_timezone_converter(
                 issue, datetime_fields, request.user.user_timezone
             )
-            # Send the model activity
-            model_activity.delay(
-                model_name="issue",
-                model_id=str(serializer.data["id"]),
-                requested_data=request.data,
-                current_instance=None,
-                actor_id=request.user.id,
-                slug=slug,
-                origin=request.META.get("HTTP_ORIGIN"),
-            )
             return Response(issue, 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,
-        ],
-        creator=True,
-        model=Issue,
+        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], creator=True, model=Issue
     )
     def retrieve(self, request, slug, project_id, pk=None):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-
         issue = (
             self.get_queryset()
             .filter(pk=pk)
@@ -524,29 +500,6 @@ class IssueViewSet(BaseViewSet):
                 status=status.HTTP_404_NOT_FOUND,
             )
 
-        """
-        if the role is guest and guest_view_all_features is false and owned by is not 
-        the requesting user then dont show the issue
-        """
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-
         recent_visited_task.delay(
             slug=slug,
             entity_name="issue",
@@ -558,9 +511,7 @@ class IssueViewSet(BaseViewSet):
         serializer = IssueDetailSerializer(issue, expand=self.expand)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], creator=True, model=Issue
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def partial_update(self, request, slug, project_id, pk=None):
         issue = (
             self.get_queryset()
@@ -604,29 +555,6 @@ class IssueViewSet(BaseViewSet):
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
-        estimate_type = Project.objects.filter(
-            workspace__slug=slug,
-            pk=project_id,
-            estimate__isnull=False,
-            estimate__type="points",
-        ).exists()
-
-        if issue.cycle_id:
-            CycleIssueStateProgress.objects.create(
-                cycle_id=issue.cycle_id,
-                state_id=issue.state_id,
-                issue_id=issue.id,
-                state_group=issue.state.group,
-                type="UPDATED",
-                estimate_id=issue.estimate_point_id,
-                estimate_value=(
-                    issue.estimate_point.value if estimate_type else None
-                ),
-                project_id=project_id,
-                workspace_id=issue.workspace_id,
-                created_by_id=request.user.id,
-                updated_by_id=request.user.id,
-            )
 
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
         serializer = IssueCreateSerializer(
@@ -645,15 +573,7 @@ class IssueViewSet(BaseViewSet):
                 notification=True,
                 origin=request.META.get("HTTP_ORIGIN"),
             )
-            model_activity.delay(
-                model_name="issue",
-                model_id=str(serializer.data.get("id", None)),
-                requested_data=request.data,
-                current_instance=current_instance,
-                actor_id=request.user.id,
-                slug=slug,
-                origin=request.META.get("HTTP_ORIGIN"),
-            )
+            issue = self.get_queryset().filter(pk=pk).first()
             return Response(status=status.HTTP_204_NO_CONTENT)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -679,7 +599,8 @@ class IssueViewSet(BaseViewSet):
 
 
 class IssueUserDisplayPropertyEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def patch(self, request, slug, project_id):
         issue_property = IssueUserProperty.objects.get(
             user=request.user,
@@ -699,13 +620,7 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
         serializer = IssueUserPropertySerializer(issue_property)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def get(self, request, slug, project_id):
         issue_property, _ = IssueUserProperty.objects.get_or_create(
             user=request.user, project_id=project_id
@@ -715,8 +630,10 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
 
 
 class BulkDeleteIssuesEndpoint(BaseAPIView):
+
     @allow_permission([ROLE.ADMIN])
     def delete(self, request, slug, project_id):
+
         issue_ids = request.data.get("issue_ids", [])
 
         if not len(issue_ids):
@@ -737,141 +654,3 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
             {"message": f"{total_issues} issues were deleted"},
             status=status.HTTP_200_OK,
         )
-
-
-class IssuePaginatedViewSet(BaseViewSet):
-    def get_queryset(self):
-        workspace_slug = self.kwargs.get("slug")
-        project_id = self.kwargs.get("project_id")
-
-        return (
-            Issue.issue_objects.filter(
-                workspace__slug=workspace_slug, project_id=project_id
-            )
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-        ).distinct()
-
-    def process_paginated_result(self, fields, results, timezone):
-        paginated_data = results.values(*fields)
-
-        # converting the datetime fields in paginated data
-        datetime_fields = ["created_at", "updated_at"]
-        paginated_data = user_timezone_converter(
-            paginated_data, datetime_fields, timezone
-        )
-
-        return paginated_data
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def list(self, request, slug, project_id):
-        cursor = request.GET.get("cursor", None)
-        is_description_required = request.GET.get("description", False)
-        updated_at = request.GET.get("updated_at__gte", None)
-
-        # required fields
-        required_fields = [
-            "id",
-            "name",
-            "state_id",
-            "sort_order",
-            "completed_at",
-            "estimate_point",
-            "priority",
-            "start_date",
-            "target_date",
-            "sequence_id",
-            "project_id",
-            "parent_id",
-            "cycle_id",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-            "is_draft",
-            "archived_at",
-            "deleted_at",
-            "module_ids",
-            "label_ids",
-            "assignee_ids",
-            "link_count",
-            "attachment_count",
-            "sub_issues_count",
-        ]
-
-        if is_description_required:
-            required_fields.append("description_html")
-
-        # querying issues
-        base_queryset = Issue.issue_objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).order_by("updated_at")
-        queryset = self.get_queryset().order_by("updated_at")
-
-        # filtering issues by greater then updated_at given by the user
-        if updated_at:
-            base_queryset = base_queryset.filter(updated_at__gte=updated_at)
-            queryset = queryset.filter(updated_at__gte=updated_at)
-
-        queryset = queryset.annotate(
-            label_ids=Coalesce(
-                ArrayAgg(
-                    "labels__id",
-                    distinct=True,
-                    filter=~Q(labels__id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            assignee_ids=Coalesce(
-                ArrayAgg(
-                    "assignees__id",
-                    distinct=True,
-                    filter=~Q(assignees__id__isnull=True)
-                    & Q(assignees__member_project__is_active=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            module_ids=Coalesce(
-                ArrayAgg(
-                    "issue_module__module_id",
-                    distinct=True,
-                    filter=~Q(issue_module__module_id__isnull=True)
-                    & Q(issue_module__module__archived_at__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-        )
-
-        paginated_data = paginate(
-            base_queryset=base_queryset,
-            queryset=queryset,
-            cursor=cursor,
-            on_result=lambda results: self.process_paginated_result(
-                required_fields, results, request.user.user_timezone
-            ),
-        )
-
-        return Response(paginated_data, status=status.HTTP_200_OK)

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

@@ -16,13 +16,11 @@ from plane.app.serializers import (
     IssueCommentSerializer,
     CommentReactionSerializer,
 )
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectLitePermission, allow_permission, ROLE
 from plane.db.models import (
     IssueComment,
     ProjectMember,
     CommentReaction,
-    Project,
-    Issue,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 
@@ -65,31 +63,8 @@ class IssueCommentViewSet(BaseViewSet):
             .distinct()
         )
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def create(self, request, slug, project_id, issue_id):
-        project = Project.objects.get(pk=project_id)
-        issue = Issue.objects.get(pk=issue_id)
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to comment on the issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         serializer = IssueCommentSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
@@ -114,7 +89,7 @@ class IssueCommentViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],
         creator=True,
         model=IssueComment,
     )
@@ -181,6 +156,9 @@ class IssueCommentViewSet(BaseViewSet):
 class CommentReactionViewSet(BaseViewSet):
     serializer_class = CommentReactionSerializer
     model = CommentReaction
+    permission_classes = [
+        ProjectLitePermission,
+    ]
 
     def get_queryset(self):
         return (
@@ -198,13 +176,6 @@ class CommentReactionViewSet(BaseViewSet):
             .distinct()
         )
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
     def create(self, request, slug, project_id, comment_id):
         serializer = CommentReactionSerializer(data=request.data)
         if serializer.is_valid():
@@ -227,13 +198,6 @@ class CommentReactionViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
     def destroy(self, request, slug, project_id, comment_id, reaction_code):
         comment_reaction = CommentReaction.objects.get(
             workspace__slug=slug,

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

@@ -43,7 +43,7 @@ class LabelViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/workspaces/:slug/labels/", url_params=True, user=False
     )
-    @allow_permission([ROLE.ADMIN])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id):
         try:
             serializer = LabelSerializer(data=request.data)
@@ -66,14 +66,14 @@ class LabelViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/workspaces/:slug/labels/", url_params=True, user=False
     )
-    @allow_permission([ROLE.ADMIN])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(
         path="/api/workspaces/:slug/labels/", url_params=True, user=False
     )
-    @allow_permission([ROLE.ADMIN])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
 

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

@@ -12,7 +12,7 @@ from rest_framework import status
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import IssueReactionSerializer
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectLitePermission
 from plane.db.models import IssueReaction
 from plane.bgtasks.issue_activities_task import issue_activity
 
@@ -20,6 +20,9 @@ from plane.bgtasks.issue_activities_task import issue_activity
 class IssueReactionViewSet(BaseViewSet):
     serializer_class = IssueReactionSerializer
     model = IssueReaction
+    permission_classes = [
+        ProjectLitePermission,
+    ]
 
     def get_queryset(self):
         return (
@@ -37,7 +40,6 @@ class IssueReactionViewSet(BaseViewSet):
             .distinct()
         )
 
-    @allow_permission(ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST)
     def create(self, request, slug, project_id, issue_id):
         serializer = IssueReactionSerializer(data=request.data)
         if serializer.is_valid():
@@ -60,7 +62,6 @@ class IssueReactionViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    @allow_permission(ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST)
     def destroy(self, request, slug, project_id, issue_id, reaction_code):
         issue_reaction = IssueReaction.objects.get(
             workspace__slug=slug,

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

@@ -317,12 +317,7 @@ class ModuleViewSet(BaseViewSet):
             .order_by("-is_favorite", "-created_at")
         )
 
-    allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
 
     def create(self, request, slug, project_id):
         project = Project.objects.get(workspace__slug=slug, pk=project_id)
@@ -386,7 +381,7 @@ class ModuleViewSet(BaseViewSet):
             return Response(module, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
 
     def list(self, request, slug, project_id):
         queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -435,12 +430,7 @@ class ModuleViewSet(BaseViewSet):
             )
         return Response(modules, status=status.HTTP_200_OK)
 
-    allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
 
     def retrieve(self, request, slug, project_id, pk):
         queryset = (
@@ -871,7 +861,7 @@ class ModuleFavoriteViewSet(BaseViewSet):
 
 class ModuleUserPropertiesEndpoint(BaseAPIView):
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def patch(self, request, slug, project_id, module_id):
         module_properties = ModuleUserProperties.objects.get(
             user=request.user,
@@ -894,7 +884,7 @@ class ModuleUserPropertiesEndpoint(BaseAPIView):
         serializer = ModuleUserPropertiesSerializer(module_properties)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def get(self, request, slug, project_id, module_id):
         module_properties, _ = ModuleUserProperties.objects.get_or_create(
             user=request.user,

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

@@ -91,12 +91,7 @@ class ModuleIssueViewSet(BaseViewSet):
         ).distinct()
 
     @method_decorator(gzip_page)
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def list(self, request, slug, project_id, module_id):
         filters = issue_filters(request.query_params, "GET")
         issue_queryset = self.get_queryset().filter(**filters)

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

@@ -41,7 +41,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         )
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def list(self, request, slug):
@@ -174,7 +174,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def partial_update(self, request, slug, pk):
@@ -195,7 +195,8 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        level="WORKSPACE",
     )
     def mark_read(self, request, slug, pk):
         notification = Notification.objects.get(
@@ -245,7 +246,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
 
 class UnreadNotificationEndpoint(BaseAPIView):
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def get(self, request, slug):

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

@@ -32,10 +32,8 @@ from plane.db.models import (
     UserFavorite,
     ProjectMember,
     ProjectPage,
-    Project,
 )
 from plane.utils.error_codes import ERROR_CODES
-
 # Module imports
 from ..base import BaseAPIView, BaseViewSet
 
@@ -122,7 +120,7 @@ class PageViewSet(BaseViewSet):
             .distinct()
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id):
         serializer = PageSerializer(
             data=request.data,
@@ -144,7 +142,7 @@ class PageViewSet(BaseViewSet):
             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])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def partial_update(self, request, slug, project_id, pk):
         try:
             page = Page.objects.get(
@@ -210,38 +208,9 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def retrieve(self, request, slug, project_id, pk=None):
         page = self.get_queryset().filter(pk=pk).first()
-        project = Project.objects.get(pk=project_id)
-
-        """
-        if the role is guest and guest_view_all_features is false and owned by is not 
-        the requesting user then dont show the page
-        """
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not page.owned_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this page"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         if page is None:
             return Response(
                 {"error": "Page not found"},
@@ -265,7 +234,7 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_200_OK,
             )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def lock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -275,7 +244,7 @@ class PageViewSet(BaseViewSet):
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def unlock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -286,7 +255,7 @@ class PageViewSet(BaseViewSet):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def access(self, request, slug, project_id, pk):
         access = request.data.get("access", 0)
         page = Page.objects.filter(
@@ -309,31 +278,13 @@ class PageViewSet(BaseViewSet):
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
-        project = Project.objects.get(pk=project_id)
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-        ):
-            queryset = queryset.filter(owned_by=request.user)
         pages = PageSerializer(queryset, many=True).data
         return Response(pages, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def archive(self, request, slug, project_id, pk):
         page = Page.objects.get(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -368,7 +319,7 @@ class PageViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def unarchive(self, request, slug, project_id, pk):
         page = Page.objects.get(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -526,13 +477,7 @@ class SubPagesEndpoint(BaseAPIView):
 
 class PagesDescriptionViewSet(BaseViewSet):
 
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ]
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def retrieve(self, request, slug, project_id, pk):
         page = (
             Page.objects.filter(
@@ -562,7 +507,7 @@ class PagesDescriptionViewSet(BaseViewSet):
         )
         return response
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def partial_update(self, request, slug, project_id, pk):
         page = (
             Page.objects.filter(
@@ -621,7 +566,6 @@ class PagesDescriptionViewSet(BaseViewSet):
             # Store the updated binary data
             page.description_binary = new_binary_data
             page.description_html = request.data.get("description_html")
-            page.description = request.data.get("description")
             page.save()
             # Return a success response
             page_version.delay(

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

@@ -5,18 +5,16 @@ from rest_framework.response import Response
 # Module imports
 from plane.db.models import PageVersion
 from ..base import BaseAPIView
-from plane.app.serializers import (
-    PageVersionSerializer,
-    PageVersionDetailSerializer,
-)
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission
+from plane.app.serializers import PageVersionSerializer
 
 
 class PageVersionEndpoint(BaseAPIView):
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST]
-    )
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
     def get(self, request, slug, project_id, page_id, pk=None):
         # Check if pk is provided
         if pk:
@@ -27,7 +25,7 @@ class PageVersionEndpoint(BaseAPIView):
                 pk=pk,
             )
             # Serialize the page version
-            serializer = PageVersionDetailSerializer(page_version)
+            serializer = PageVersionSerializer(page_version)
             return Response(serializer.data, status=status.HTTP_200_OK)
         # Return all page versions
         page_versions = PageVersion.objects.filter(

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

@@ -71,6 +71,13 @@ class ProjectViewSet(BaseViewSet):
             super()
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(
+                Q(
+                    project_projectmember__member=self.request.user,
+                    project_projectmember__is_active=True,
+                )
+                | Q(network=2)
+            )
             .select_related(
                 "workspace",
                 "workspace__owner",
@@ -148,7 +155,7 @@ class ProjectViewSet(BaseViewSet):
         )
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def list(self, request, slug):
@@ -158,31 +165,6 @@ class ProjectViewSet(BaseViewSet):
             if field
         ]
         projects = self.get_queryset().order_by("sort_order", "name")
-        if WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
-            role=5,
-        ).exists():
-            projects = projects.filter(
-                project_projectmember__member=self.request.user,
-                project_projectmember__is_active=True,
-            )
-
-        if WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
-            role=10,
-        ).exists():
-            projects = projects.filter(
-                Q(
-                    project_projectmember__member=self.request.user,
-                    project_projectmember__is_active=True,
-                )
-                | Q(network=2)
-            )
-
         if request.GET.get("per_page", False) and request.GET.get(
             "cursor", False
         ):
@@ -195,13 +177,24 @@ class ProjectViewSet(BaseViewSet):
                 ).data,
             )
 
+        if WorkspaceMember.objects.filter(
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role__in=[5, 10],
+        ).exists():
+            projects = projects.filter(
+                project_projectmember__member=self.request.user,
+                project_projectmember__is_active=True,
+            )
+
         projects = ProjectListSerializer(
             projects, many=True, fields=fields if fields else None
         ).data
         return Response(projects, status=status.HTTP_200_OK)
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def retrieve(self, request, slug, pk):

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

@@ -17,7 +17,7 @@ from rest_framework.permissions import AllowAny
 from .base import BaseViewSet, BaseAPIView
 from plane.app.serializers import ProjectMemberInviteSerializer
 
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectBasePermission
 
 from plane.db.models import (
     ProjectMember,
@@ -35,6 +35,10 @@ class ProjectInvitationsViewset(BaseViewSet):
 
     search_fields = []
 
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -45,7 +49,6 @@ class ProjectInvitationsViewset(BaseViewSet):
             .select_related("workspace", "workspace__owner")
         )
 
-    @allow_permission([ROLE.ADMIN])
     def create(self, request, slug, project_id):
         emails = request.data.get("emails", [])
 
@@ -56,21 +59,24 @@ class ProjectInvitationsViewset(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        for email in emails:
-            workspace_role = WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member__email=email.get("email"),
-                is_active=True,
-            ).role
+        requesting_user = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member_id=request.user.id,
+        )
 
-            if workspace_role in [5, 20] and workspace_role != email.get(
-                "role", 5
-            ):
-                return Response(
-                    {
-                        "error": "You cannot invite a user with different role than workspace role"
-                    },
-                )
+        # Check if any invited user has an higher role
+        if len(
+            [
+                email
+                for email in emails
+                if int(email.get("role", 10)) > requesting_user.role
+            ]
+        ):
+            return Response(
+                {"error": "You cannot invite a user with higher role"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         workspace = Workspace.objects.get(slug=slug)
 
@@ -91,7 +97,7 @@ class ProjectInvitationsViewset(BaseViewSet):
                             settings.SECRET_KEY,
                             algorithm="HS256",
                         ),
-                        role=email.get("role", 5),
+                        role=email.get("role", 10),
                         created_by=request.user,
                     )
                 )
@@ -164,7 +170,7 @@ class UserProjectInvitationsViewset(BaseViewSet):
                 ProjectMember(
                     project_id=project_id,
                     member=request.user,
-                    role=workspace_role,
+                    role=15 if workspace_role >= 15 else 10,
                     workspace=workspace,
                     created_by=request.user,
                 )

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

@@ -95,21 +95,9 @@ class ProjectMemberViewSet(BaseViewSet):
                 member=member,
                 is_active=True,
             ).role
-            if workspace_member_role in [20] and member_roles.get(member) in [
-                5,
-                15,
-            ]:
-                return Response(
-                    {
-                        "error": "You cannot add a user with role lower than the workspace role"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if workspace_member_role in [5] and member_roles.get(member) in [
-                15,
-                20,
-            ]:
+            if workspace_member_role in [5, 10] and member_roles.get(
+                member
+            ) in [15, 20]:
                 return Response(
                     {
                         "error": "You cannot add a user with role higher than the workspace role"
@@ -155,7 +143,7 @@ class ProjectMemberViewSet(BaseViewSet):
             bulk_project_members.append(
                 ProjectMember(
                     member_id=member.get("member_id"),
-                    role=member.get("role", 5),
+                    role=member.get("role", 10),
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     sort_order=(
@@ -201,7 +189,7 @@ class ProjectMemberViewSet(BaseViewSet):
         # Return the serialized data
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def list(self, request, slug, project_id):
         # Get the list of project members for the project
         project_members = ProjectMember.objects.filter(
@@ -242,7 +230,7 @@ class ProjectMemberViewSet(BaseViewSet):
             member=project_member.member,
             is_active=True,
         ).role
-        if workspace_role in [5] and int(
+        if workspace_role in [5, 10] and int(
             request.data.get("role", project_member.role)
         ) in [15, 20]:
             return Response(
@@ -273,7 +261,7 @@ class ProjectMemberViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    @allow_permission([ROLE.ADMIN])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, slug, project_id, pk):
         project_member = ProjectMember.objects.get(
             workspace__slug=slug,
@@ -310,7 +298,7 @@ class ProjectMemberViewSet(BaseViewSet):
         project_member.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def leave(self, request, slug, project_id):
         project_member = ProjectMember.objects.get(
             workspace__slug=slug,

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

@@ -9,8 +9,7 @@ from rest_framework import status
 from .. import BaseViewSet
 from plane.app.serializers import StateSerializer
 from plane.app.permissions import (
-    ROLE,
-    allow_permission
+    ProjectEntityPermission,
 )
 from plane.db.models import State, Issue
 from plane.utils.cache import invalidate_cache
@@ -19,6 +18,9 @@ from plane.utils.cache import invalidate_cache
 class StateViewSet(BaseViewSet):
     serializer_class = StateSerializer
     model = State
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
     def get_queryset(self):
         return self.filter_queryset(
@@ -40,7 +42,6 @@ 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):
         serializer = StateSerializer(data=request.data)
         if serializer.is_valid():
@@ -48,7 +49,6 @@ class StateViewSet(BaseViewSet):
             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):
         states = StateSerializer(self.get_queryset(), many=True).data
         grouped = request.GET.get("grouped", False)
@@ -65,7 +65,6 @@ class StateViewSet(BaseViewSet):
     @invalidate_cache(
         path="workspaces/:slug/states/", url_params=True, user=False
     )
-    @allow_permission([ROLE.ADMIN])
     def mark_as_default(self, request, slug, project_id, pk):
         # Select all the states which are marked as default
         _ = State.objects.filter(
@@ -79,7 +78,6 @@ class StateViewSet(BaseViewSet):
     @invalidate_cache(
         path="workspaces/:slug/states/", url_params=True, user=False
     )
-    @allow_permission([ROLE.ADMIN])
     def destroy(self, request, slug, project_id, pk):
         state = State.objects.get(
             is_triage=False,

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

@@ -35,7 +35,6 @@ from plane.db.models import (
     Workspace,
     WorkspaceMember,
     ProjectMember,
-    Project,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -76,7 +75,7 @@ class WorkspaceViewViewSet(BaseViewSet):
         )
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def list(self, request, slug):
@@ -260,7 +259,7 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
 
     @method_decorator(gzip_page)
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
         level="WORKSPACE",
     )
     def list(self, request, slug):
@@ -273,24 +272,15 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
         )
 
-        # check for the project member role, if the role is 5 then check for the guest_view_all_features if it is true then show all the issues else show only the issues created by the user
-
-        issue_queryset = issue_queryset.filter(
-            Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=True,
+        if WorkspaceMember.objects.filter(
+            workspace__slug=slug,
+            member=request.user,
+            role=5,
+            is_active=True,
+        ).exists():
+            issue_queryset = issue_queryset.filter(
+                created_by=request.user,
             )
-            | Q(
-                project__project_projectmember__role=5,
-                project__guest_view_all_features=False,
-                created_by=self.request.user,
-            )
-            |
-            # For other roles (role < 5), show all issues
-            Q(project__project_projectmember__role__gt=5),
-            project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
-        )
 
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
@@ -431,21 +421,19 @@ class IssueViewViewSet(BaseViewSet):
             .distinct()
         )
 
-    allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
+    )
 
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
-        project = Project.objects.get(id=project_id)
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-        ):
+        if ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            role=5,
+            is_active=True,
+        ).exists():
             queryset = queryset.filter(owned_by=request.user)
         fields = [
             field
@@ -457,34 +445,14 @@ class IssueViewViewSet(BaseViewSet):
         ).data
         return Response(views, status=status.HTTP_200_OK)
 
-    allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
+    )
 
     def retrieve(self, request, slug, project_id, pk):
         issue_view = (
             self.get_queryset().filter(pk=pk, project_id=project_id).first()
         )
-        project = Project.objects.get(id=project_id)
-        """
-        if the role is guest and guest_view_all_features is false and owned by is not 
-        the requesting user then dont show the view
-        """
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue_view.owned_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         serializer = IssueViewSerializer(issue_view)
         recent_visited_task.delay(
             slug=slug,

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

@@ -43,7 +43,6 @@ from plane.db.models import (
     WorkspaceMember,
     WorkspaceTheme,
 )
-from plane.app.permissions import ROLE, allow_permission
 from plane.utils.cache import cache_response, invalidate_cache
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_control
@@ -148,25 +147,11 @@ class WorkSpaceViewSet(BaseViewSet):
                 )
 
     @cache_response(60 * 60 * 2)
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-            ROLE.MEMBER,
-            ROLE.GUEST,
-        ],
-        level="WORKSPACE",
-    )
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/workspaces/", user=False)
     @invalidate_cache(path="/api/users/me/workspaces/")
-    @allow_permission(
-        [
-            ROLE.ADMIN,
-        ],
-        level="WORKSPACE",
-    )
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
@@ -177,7 +162,6 @@ class WorkSpaceViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/users/me/settings/", multiple=True, user=False
     )
-    @allow_permission([ROLE.ADMIN], level="WORKSPACE")
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
 

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

@@ -24,7 +24,7 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):
             workspace__slug=slug,
             parent__isnull=True,
         ).filter(
-            Q(project__isnull=True) & ~Q(entity_type="page")
+            Q(project__isnull=True)
             | (
                 Q(project__isnull=False)
                 & Q(project__project_projectmember__member=request.user)

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

@@ -74,7 +74,7 @@ class WorkspaceInvitationsViewset(BaseViewSet):
             [
                 email
                 for email in emails
-                if int(email.get("role", 5)) > requesting_user.role
+                if int(email.get("role", 10)) > requesting_user.role
             ]
         ):
             return Response(
@@ -119,7 +119,7 @@ class WorkspaceInvitationsViewset(BaseViewSet):
                             settings.SECRET_KEY,
                             algorithm="HS256",
                         ),
-                        role=email.get("role", 5),
+                        role=email.get("role", 10),
                         created_by=request.user,
                     )
                 )

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

@@ -13,8 +13,7 @@ from rest_framework.response import Response
 from plane.app.permissions import (
     WorkSpaceAdminPermission,
     WorkspaceEntityPermission,
-    allow_permission,
-    ROLE,
+    WorkspaceUserPermission,
 )
 
 # Module imports
@@ -44,6 +43,22 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     serializer_class = WorkspaceMemberAdminSerializer
     model = WorkspaceMember
 
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
+
+    def get_permissions(self):
+        if self.action == "leave":
+            self.permission_classes = [
+                WorkspaceUserPermission,
+            ]
+        else:
+            self.permission_classes = [
+                WorkspaceEntityPermission,
+            ]
+
+        return super(WorkSpaceMemberViewSet, self).get_permissions()
+
     search_fields = [
         "member__display_name",
         "member__first_name",
@@ -62,9 +77,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         )
 
     @cache_response(60 * 60 * 2)
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
     def list(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
             member=request.user,
@@ -75,7 +87,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         # Get all active workspace members
         workspace_members = self.get_queryset()
 
-        if workspace_member.role > 5:
+        if workspace_member.role > 10:
             serializer = WorkspaceMemberAdminSerializer(
                 workspace_members,
                 fields=("id", "member", "role"),
@@ -95,7 +107,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         user=False,
         multiple=True,
     )
-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
     def partial_update(self, request, slug, pk):
         workspace_member = WorkspaceMember.objects.get(
             pk=pk,
@@ -109,10 +120,25 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        if workspace_member.role > int(request.data.get("role")):
-            _ = ProjectMember.objects.filter(
-                workspace__slug=slug, member_id=workspace_member.member_id
-            ).update(role=int(request.data.get("role")))
+        # Get the requested user role
+        requested_workspace_member = WorkspaceMember.objects.get(
+            workspace__slug=slug,
+            member=request.user,
+            is_active=True,
+        )
+        # Check if role is being updated
+        # One cannot update role higher than his own role
+        if (
+            "role" in request.data
+            and int(request.data.get("role", workspace_member.role))
+            > requested_workspace_member.role
+        ):
+            return Response(
+                {
+                    "error": "You cannot update a role that is higher than your own role"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         serializer = WorkSpaceMemberSerializer(
             workspace_member, data=request.data, partial=True
@@ -133,7 +159,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/users/me/workspaces/", user=False, multiple=True
     )
-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
     def destroy(self, request, slug, pk):
         # Check the user role who is deleting the user
         workspace_member = WorkspaceMember.objects.get(
@@ -208,9 +233,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     @invalidate_cache(
         path="api/users/me/workspaces/", user=False, multiple=True
     )
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
     def leave(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
             workspace__slug=slug,

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

@@ -288,7 +288,7 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
             is_active=True,
         )
         projects = []
-        if requesting_workspace_member.role >= 15:
+        if requesting_workspace_member.role >= 10:
             projects = (
                 Project.objects.filter(
                     workspace__slug=slug,

apiserver/plane/authentication/utils/workspace_project_join.py

@@ -49,7 +49,7 @@ def process_workspace_project_invitations(user):
                 workspace_id=project_member_invite.workspace_id,
                 role=(
                     project_member_invite.role
-                    if project_member_invite.role in [5, 15]
+                    if project_member_invite.role in [5, 10, 15]
                     else 15
                 ),
                 member=user,
@@ -67,7 +67,7 @@ def process_workspace_project_invitations(user):
                 workspace_id=project_member_invite.workspace_id,
                 role=(
                     project_member_invite.role
-                    if project_member_invite.role in [5, 15]
+                    if project_member_invite.role in [5, 10, 15]
                     else 15
                 ),
                 member=user,

apiserver/plane/bgtasks/cycle_issue_state_progress_task.py

@@ -1,120 +0,0 @@
-# Django imports
-from django.db.models import Sum
-from django.utils import timezone
-from django.db.models import F
-from django.db.models.functions import RowNumber
-from django.db.models import Max, Subquery, OuterRef
-
-# Third party imports
-from celery import shared_task
-from plane.db.models import Cycle, CycleIssueStateProgress, CycleAnalytics
-
-
-@shared_task
-def track_cycle_issue_state_progress():
-
-    active_cycles = Cycle.objects.filter(
-        start_date__lte=timezone.now(), end_date__gte=timezone.now()
-    ).values_list("id", "project_id", "workspace_id")
-
-    analytics_records = []
-    current_date = timezone.now().date()
-
-    for cycle_id, project_id, workspace_id in active_cycles:
-        # Subquery to get the latest id for each issue_id
-        # Subquery to get the latest created_at for each issue_id
-        # latest_created_at = CycleIssueStateProgress.objects.filter(
-        #     cycle_id=cycle_id,
-        #     type__in=["ADDED", "UPDATED"],
-        #     issue_id=OuterRef("issue_id"),
-        #     created_at__lte=timezone.now(),
-        # ).values('issue_id').annotate(
-        #     latest_created=Max('created_at')
-        # ).values('latest_created')
-
-        # # Main query to get the latest unique issues
-        # cycle_issues = CycleIssueStateProgress.objects.filter(
-        #     cycle_id=cycle_id,
-        #     type__in=["ADDED", "UPDATED"],
-        #     created_at=Subquery(latest_created_at),
-        #     issue_id=OuterRef("issue_id")
-        # ).order_by("issue_id")
-
-        cycle_issues = CycleIssueStateProgress.objects.filter(
-            id=Subquery(
-                CycleIssueStateProgress.objects.filter(
-                    cycle_id=cycle_id,
-                    type__in=["ADDED", "UPDATED"],
-                    issue=OuterRef("issue"),
-                )
-                .order_by("-created_at")
-                .values("id")[:1]
-            )
-        )
-        # print()
-        for issue in cycle_issues.values():
-            print(issue, "issues")
-
-        total_issues = cycle_issues.count()
-        total_estimate_points = (
-            cycle_issues.aggregate(
-                total_estimate_points=Sum("estimate_value")
-            )["total_estimate_points"]
-            or 0
-        )
-
-        state_groups = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-        state_data = {
-            group: {
-                "count": cycle_issues.filter(state_group=group).count(),
-                "estimate_points": cycle_issues.filter(
-                    state_group=group
-                ).aggregate(total_estimate_points=Sum("estimate_value"))[
-                    "total_estimate_points"
-                ]
-                or 0,
-            }
-            for group in state_groups
-        }
-
-        # Prepare analytics record for bulk insert
-        analytics_records.append(
-            CycleAnalytics(
-                cycle_id=cycle_id,
-                date=current_date,
-                total_issues=total_issues,
-                total_estimate_points=total_estimate_points,
-                backlog_issues=state_data["backlog"]["count"],
-                unstarted_issues=state_data["unstarted"]["count"],
-                started_issues=state_data["started"]["count"],
-                completed_issues=state_data["completed"]["count"],
-                cancelled_issues=state_data["cancelled"]["count"],
-                backlog_estimate_points=state_data["backlog"][
-                    "estimate_points"
-                ],
-                unstarted_estimate_points=state_data["unstarted"][
-                    "estimate_points"
-                ],
-                started_estimate_points=state_data["started"][
-                    "estimate_points"
-                ],
-                completed_estimate_points=state_data["completed"][
-                    "estimate_points"
-                ],
-                cancelled_estimate_points=state_data["cancelled"][
-                    "estimate_points"
-                ],
-                project_id=project_id,
-                workspace_id=workspace_id,
-            )
-        )
-
-    # Bulk create the records at once
-    if analytics_records:
-        CycleAnalytics.objects.bulk_create(analytics_records)

apiserver/plane/bgtasks/email_notification_task.py

@@ -161,8 +161,6 @@ def process_mention(mention_component):
 
 
 def process_html_content(content):
-    if content is None:
-        return None
     processed_content_list = []
     for html_content in content:
         processed_content = process_mention(html_content)

apiserver/plane/bgtasks/export_task.py

@@ -174,7 +174,7 @@ def generate_table_row(issue):
             if issue["assignees__first_name"] and issue["assignees__last_name"]
             else ""
         ),
-        issue["labels__name"] if issue["labels__name"] else "",
+        issue["labels__name"],
         issue["issue_cycle__cycle__name"],
         dateConverter(issue["issue_cycle__cycle__start_date"]),
         dateConverter(issue["issue_cycle__cycle__end_date"]),
@@ -207,7 +207,7 @@ def generate_json_row(issue):
             if issue["assignees__first_name"] and issue["assignees__last_name"]
             else ""
         ),
-        "Labels": issue["labels__name"] if issue["labels__name"] else "",
+        "Labels": issue["labels__name"],
         "Cycle Name": issue["issue_cycle__cycle__name"],
         "Cycle Start Date": dateConverter(
             issue["issue_cycle__cycle__start_date"]
@@ -244,13 +244,9 @@ def update_json_row(rows, row):
         )
         assignee, label = row["Assignee"], row["Labels"]
 
-        if assignee is not None and (
-            existing_assignees is None or label not in existing_assignees
-        ):
+        if assignee is not None and assignee not in existing_assignees:
             rows[matched_index]["Assignee"] += f", {assignee}"
-        if label is not None and (
-            existing_labels is None or label not in existing_labels
-        ):
+        if label is not None and label not in existing_labels:
             rows[matched_index]["Labels"] += f", {label}"
     else:
         rows.append(row)
@@ -270,13 +266,9 @@ def update_table_row(rows, row):
         existing_assignees, existing_labels = rows[matched_index][7:9]
         assignee, label = row[7:9]
 
-        if assignee is not None and (
-            existing_assignees is None or label not in existing_assignees
-        ):
-            rows[matched_index][8] += f", {assignee}"
-        if label is not None and (
-            existing_labels is None or label not in existing_labels
-        ):
+        if assignee is not None and assignee not in existing_assignees:
+            rows[matched_index][7] += f", {assignee}"
+        if label is not None and label not in existing_labels:
             rows[matched_index][8] += f", {label}"
     else:
         rows.append(row)

apiserver/plane/bgtasks/issue_activities_task.py

@@ -1,11 +1,13 @@
 # Python imports
 import json
 
+import requests
 
 # Third Party imports
 from celery import shared_task
 
 # Django imports
+from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
 

apiserver/plane/bgtasks/notification_task.py

@@ -128,9 +128,7 @@ def extract_mentions(issue_instance):
             "mention-component", attrs={"target": "users"}
         )
 
-        mentions = [
-            mention_tag["entity_identifier"] for mention_tag in mention_tags
-        ]
+        mentions = [mention_tag["entity_identifier"] for mention_tag in mention_tags]
 
         return list(set(mentions))
     except Exception:
@@ -200,16 +198,6 @@ def create_mention_notification(
                 "actor": str(activity.get("actor_id")),
                 "new_value": str(activity.get("new_value")),
                 "old_value": str(activity.get("old_value")),
-                "old_identifier": (
-                    str(activity.get("old_identifier"))
-                    if activity.get("old_identifier")
-                    else None
-                ),
-                "new_identifier": (
-                    str(activity.get("new_identifier"))
-                    if activity.get("new_identifier")
-                    else None
-                ),
             },
         },
     )
@@ -452,24 +440,6 @@ def notifications(
                                         if issue_comment is not None
                                         else ""
                                     ),
-                                    "old_identifier": (
-                                        str(
-                                            issue_activity.get(
-                                                "old_identifier"
-                                            )
-                                        )
-                                        if issue_activity.get("old_identifier")
-                                        else None
-                                    ),
-                                    "new_identifier": (
-                                        str(
-                                            issue_activity.get(
-                                                "new_identifier"
-                                            )
-                                        )
-                                        if issue_activity.get("new_identifier")
-                                        else None
-                                    ),
                                 },
                             },
                         )
@@ -519,28 +489,6 @@ def notifications(
                                             if issue_comment is not None
                                             else ""
                                         ),
-                                        "old_identifier": (
-                                            str(
-                                                issue_activity.get(
-                                                    "old_identifier"
-                                                )
-                                            )
-                                            if issue_activity.get(
-                                                "old_identifier"
-                                            )
-                                            else None
-                                        ),
-                                        "new_identifier": (
-                                            str(
-                                                issue_activity.get(
-                                                    "new_identifier"
-                                                )
-                                            )
-                                            if issue_activity.get(
-                                                "new_identifier"
-                                            )
-                                            else None
-                                        ),
                                         "activity_time": issue_activity.get(
                                             "created_at"
                                         ),
@@ -624,28 +572,6 @@ def notifications(
                                             "old_value": str(
                                                 issue_activity.get("old_value")
                                             ),
-                                            "old_identifier": (
-                                                str(
-                                                    issue_activity.get(
-                                                        "old_identifier"
-                                                    )
-                                                )
-                                                if issue_activity.get(
-                                                    "old_identifier"
-                                                )
-                                                else None
-                                            ),
-                                            "new_identifier": (
-                                                str(
-                                                    issue_activity.get(
-                                                        "new_identifier"
-                                                    )
-                                                )
-                                                if issue_activity.get(
-                                                    "new_identifier"
-                                                )
-                                                else None
-                                            ),
                                             "activity_time": issue_activity.get(
                                                 "created_at"
                                             ),
@@ -701,28 +627,6 @@ def notifications(
                                         "old_value": str(
                                             last_activity.old_value
                                         ),
-                                        "old_identifier": (
-                                            str(
-                                                issue_activity.get(
-                                                    "old_identifier"
-                                                )
-                                            )
-                                            if issue_activity.get(
-                                                "old_identifier"
-                                            )
-                                            else None
-                                        ),
-                                        "new_identifier": (
-                                            str(
-                                                issue_activity.get(
-                                                    "new_identifier"
-                                                )
-                                            )
-                                            if issue_activity.get(
-                                                "new_identifier"
-                                            )
-                                            else None
-                                        ),
                                     },
                                 },
                             )
@@ -758,31 +662,7 @@ def notifications(
                                             "old_value": str(
                                                 last_activity.old_value
                                             ),
-                                            "old_identifier": (
-                                                str(
-                                                    issue_activity.get(
-                                                        "old_identifier"
-                                                    )
-                                                )
-                                                if issue_activity.get(
-                                                    "old_identifier"
-                                                )
-                                                else None
-                                            ),
-                                            "new_identifier": (
-                                                str(
-                                                    issue_activity.get(
-                                                        "new_identifier"
-                                                    )
-                                                )
-                                                if issue_activity.get(
-                                                    "new_identifier"
-                                                )
-                                                else None
-                                            ),
-                                            "activity_time": str(
-                                                last_activity.created_at
-                                            ),
+                                            "activity_time": str(last_activity.created_at),
                                         },
                                     },
                                 )
@@ -839,28 +719,6 @@ def notifications(
                                                         "old_value"
                                                     )
                                                 ),
-                                                "old_identifier": (
-                                                    str(
-                                                        issue_activity.get(
-                                                            "old_identifier"
-                                                        )
-                                                    )
-                                                    if issue_activity.get(
-                                                        "old_identifier"
-                                                    )
-                                                    else None
-                                                ),
-                                                "new_identifier": (
-                                                    str(
-                                                        issue_activity.get(
-                                                            "new_identifier"
-                                                        )
-                                                    )
-                                                    if issue_activity.get(
-                                                        "new_identifier"
-                                                    )
-                                                    else None
-                                                ),
                                                 "activity_time": issue_activity.get(
                                                     "created_at"
                                                 ),

apiserver/plane/bgtasks/page_transaction_task.py

@@ -10,7 +10,6 @@ from bs4 import BeautifulSoup
 # Module imports
 from plane.db.models import Page, PageLog
 from celery import shared_task
-from plane.utils.exception_logger import log_exception
 
 
 def extract_components(value, tag):
@@ -35,48 +34,42 @@ def extract_components(value, tag):
 
 @shared_task
 def page_transaction(new_value, old_value, page_id):
-    try:
-        page = Page.objects.get(pk=page_id)
-        new_page_mention = PageLog.objects.filter(page_id=page_id).exists()
+    page = Page.objects.get(pk=page_id)
+    new_page_mention = PageLog.objects.filter(page_id=page_id).exists()
 
-        old_value = json.loads(old_value) if old_value else {}
+    old_value = json.loads(old_value) if old_value else {}
 
-        new_transactions = []
-        deleted_transaction_ids = set()
+    new_transactions = []
+    deleted_transaction_ids = set()
 
-        # TODO - Add "issue-embed-component", "img", "todo" components
-        components = ["mention-component"]
-        for component in components:
-            old_mentions = extract_components(old_value, component)
-            new_mentions = extract_components(new_value, component)
+    # TODO - Add "issue-embed-component", "img", "todo" components
+    components = ["mention-component"]
+    for component in components:
+        old_mentions = extract_components(old_value, component)
+        new_mentions = extract_components(new_value, component)
 
-            new_mentions_ids = {mention["id"] for mention in new_mentions}
-            old_mention_ids = {mention["id"] for mention in old_mentions}
-            deleted_transaction_ids.update(old_mention_ids - new_mentions_ids)
+        new_mentions_ids = {mention["id"] for mention in new_mentions}
+        old_mention_ids = {mention["id"] for mention in old_mentions}
+        deleted_transaction_ids.update(old_mention_ids - new_mentions_ids)
 
-            new_transactions.extend(
-                PageLog(
-                    transaction=mention["id"],
-                    page_id=page_id,
-                    entity_identifier=mention["entity_identifier"],
-                    entity_name=mention["entity_name"],
-                    workspace_id=page.workspace_id,
-                    created_at=timezone.now(),
-                    updated_at=timezone.now(),
-                )
-                for mention in new_mentions
-                if mention["id"] not in old_mention_ids or not new_page_mention
+        new_transactions.extend(
+            PageLog(
+                transaction=mention["id"],
+                page_id=page_id,
+                entity_identifier=mention["entity_identifier"],
+                entity_name=mention["entity_name"],
+                workspace_id=page.workspace_id,
+                created_at=timezone.now(),
+                updated_at=timezone.now(),
             )
-
-        # Create new PageLog objects for new transactions
-        PageLog.objects.bulk_create(
-            new_transactions, batch_size=10, ignore_conflicts=True
+            for mention in new_mentions
+            if mention["id"] not in old_mention_ids or not new_page_mention
         )
 
-        # Delete the removed transactions
-        PageLog.objects.filter(transaction__in=deleted_transaction_ids).delete()
-    except Page.DoesNotExist:
-        return
-    except Exception as e:
-        log_exception(e)
-        return
+    # Create new PageLog objects for new transactions
+    PageLog.objects.bulk_create(
+        new_transactions, batch_size=10, ignore_conflicts=True
+    )
+
+    # Delete the removed transactions
+    PageLog.objects.filter(transaction__in=deleted_transaction_ids).delete()

apiserver/plane/bgtasks/page_version_task.py

@@ -6,7 +6,6 @@ from celery import shared_task
 
 # Module imports
 from plane.db.models import Page, PageVersion
-from plane.utils.exception_logger import log_exception
 
 
 @shared_task
@@ -15,39 +14,31 @@ def page_version(
     existing_instance,
     user_id,
 ):
-    try:
-        # Get the page
-        page = Page.objects.get(id=page_id)
+    # Get the page
+    page = Page.objects.get(id=page_id)
 
-        # Get the current instance
-        current_instance = (
-            json.loads(existing_instance)
-            if existing_instance is not None
-            else {}
+    # Get the current instance
+    current_instance = (
+        json.loads(existing_instance) if existing_instance is not None else {}
+    )
+
+    # Create a version if description_html is updated
+    if current_instance.get("description_html") != page.description_html:
+        # Create a new page version
+        PageVersion.objects.create(
+            page_id=page_id,
+            workspace_id=page.workspace_id,
+            description_html=page.description_html,
+            description_binary=page.description_binary,
+            owned_by_id=user_id,
+            last_saved_at=page.updated_at,
         )
 
-        # Create a version if description_html is updated
-        if current_instance.get("description_html") != page.description_html:
-            # Create a new page version
-            PageVersion.objects.create(
-                page_id=page_id,
-                workspace_id=page.workspace_id,
-                description_html=page.description_html,
-                description_binary=page.description_binary,
-                owned_by_id=user_id,
-                last_saved_at=page.updated_at,
-            )
+        # If page versions are greater than 20 delete the oldest one
+        if PageVersion.objects.filter(page_id=page_id).count() > 20:
+            # Delete the old page version
+            PageVersion.objects.filter(page_id=page_id).order_by(
+                "last_saved_at"
+            ).first().delete()
 
-            # If page versions are greater than 20 delete the oldest one
-            if PageVersion.objects.filter(page_id=page_id).count() > 20:
-                # Delete the old page version
-                PageVersion.objects.filter(page_id=page_id).order_by(
-                    "last_saved_at"
-                ).first().delete()
-
-        return
-    except Page.DoesNotExist:
-        return
-    except Exception as e:
-        log_exception(e)
-        return
+    return

apiserver/plane/bgtasks/webhook_task.py

@@ -152,8 +152,6 @@ def webhook_task(self, webhook, slug, event, event_data, action, current_site):
             retry_count=str(self.request.retries),
         )
 
-    except Webhook.DoesNotExist:
-        return
     except requests.RequestException as e:
         # Log the failed webhook request
         WebhookLog.objects.create(

apiserver/plane/celery.py

@@ -40,10 +40,6 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.deletion_task.hard_delete",
         "schedule": crontab(hour=0, minute=0),
     },
-    "track-cycle-issue-state-progress": {
-        "task": "plane.bgtasks.cycle_issue_state_progress_task.track_cycle_issue_state_progress",
-        "schedule": crontab(hour=9, minute=6),
-    },
 }
 
 # Load task modules from all registered Django app configs.

apiserver/plane/db/migrations/0075_alter_fileasset_asset.py

@@ -1,28 +0,0 @@
-# Generated by Django 4.2.11 on 2024-08-29 09:40
-
-import django.core.validators
-from django.db import migrations, models
-import plane.db.models.asset
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0074_deploy_board_and_project_issues"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="fileasset",
-            name="asset",
-            field=models.FileField(
-                upload_to=plane.db.models.asset.get_upload_path,
-                validators=[
-                    django.core.validators.FileExtensionValidator(
-                        allowed_extensions=["jpg", "jpeg", "png"]
-                    ),
-                    plane.db.models.asset.file_size,
-                ],
-            ),
-        ),
-    ]

apiserver/plane/db/migrations/0076_alter_projectmember_role_and_more.py

@@ -1,60 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-30 07:34
-
-from django.db import migrations, models
-
-
-def update_workspace_project_member_role(apps, schema_editor):
-    WorkspaceMember = apps.get_model("db", "WorkspaceMember")
-    ProjectMember = apps.get_model("db", "ProjectMember")
-
-    # update all existing members with role 10 to role 5
-    WorkspaceMember.objects.filter(role=10).update(role=5)
-    ProjectMember.objects.filter(role=10).update(role=5)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0075_alter_fileasset_asset"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="projectmember",
-            name="role",
-            field=models.PositiveSmallIntegerField(
-                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
-                default=5,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="projectmemberinvite",
-            name="role",
-            field=models.PositiveSmallIntegerField(
-                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
-                default=5,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="workspacemember",
-            name="role",
-            field=models.PositiveSmallIntegerField(
-                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
-                default=5,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="workspacememberinvite",
-            name="role",
-            field=models.PositiveSmallIntegerField(
-                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
-                default=5,
-            ),
-        ),
-        migrations.AddField(
-            model_name="project",
-            name="guest_view_all_features",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(update_workspace_project_member_role),
-    ]

apiserver/plane/db/models/__init__.py

@@ -2,16 +2,7 @@ from .analytic import AnalyticView
 from .api import APIActivityLog, APIToken
 from .asset import FileAsset
 from .base import BaseModel
-from .cycle import (
-    Cycle,
-    CycleFavorite,
-    CycleIssue,
-    CycleUserProperties,
-    CycleAnalytics,
-    CycleUpdates,
-    CycleUpdateReaction,
-    CycleIssueStateProgress,
-)
+from .cycle import Cycle, CycleFavorite, CycleIssue, CycleUserProperties
 from .dashboard import Dashboard, DashboardWidget, Widget
 from .deploy_board import DeployBoard
 from .estimate import Estimate, EstimatePoint

apiserver/plane/db/models/asset.py

@@ -1,11 +1,11 @@
 # Python imports
 from uuid import uuid4
 
-# Django import
 from django.conf import settings
 from django.core.exceptions import ValidationError
+
+# Django import
 from django.db import models
-from django.core.validators import FileExtensionValidator
 
 # Module import
 from .base import BaseModel
@@ -32,7 +32,6 @@ class FileAsset(BaseModel):
     asset = models.FileField(
         upload_to=get_upload_path,
         validators=[
-            FileExtensionValidator(allowed_extensions=["jpg", "jpeg", "png"]),
             file_size,
         ],
     )

apiserver/plane/db/models/cycle.py

@@ -1,6 +1,3 @@
-# Python Imports
-import pytz
-
 # Django imports
 from django.conf import settings
 from django.db import models
@@ -58,12 +55,10 @@ class Cycle(ProjectBaseModel):
     description = models.TextField(
         verbose_name="Cycle Description", blank=True
     )
-    start_date = models.DateTimeField(
+    start_date = models.DateField(
         verbose_name="Start Date", blank=True, null=True
     )
-    end_date = models.DateTimeField(
-        verbose_name="End Date", blank=True, null=True
-    )
+    end_date = models.DateField(verbose_name="End Date", blank=True, null=True)
     owned_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
@@ -76,11 +71,6 @@ class Cycle(ProjectBaseModel):
     progress_snapshot = models.JSONField(default=dict)
     archived_at = models.DateTimeField(null=True)
     logo_props = models.JSONField(default=dict)
-    # timezone
-    USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
-    user_timezone = models.CharField(
-        max_length=255, default="UTC", choices=USER_TIMEZONE_CHOICES
-    )
 
     class Meta:
         verbose_name = "Cycle"
@@ -186,140 +176,3 @@ class CycleUserProperties(ProjectBaseModel):
 
     def __str__(self):
         return f"{self.cycle.name} {self.user.email}"
-
-
-class TypeEnum(models.TextChoices):
-    ADDED = "ADDED", "Added"
-    UPDATED = "UPDATED", "Updated"
-    REMOVED = "REMOVED", "Removed"
-    TRANSFER = "TRANSFER", "Transfer"
-
-
-class CycleIssueStateProgress(ProjectBaseModel):
-    cycle = models.ForeignKey(
-        "db.Cycle",
-        on_delete=models.DO_NOTHING,
-        related_name="cycle_issue_state_progress",
-    )
-    state = models.ForeignKey(
-        "db.State",
-        on_delete=models.DO_NOTHING,
-        related_name="cycle_issue_state_progress",
-    )
-    issue = models.ForeignKey(
-        "db.Issue",
-        on_delete=models.DO_NOTHING,
-        related_name="cycle_issue_state_progress",
-    )
-    state_group = models.CharField(max_length=255)
-    type = models.CharField(
-        max_length=30,
-        choices=TypeEnum.choices,
-    )
-    estimate_id = models.UUIDField(null=True)
-    estimate_value = models.FloatField(null=True)
-
-
-    class Meta:
-        verbose_name = "Cycle Issue State Progress"
-        verbose_name_plural = "Cycle Issue State Progress"
-        db_table = "cycle_issue_state_progress"
-        ordering = ("-created_at",)
-    
-    def __str__(self):
-        return f"{self.cycle.name} {self.issue.name}"
-
-
-class CycleAnalytics(ProjectBaseModel):
-    cycle = models.ForeignKey(
-        "db.Cycle", on_delete=models.CASCADE, related_name="cycle_analytics"
-    )
-    date = models.DateField()
-    data = models.JSONField(default=dict)
-
-    total_issues = models.FloatField(default=0)
-    total_estimate_points = models.FloatField(default=0)
-
-    # state group wise distribution
-    backlog_issues = models.FloatField(default=0)
-    unstarted_issues = models.FloatField(default=0)
-    started_issues = models.FloatField(default=0)
-    completed_issues = models.FloatField(default=0)
-    cancelled_issues = models.FloatField(default=0)
-
-    backlog_estimate_points = models.FloatField(default=0)
-    unstarted_estimate_points = models.FloatField(default=0)
-    started_estimate_points = models.FloatField(default=0)
-    completed_estimate_points = models.FloatField(default=0)
-    cancelled_estimate_points = models.FloatField(default=0)
-
-    class Meta:
-        unique_together = ["cycle", "date"]
-        verbose_name = "Cycle Analytics"
-        verbose_name_plural = "Cycle Analytics"
-        db_table = "cycle_analytics"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.user.email} <{self.cycle.name}>"
-
-
-class UpdatesEnum(models.TextChoices):
-    ONTRACK = "ONTRACK", "On Track"
-    OFFTRACK = "OFFTRACK", "Off Track"
-    AT_RISK = "AT_RISK", "At Risk"
-    STARTED = "STARTED", "Started"
-    SCOPE_INCREASED = "SCOPE_INCREASED", "Scope Increased"
-    SCOPE_DECREASED = "SCOPE_DECREASED", "Scope Decreased"
-
-
-class CycleUpdates(ProjectBaseModel):
-    cycle = models.ForeignKey(
-        "db.Cycle", on_delete=models.CASCADE, related_name="cycle_updates"
-    )
-    description = models.TextField(blank=True)
-    status = models.CharField(
-        max_length=30,
-        choices=UpdatesEnum.choices,
-    )
-    completed_issues = models.FloatField(default=0)
-    total_issues = models.FloatField(default=0)
-    total_estimate_points = models.FloatField(default=0)
-    completed_estimate_points = models.FloatField(default=0)
-
-    class Meta:
-        verbose_name = "Cycle Updates"
-        verbose_name_plural = "Cycle Updates"
-        db_table = "cycle_updates"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.cycle.name}"
-
-
-class CycleUpdateReaction(ProjectBaseModel):
-    cycle = models.ForeignKey(
-        "db.Cycle",
-        on_delete=models.CASCADE,
-        related_name="cycle_update_reactions",
-    )
-    update = models.ForeignKey(
-        "db.CycleUpdates",
-        on_delete=models.CASCADE,
-        related_name="cycle_update_reactions",
-    )
-    reaction = models.CharField(max_length=20)
-    actor = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="cycle_update_reactions",
-    )
-
-    class Meta:
-        verbose_name = "Cycle Update Reaction"
-        verbose_name_plural = "Cycle Update Reactions"
-        db_table = "cycle_update_reactions"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.actor.email} <{self.cycle.name}>"

apiserver/plane/db/models/project.py

@@ -1,5 +1,4 @@
 # Python imports
-import pytz
 from uuid import uuid4
 
 # Django imports
@@ -17,6 +16,7 @@ from .base import BaseModel
 ROLE_CHOICES = (
     (20, "Admin"),
     (15, "Member"),
+    (10, "Viewer"),
     (5, "Guest"),
 )
 
@@ -98,7 +98,6 @@ class Project(BaseModel):
     inbox_view = models.BooleanField(default=False)
     is_time_tracking_enabled = models.BooleanField(default=False)
     is_issue_type_enabled = models.BooleanField(default=False)
-    guest_view_all_features = models.BooleanField(default=False)
     cover_image = models.URLField(blank=True, null=True, max_length=800)
     estimate = models.ForeignKey(
         "db.Estimate",
@@ -120,11 +119,6 @@ class Project(BaseModel):
         related_name="default_state",
     )
     archived_at = models.DateTimeField(null=True)
-    # timezone
-    USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
-    user_timezone = models.CharField(
-        max_length=255, default="UTC", choices=USER_TIMEZONE_CHOICES
-    )
 
     def __str__(self):
         """Return name of the project"""
@@ -179,7 +173,7 @@ class ProjectMemberInvite(ProjectBaseModel):
     token = models.CharField(max_length=255)
     message = models.TextField(null=True)
     responded_at = models.DateTimeField(null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
 
     class Meta:
         verbose_name = "Project Member Invite"
@@ -200,7 +194,7 @@ class ProjectMember(ProjectBaseModel):
         related_name="member_project",
     )
     comment = models.TextField(blank=True, null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
     view_props = models.JSONField(default=get_default_props)
     default_props = models.JSONField(default=get_default_props)
     preferences = models.JSONField(default=get_default_preferences)

apiserver/plane/db/models/workspace.py

@@ -8,8 +8,9 @@ from .base import BaseModel
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 
 ROLE_CHOICES = (
-    (20, "Admin"),
-    (15, "Member"),
+    (20, "Owner"),
+    (15, "Admin"),
+    (10, "Member"),
     (5, "Guest"),
 )
 
@@ -176,7 +177,7 @@ class WorkspaceMember(BaseModel):
         on_delete=models.CASCADE,
         related_name="member_workspace",
     )
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
     company_role = models.TextField(null=True, blank=True)
     view_props = models.JSONField(default=get_default_props)
     default_props = models.JSONField(default=get_default_props)
@@ -213,7 +214,7 @@ class WorkspaceMemberInvite(BaseModel):
     token = models.CharField(max_length=255)
     message = models.TextField(null=True)
     responded_at = models.DateTimeField(null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
 
     class Meta:
         unique_together = ["email", "workspace", "deleted_at"]

apiserver/plane/settings/common.py

@@ -2,8 +2,10 @@
 
 # Python imports
 import os
+import ssl
 from urllib.parse import urlparse
 
+import certifi
 
 # Third party imports
 import dj_database_url
@@ -252,25 +254,18 @@ if AWS_S3_ENDPOINT_URL and USE_MINIO:
     AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
     AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
 
-# RabbitMQ connection settings
-RABBITMQ_HOST = os.environ.get("RABBITMQ_HOST", "localhost")
-RABBITMQ_PORT = os.environ.get("RABBITMQ_PORT", "5672")
-RABBITMQ_USER = os.environ.get("RABBITMQ_USER", "guest")
-RABBITMQ_PASSWORD = os.environ.get("RABBITMQ_PASSWORD", "guest")
-RABBITMQ_VHOST = os.environ.get("RABBITMQ_VHOST", "/")
-AMQP_URL = os.environ.get("AMQP_URL")
 
 # Celery Configuration
-if AMQP_URL:
-    CELERY_BROKER_URL = AMQP_URL
-else:
-    CELERY_BROKER_URL = f"amqp://{RABBITMQ_USER}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}"
-
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_TASK_SERIALIZER = "json"
-CELERY_RESULT_SERIALIZER = "json"
 CELERY_ACCEPT_CONTENT = ["application/json"]
 
+if REDIS_SSL:
+    redis_url = os.environ.get("REDIS_URL")
+    broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
+    CELERY_BROKER_URL = broker_url
+else:
+    CELERY_BROKER_URL = REDIS_URL
 
 CELERY_IMPORTS = (
     # scheduled tasks
@@ -279,7 +274,6 @@ CELERY_IMPORTS = (
     "plane.bgtasks.file_asset_task",
     "plane.bgtasks.email_notification_task",
     "plane.bgtasks.api_logs_task",
-    "plane.bgtasks.cycle_issue_state_progress_task",
     # management tasks
     "plane.bgtasks.dummy_data_task",
 )
@@ -337,14 +331,14 @@ SESSION_COOKIE_SECURE = secure_origins
 SESSION_COOKIE_HTTPONLY = True
 SESSION_ENGINE = "plane.db.models.session"
 SESSION_COOKIE_AGE = os.environ.get("SESSION_COOKIE_AGE", 604800)
-SESSION_COOKIE_NAME = os.environ.get("SESSION_COOKIE_NAME", "session-id")
+SESSION_COOKIE_NAME = "plane-session-id"
 SESSION_COOKIE_DOMAIN = os.environ.get("COOKIE_DOMAIN", None)
 SESSION_SAVE_EVERY_REQUEST = (
     os.environ.get("SESSION_SAVE_EVERY_REQUEST", "0") == "1"
 )
 
 # Admin Cookie
-ADMIN_SESSION_COOKIE_NAME = "admin-session-id"
+ADMIN_SESSION_COOKIE_NAME = "plane-admin-session-id"
 ADMIN_SESSION_COOKIE_AGE = os.environ.get("ADMIN_SESSION_COOKIE_AGE", 3600)
 
 # CSRF cookies

apiserver/plane/space/views/issue.py

@@ -60,6 +60,7 @@ from plane.db.models import (
     IssueVote,
     ProjectPublicMember,
     IssueAttachment,
+    Project,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_filters import issue_filters
@@ -77,6 +78,15 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
         deploy_board = DeployBoard.objects.filter(
             anchor=anchor, entity_name="project"
         ).first()
+
+        project = Project.objects.get(pk=deploy_board.project_id)
+
+        if project.archived_at:
+            return Response(
+                {"error": "Project is archived"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+    
         if not deploy_board:
             return Response(
                 {"error": "Project is not published"},

apiserver/plane/utils/global_paginator.py

@@ -1,78 +0,0 @@
-# constants
-PAGINATOR_MAX_LIMIT = 1000
-
-
-class PaginateCursor:
-    def __init__(self, current_page_size: int, current_page: int, offset: int):
-        self.current_page_size = current_page_size
-        self.current_page = current_page
-        self.offset = offset
-
-    def __str__(self):
-        return f"{self.current_page_size}:{self.current_page}:{self.offset}"
-
-    @classmethod
-    def from_string(self, value):
-        """Return the cursor value from string format"""
-        try:
-            bits = value.split(":")
-            if len(bits) != 3:
-                raise ValueError(
-                    "Cursor must be in the format 'value:offset:is_prev'"
-                )
-            return self(int(bits[0]), int(bits[1]), int(bits[2]))
-        except (TypeError, ValueError) as e:
-            raise ValueError(f"Invalid cursor format: {e}")
-
-
-def paginate(base_queryset, queryset, cursor, on_result):
-    # validating for cursor
-    if cursor is None:
-        cursor_object = PaginateCursor(PAGINATOR_MAX_LIMIT, 0, 0)
-    else:
-        cursor_object = PaginateCursor.from_string(cursor)
-
-    # getting the issues count
-    total_results = base_queryset.count()
-    page_size = min(cursor_object.current_page_size, PAGINATOR_MAX_LIMIT)
-
-    # Calculate the start and end index for the paginated data
-    start_index = 0
-    if cursor_object.current_page > 0:
-        start_index = cursor_object.current_page * page_size
-    end_index = min(start_index + page_size, total_results)
-
-    # Get the paginated data
-    paginated_data = queryset[start_index:end_index]
-
-    # Create the pagination info object
-    prev_cursor = f"{page_size}:{cursor_object.current_page-1}:0"
-    cursor = f"{page_size}:{cursor_object.current_page}:0"
-    next_cursor = None
-    if end_index < total_results:
-        next_cursor = f"{page_size}:{cursor_object.current_page+1}:0"
-
-    prev_page_results = False
-    if cursor_object.current_page > 0:
-        prev_page_results = True
-
-    next_page_results = False
-    if next_cursor:
-        next_page_results = True
-
-    if on_result:
-        paginated_data = on_result(paginated_data)
-
-    # returning the result
-    paginated_data = {
-        "prev_cursor": prev_cursor,
-        "cursor": cursor,
-        "next_cursor": next_cursor,
-        "prev_page_results": prev_page_results,
-        "next_page_results": next_page_results,
-        "page_count": len(paginated_data),
-        "total_results": total_results,
-        "results": paginated_data,
-    }
-
-    return paginated_data

apiserver/requirements/base.txt

@@ -17,7 +17,6 @@ django-cors-headers==4.3.1
 # celery
 celery==5.4.0
 django_celery_beat==2.6.0
-django-celery-results==2.5.1
 # file serve
 whitenoise==6.6.0
 # fake data
@@ -51,7 +50,7 @@ beautifulsoup4==4.12.3
 # analytics
 posthog==3.5.0
 # crypto
-cryptography==43.0.1
+cryptography==42.0.5
 # html validator
 lxml==5.2.1
 # s3
@@ -62,3 +61,4 @@ zxcvbn==4.4.28
 pytz==2024.1
 # jwt
 PyJWT==2.8.0
+

apiserver/runtime.txt

@@ -1 +1 @@
-python-3.12.6
+python-3.12.3

deploy/selfhost/docker-compose.yml

@@ -3,9 +3,9 @@ x-app-env: &app-env
     - NGINX_PORT=${NGINX_PORT:-80}
     - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
-    - SENTRY_DSN=${SENTRY_DSN:-""}
+    - SENTRY_DSN=${SENTRY_DSN}
     - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}
-    - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-}
+    - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS}
     # Gunicorn Workers
     - GUNICORN_WORKERS=${GUNICORN_WORKERS:-1}
     #DB SETTINGS
@@ -21,15 +21,6 @@ x-app-env: &app-env
     - REDIS_HOST=${REDIS_HOST:-plane-redis}
     - REDIS_PORT=${REDIS_PORT:-6379}
     - REDIS_URL=${REDIS_URL:-redis://plane-redis:6379/}
-
-    # RabbitMQ Settings
-    - RABBITMQ_HOST=${RABBITMQ_HOST:-plane-mq}
-    - RABBITMQ_PORT=${RABBITMQ_PORT:-5672}
-    - RABBITMQ_DEFAULT_USER=${RABBITMQ_USER:-plane}
-    - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD:-plane}
-    - RABBITMQ_DEFAULT_VHOST=${RABBITMQ_VHOST:-plane}
-    - RABBITMQ_VHOST=${RABBITMQ_VHOST:-plane}
-    - AMQP_URL=${AMQP_URL:-amqp://plane:plane@plane-mq:5672/plane}
     # Application secret
     - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
     # DATA STORE SETTINGS
@@ -43,8 +34,10 @@ x-app-env: &app-env
     - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-"secret-key"}
     - BUCKET_NAME=${BUCKET_NAME:-uploads}
     - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
-    # Live server env
-    - API_BASE_URL=${API_BASE_URL:-http://api:8000}
+    # Admin and Space URLs
+    - ADMIN_BASE_URL=${ADMIN_BASE_URL}
+    - SPACE_BASE_URL=${SPACE_BASE_URL}
+    - APP_BASE_URL=${APP_BASE_URL}
 
 services:
   web:
@@ -87,19 +80,6 @@ services:
       - api
       - web
 
-  live:
-    <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-live:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
-    command: node live/dist/server.js live
-    deploy:
-      replicas: ${LIVE_REPLICAS:-1}
-    depends_on:
-      - api
-      - web
-
   api:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
@@ -114,8 +94,6 @@ services:
     depends_on:
       - plane-db
       - plane-redis
-      - plane-mq
-
 
   worker:
     <<: *app-env
@@ -130,7 +108,6 @@ services:
       - api
       - plane-db
       - plane-redis
-      - plane-mq
 
   beat-worker:
     <<: *app-env
@@ -145,7 +122,6 @@ services:
       - api
       - plane-db
       - plane-redis
-      - plane-mq
 
   migrator:
     <<: *app-env
@@ -177,13 +153,6 @@ services:
     volumes:
       - redisdata:/data
 
-  plane-mq:
-    <<: *app-env
-    image: rabbitmq:3.13.6-management-alpine
-    restart: always
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-
   plane-minio:
     <<: *app-env
     image: minio/minio:latest
@@ -210,10 +179,8 @@ services:
 volumes:
   pgdata:
   redisdata:
-  
   uploads:
   logs_api:
   logs_worker:
   logs_beat-worker:
   logs_migrator:
-  rabbitmq_data: