feat: add GitLab OAuth client (#4692)

found via:

- https://github.com/makeplane/docs/issues/48
- https://github.com/makeplane/plane/pull/3109

README.md

@@ -48,7 +48,7 @@ Meet [Plane](https://dub.sh/plane-website-readme), an open-source project manage
 
 The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account.
 
-If you would like to self-host Plane, please see our [deployment guide](https://docs.plane.so/docker-compose).
+If you would like to self-host Plane, please see our [deployment guide](https://docs.plane.so/self-hosting/overview).
 
 | Installation methods | Docs link                                                                                                                                          |
 | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |

admin/app/authentication/components/gitlab-config.tsx

@@ -0,0 +1,59 @@
+"use client";
+
+import React from "react";
+import { observer } from "mobx-react-lite";
+import Link from "next/link";
+// icons
+import { Settings2 } from "lucide-react";
+// types
+import { TInstanceAuthenticationMethodKeys } from "@plane/types";
+// ui
+import { ToggleSwitch, getButtonStyling } from "@plane/ui";
+// helpers
+import { cn } from "@/helpers/common.helper";
+// hooks
+import { useInstance } from "@/hooks/store";
+
+type Props = {
+  disabled: boolean;
+  updateConfig: (key: TInstanceAuthenticationMethodKeys, value: string) => void;
+};
+
+export const GitlabConfiguration: React.FC<Props> = observer((props) => {
+  const { disabled, updateConfig } = props;
+  // store
+  const { formattedConfig } = useInstance();
+  // derived values
+  const enableGitlabConfig = formattedConfig?.IS_GITLAB_ENABLED ?? "";
+  const isGitlabConfigured = !!formattedConfig?.GITLAB_CLIENT_ID && !!formattedConfig?.GITLAB_CLIENT_SECRET;
+
+  return (
+    <>
+      {isGitlabConfigured ? (
+        <div className="flex items-center gap-4">
+          <Link href="/authentication/gitlab" className={cn(getButtonStyling("link-primary", "md"), "font-medium")}>
+            Edit
+          </Link>
+          <ToggleSwitch
+            value={Boolean(parseInt(enableGitlabConfig))}
+            onChange={() => {
+              Boolean(parseInt(enableGitlabConfig)) === true
+                ? updateConfig("IS_GITLAB_ENABLED", "0")
+                : updateConfig("IS_GITLAB_ENABLED", "1");
+            }}
+            size="sm"
+            disabled={disabled}
+          />
+        </div>
+      ) : (
+        <Link
+          href="/authentication/gitlab"
+          className={cn(getButtonStyling("neutral-primary", "sm"), "text-custom-text-300")}
+        >
+          <Settings2 className="h-4 w-4 p-0.5 text-custom-text-300/80" />
+          Configure
+        </Link>
+      )}
+    </>
+  );
+});

admin/app/authentication/components/index.ts

@@ -1,5 +1,6 @@
 export * from "./email-config-switch";
 export * from "./password-config-switch";
 export * from "./authentication-method-card";
+export * from "./gitlab-config";
 export * from "./github-config";
 export * from "./google-config";

admin/app/authentication/gitlab/form.tsx

@@ -0,0 +1,212 @@
+import { FC, useState } from "react";
+import isEmpty from "lodash/isEmpty";
+import Link from "next/link";
+import { useForm } from "react-hook-form";
+// types
+import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigurationKeys } from "@plane/types";
+// ui
+import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
+// components
+import {
+  ConfirmDiscardModal,
+  ControllerInput,
+  CopyField,
+  TControllerInputFormField,
+  TCopyField,
+} from "@/components/common";
+// helpers
+import { API_BASE_URL, cn } from "@/helpers/common.helper";
+// hooks
+import { useInstance } from "@/hooks/store";
+
+type Props = {
+  config: IFormattedInstanceConfiguration;
+};
+
+type GitlabConfigFormValues = Record<TInstanceGitlabAuthenticationConfigurationKeys, string>;
+
+export const InstanceGitlabConfigForm: FC<Props> = (props) => {
+  const { config } = props;
+  // states
+  const [isDiscardChangesModalOpen, setIsDiscardChangesModalOpen] = useState(false);
+  // store hooks
+  const { updateInstanceConfigurations } = useInstance();
+  // form data
+  const {
+    handleSubmit,
+    control,
+    reset,
+    formState: { errors, isDirty, isSubmitting },
+  } = useForm<GitlabConfigFormValues>({
+    defaultValues: {
+      GITLAB_HOST: config["GITLAB_HOST"],
+      GITLAB_CLIENT_ID: config["GITLAB_CLIENT_ID"],
+      GITLAB_CLIENT_SECRET: config["GITLAB_CLIENT_SECRET"],
+    },
+  });
+
+  const originURL = !isEmpty(API_BASE_URL) ? API_BASE_URL : typeof window !== "undefined" ? window.location.origin : "";
+
+  const GITLAB_FORM_FIELDS: TControllerInputFormField[] = [
+    {
+      key: "GITLAB_HOST",
+      type: "text",
+      label: "Host",
+      description: (
+        <>
+          This is the <b>GitLab host</b> to use for login, <b>including scheme</b>.
+        </>
+      ),
+      placeholder: "https://gitlab.com",
+      error: Boolean(errors.GITLAB_HOST),
+      required: true,
+    },
+    {
+      key: "GITLAB_CLIENT_ID",
+      type: "text",
+      label: "Application ID",
+      description: (
+        <>
+          Get this from your{" "}
+          <a
+            tabIndex={-1}
+            href="https://docs.gitlab.com/ee/integration/oauth_provider.html"
+            target="_blank"
+            className="text-custom-primary-100 hover:underline"
+            rel="noreferrer"
+          >
+            GitLab OAuth application settings
+          </a>
+          .
+        </>
+      ),
+      placeholder: "c2ef2e7fc4e9d15aa7630f5637d59e8e4a27ff01dceebdb26b0d267b9adcf3c3",
+      error: Boolean(errors.GITLAB_CLIENT_ID),
+      required: true,
+    },
+    {
+      key: "GITLAB_CLIENT_SECRET",
+      type: "password",
+      label: "Secret",
+      description: (
+        <>
+          The client secret is also found in your{" "}
+          <a
+            tabIndex={-1}
+            href="https://docs.gitlab.com/ee/integration/oauth_provider.html"
+            target="_blank"
+            className="text-custom-primary-100 hover:underline"
+            rel="noreferrer"
+          >
+            GitLab OAuth application settings
+          </a>
+          .
+        </>
+      ),
+      placeholder: "gloas-f79cfa9a03c97f6ffab303177a5a6778a53c61e3914ba093412f68a9298a1b28",
+      error: Boolean(errors.GITLAB_CLIENT_SECRET),
+      required: true,
+    },
+  ];
+
+  const GITLAB_SERVICE_FIELD: TCopyField[] = [
+    {
+      key: "Callback_URL",
+      label: "Callback URL",
+      url: `${originURL}/auth/gitlab/callback/`,
+      description: (
+        <>
+          We will auto-generate this. Paste this into the <b>Redirect URI</b> field of your{" "}
+          <a
+            tabIndex={-1}
+            href="https://docs.gitlab.com/ee/integration/oauth_provider.html"
+            target="_blank"
+            className="text-custom-primary-100 hover:underline"
+            rel="noreferrer"
+          >
+            GitLab OAuth application
+          </a>
+          .
+        </>
+      ),
+    },
+  ];
+
+  const onSubmit = async (formData: GitlabConfigFormValues) => {
+    const payload: Partial<GitlabConfigFormValues> = { ...formData };
+
+    await updateInstanceConfigurations(payload)
+      .then((response = []) => {
+        setToast({
+          type: TOAST_TYPE.SUCCESS,
+          title: "Success",
+          message: "GitLab Configuration Settings updated successfully",
+        });
+        reset({
+          GITLAB_HOST: response.find((item) => item.key === "GITLAB_HOST")?.value,
+          GITLAB_CLIENT_ID: response.find((item) => item.key === "GITLAB_CLIENT_ID")?.value,
+          GITLAB_CLIENT_SECRET: response.find((item) => item.key === "GITLAB_CLIENT_SECRET")?.value,
+        });
+      })
+      .catch((err) => console.error(err));
+  };
+
+  const handleGoBack = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+    if (isDirty) {
+      e.preventDefault();
+      setIsDiscardChangesModalOpen(true);
+    }
+  };
+
+  return (
+    <>
+      <ConfirmDiscardModal
+        isOpen={isDiscardChangesModalOpen}
+        onDiscardHref="/authentication"
+        handleClose={() => setIsDiscardChangesModalOpen(false)}
+      />
+      <div className="flex flex-col gap-8">
+        <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
+            <div className="pt-2 text-xl font-medium">Configuration</div>
+            {GITLAB_FORM_FIELDS.map((field) => (
+              <ControllerInput
+                key={field.key}
+                control={control}
+                type={field.type}
+                name={field.key}
+                label={field.label}
+                description={field.description}
+                placeholder={field.placeholder}
+                error={field.error}
+                required={field.required}
+              />
+            ))}
+            <div className="flex flex-col gap-1 pt-4">
+              <div className="flex items-center gap-4">
+                <Button variant="primary" onClick={handleSubmit(onSubmit)} loading={isSubmitting} disabled={!isDirty}>
+                  {isSubmitting ? "Saving..." : "Save changes"}
+                </Button>
+                <Link
+                  href="/authentication"
+                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
+                  onClick={handleGoBack}
+                >
+                  Go back
+                </Link>
+              </div>
+            </div>
+          </div>
+          <div className="col-span-2 md:col-span-1">
+            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Service provider details</div>
+              {GITLAB_SERVICE_FIELD.map((field) => (
+                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
+              ))}
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};

admin/app/authentication/gitlab/page.tsx

@@ -0,0 +1,101 @@
+"use client";
+
+import { useState } from "react";
+import { observer } from "mobx-react-lite";
+import Image from "next/image";
+import useSWR from "swr";
+import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
+// components
+import { PageHeader } from "@/components/core";
+// hooks
+import { useInstance } from "@/hooks/store";
+// icons
+import GitlabLogo from "@/public/logos/gitlab-logo.svg";
+// local components
+import { AuthenticationMethodCard } from "../components";
+import { InstanceGitlabConfigForm } from "./form";
+
+const InstanceGitlabAuthenticationPage = observer(() => {
+  // store
+  const { fetchInstanceConfigurations, formattedConfig, updateInstanceConfigurations } = useInstance();
+  // state
+  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  // config
+  const enableGitlabConfig = formattedConfig?.IS_GITLAB_ENABLED ?? "";
+
+  useSWR("INSTANCE_CONFIGURATIONS", () => fetchInstanceConfigurations());
+
+  const updateConfig = async (key: "IS_GITLAB_ENABLED", value: string) => {
+    setIsSubmitting(true);
+
+    const payload = {
+      [key]: value,
+    };
+
+    const updateConfigPromise = updateInstanceConfigurations(payload);
+
+    setPromiseToast(updateConfigPromise, {
+      loading: "Saving Configuration...",
+      success: {
+        title: "Configuration saved",
+        message: () => `GitLab authentication is now ${value ? "active" : "disabled"}.`,
+      },
+      error: {
+        title: "Error",
+        message: () => "Failed to save configuration",
+      },
+    });
+
+    await updateConfigPromise
+      .then(() => {
+        setIsSubmitting(false);
+      })
+      .catch((err) => {
+        console.error(err);
+        setIsSubmitting(false);
+      });
+  };
+  return (
+    <>
+      <PageHeader title="Authentication - God Mode" />
+      <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
+        <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+          <AuthenticationMethodCard
+            name="GitLab"
+            description="Allow members to login or sign up to plane with their GitLab accounts."
+            icon={<Image src={GitlabLogo} height={24} width={24} alt="GitLab Logo" />}
+            config={
+              <ToggleSwitch
+                value={Boolean(parseInt(enableGitlabConfig))}
+                onChange={() => {
+                  Boolean(parseInt(enableGitlabConfig)) === true
+                    ? updateConfig("IS_GITLAB_ENABLED", "0")
+                    : updateConfig("IS_GITLAB_ENABLED", "1");
+                }}
+                size="sm"
+                disabled={isSubmitting || !formattedConfig}
+              />
+            }
+            disabled={isSubmitting || !formattedConfig}
+            withBorder={false}
+          />
+        </div>
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
+          {formattedConfig ? (
+            <InstanceGitlabConfigForm config={formattedConfig} />
+          ) : (
+            <Loader className="space-y-8">
+              <Loader.Item height="50px" width="25%" />
+              <Loader.Item height="50px" />
+              <Loader.Item height="50px" />
+              <Loader.Item height="50px" />
+              <Loader.Item height="50px" width="50%" />
+            </Loader>
+          )}
+        </div>
+      </div>
+    </>
+  );
+});
+
+export default InstanceGitlabAuthenticationPage;

admin/app/authentication/page.tsx

@@ -17,12 +17,14 @@ import { useInstance } from "@/hooks/store";
 // images
 import githubLightModeImage from "@/public/logos/github-black.png";
 import githubDarkModeImage from "@/public/logos/github-white.png";
+import GitlabLogo from "@/public/logos/gitlab-logo.svg";
 import GoogleLogo from "@/public/logos/google-logo.svg";
 // local components
 import {
   AuthenticationMethodCard,
   EmailCodesConfiguration,
   PasswordLoginConfiguration,
+  GitlabConfiguration,
   GithubConfiguration,
   GoogleConfiguration,
 } from "./components";
@@ -116,6 +118,13 @@ const InstanceAuthenticationPage = observer(() => {
       ),
       config: <GithubConfiguration disabled={isSubmitting} updateConfig={updateConfig} />,
     },
+    {
+      key: "gitlab",
+      name: "GitLab",
+      description: "Allow members to login or sign up to plane with their GitLab accounts.",
+      icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,
+      config: <GitlabConfiguration disabled={isSubmitting} updateConfig={updateConfig} />,
+    },
   ];
 
   return (

admin/components/auth-header.tsx

@@ -31,6 +31,8 @@ export const InstanceHeader: FC = observer(() => {
         return "Google";
       case "github":
         return "Github";
+      case "gitlab":
+        return "GitLab";
       default:
         return pathName.toUpperCase();
     }

admin/public/logos/gitlab-logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="80 80 220 220"><defs><style>.cls-1{fill:#e24329;}.cls-2{fill:#fc6d26;}.cls-3{fill:#fca326;}</style></defs><g id="LOGO"><path class="cls-1" d="M282.83,170.73l-.27-.69-26.14-68.22a6.81,6.81,0,0,0-2.69-3.24,7,7,0,0,0-8,.43,7,7,0,0,0-2.32,3.52l-17.65,54H154.29l-17.65-54A6.86,6.86,0,0,0,134.32,99a7,7,0,0,0-8-.43,6.87,6.87,0,0,0-2.69,3.24L97.44,170l-.26.69a48.54,48.54,0,0,0,16.1,56.1l.09.07.24.17,39.82,29.82,19.7,14.91,12,9.06a8.07,8.07,0,0,0,9.76,0l12-9.06,19.7-14.91,40.06-30,.1-.08A48.56,48.56,0,0,0,282.83,170.73Z"/><path class="cls-2" d="M282.83,170.73l-.27-.69a88.3,88.3,0,0,0-35.15,15.8L190,229.25c19.55,14.79,36.57,27.64,36.57,27.64l40.06-30,.1-.08A48.56,48.56,0,0,0,282.83,170.73Z"/><path class="cls-3" d="M153.43,256.89l19.7,14.91,12,9.06a8.07,8.07,0,0,0,9.76,0l12-9.06,19.7-14.91S209.55,244,190,229.25C170.45,244,153.43,256.89,153.43,256.89Z"/><path class="cls-2" d="M132.58,185.84A88.19,88.19,0,0,0,97.44,170l-.26.69a48.54,48.54,0,0,0,16.1,56.1l.09.07.24.17,39.82,29.82s17-12.85,36.57-27.64Z"/></g></svg>

apiserver/plane/api/views/cycle.py

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

apiserver/plane/api/views/project.py

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

apiserver/plane/app/serializers/__init__.py

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

apiserver/plane/app/serializers/estimate.py

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

apiserver/plane/app/serializers/module.py

@@ -177,8 +177,6 @@ class ModuleSerializer(DynamicBaseSerializer):
     started_issues = serializers.IntegerField(read_only=True)
     unstarted_issues = serializers.IntegerField(read_only=True)
     backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimate_points = serializers.IntegerField(read_only=True)
-    completed_estimate_points = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Module
@@ -203,8 +201,6 @@ class ModuleSerializer(DynamicBaseSerializer):
             "external_id",
             "logo_props",
             # computed fields
-            "total_estimate_points",
-            "completed_estimate_points",
             "is_favorite",
             "total_issues",
             "cancelled_issues",

apiserver/plane/app/serializers/project.py

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

apiserver/plane/app/urls/estimate.py

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

apiserver/plane/app/urls/project.py

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

apiserver/plane/app/views/__init__.py

@@ -4,7 +4,7 @@ from .project.base import (
     ProjectUserViewsEndpoint,
     ProjectFavoritesViewSet,
     ProjectPublicCoverImagesEndpoint,
-    DeployBoardViewSet,
+    ProjectDeployBoardViewSet,
     ProjectArchiveUnarchiveEndpoint,
 )
 
@@ -190,7 +190,6 @@ from .external.base import (
 from .estimate.base import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,
-    EstimatePointEndpoint,
 )
 
 from .inbox.base import InboxViewSet, InboxIssueViewSet

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apiserver/plane/authentication/adapter/error.py

@@ -33,10 +33,13 @@ AUTHENTICATION_ERROR_CODES = {
     "EMAIL_CODE_ATTEMPT_EXHAUSTED_SIGN_IN": 5100,
     "EMAIL_CODE_ATTEMPT_EXHAUSTED_SIGN_UP": 5102,
     # Oauth
+    "OAUTH_NOT_CONFIGURED": 5104,
     "GOOGLE_NOT_CONFIGURED": 5105,
     "GITHUB_NOT_CONFIGURED": 5110,
+    "GITLAB_NOT_CONFIGURED": 5111,
     "GOOGLE_OAUTH_PROVIDER_ERROR": 5115,
     "GITHUB_OAUTH_PROVIDER_ERROR": 5120,
+    "GITLAB_OAUTH_PROVIDER_ERROR": 5121,
     # Reset Password
     "INVALID_PASSWORD_TOKEN": 5125,
     "EXPIRED_PASSWORD_TOKEN": 5130,

apiserver/plane/authentication/adapter/oauth.py

@@ -62,11 +62,7 @@ class OauthAdapter(Adapter):
             response.raise_for_status()
             return response.json()
         except requests.RequestException:
-            code = (
-                "GOOGLE_OAUTH_PROVIDER_ERROR"
-                if self.provider == "google"
-                else "GITHUB_OAUTH_PROVIDER_ERROR"
-            )
+            code = self._provider_error_code()
             raise AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES[code],
                 error_message=str(code),
@@ -83,8 +79,12 @@ class OauthAdapter(Adapter):
         except requests.RequestException:
             if self.provider == "google":
                 code = "GOOGLE_OAUTH_PROVIDER_ERROR"
-            if self.provider == "github":
+            elif self.provider == "github":
                 code = "GITHUB_OAUTH_PROVIDER_ERROR"
+            elif self.provider == "gitlab":
+                code = "GITLAB_OAUTH_PROVIDER_ERROR"
+            else:
+                code = "OAUTH_NOT_CONFIGURED"
 
             raise AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES[code],

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

@@ -0,0 +1,145 @@
+# Python imports
+import os
+from datetime import datetime
+from urllib.parse import urlencode
+
+import pytz
+
+# Module imports
+from plane.authentication.adapter.oauth import OauthAdapter
+from plane.license.utils.instance_value import get_configuration_value
+from plane.authentication.adapter.error import (
+    AuthenticationException,
+    AUTHENTICATION_ERROR_CODES,
+)
+
+
+class GitLabOAuthProvider(OauthAdapter):
+
+    (GITLAB_HOST,) = get_configuration_value(
+        [
+                {
+                    "key": "GITLAB_HOST",
+                    "default": os.environ.get("GITLAB_HOST", "https://gitlab.com"),
+                },
+        ]
+    )
+
+    if not GITLAB_HOST:
+        raise AuthenticationException(
+            error_code=AUTHENTICATION_ERROR_CODES["GITLAB_NOT_CONFIGURED"],
+            error_message="GITLAB_NOT_CONFIGURED",
+        )
+
+    host = GITLAB_HOST
+
+    token_url = (
+        f"{host}/oauth/token"
+    )
+    userinfo_url = (
+        f"{host}/api/v4/user"
+    )
+
+    provider = "gitlab"
+    scope = "read_user"
+
+    def __init__(self, request, code=None, state=None, callback=None):
+
+        GITLAB_CLIENT_ID, GITLAB_CLIENT_SECRET = get_configuration_value(
+            [
+                {
+                    "key": "GITLAB_CLIENT_ID",
+                    "default": os.environ.get("GITLAB_CLIENT_ID"),
+                },
+                {
+                    "key": "GITLAB_CLIENT_SECRET",
+                    "default": os.environ.get("GITLAB_CLIENT_SECRET"),
+                },
+            ]
+        )
+
+        if not (GITLAB_CLIENT_ID and GITLAB_CLIENT_SECRET):
+            raise AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES["GITLAB_NOT_CONFIGURED"],
+                error_message="GITLAB_NOT_CONFIGURED",
+            )
+
+        client_id = GITLAB_CLIENT_ID
+        client_secret = GITLAB_CLIENT_SECRET
+
+        redirect_uri = f"""{"https" if request.is_secure() else "http"}://{request.get_host()}/auth/gitlab/callback/"""
+        url_params = {
+            "client_id": client_id,
+            "redirect_uri": redirect_uri,
+            "response_type": "code",
+            "scope": self.scope,
+            "state": state,
+        }
+        auth_url = (
+            f"{self.host}/oauth/authorize?{urlencode(url_params)}"
+        )
+        super().__init__(
+            request,
+            self.provider,
+            client_id,
+            self.scope,
+            redirect_uri,
+            auth_url,
+            self.token_url,
+            self.userinfo_url,
+            client_secret,
+            code,
+            callback=callback,
+        )
+
+    def set_token_data(self):
+        data = {
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+            "code": self.code,
+            "redirect_uri": self.redirect_uri,
+            "grant_type": "authorization_code"
+        }
+        token_response = self.get_user_token(
+            data=data, headers={"Accept": "application/json"}
+        )
+        super().set_token_data(
+            {
+                "access_token": token_response.get("access_token"),
+                "refresh_token": token_response.get("refresh_token", None),
+                "access_token_expired_at": (
+                    datetime.fromtimestamp(
+                        token_response.get("created_at") + token_response.get("expires_in"),
+                        tz=pytz.utc,
+                    )
+                    if token_response.get("expires_in")
+                    else None
+                ),
+                "refresh_token_expired_at": (
+                    datetime.fromtimestamp(
+                        token_response.get("refresh_token_expired_at"),
+                        tz=pytz.utc,
+                    )
+                    if token_response.get("refresh_token_expired_at")
+                    else None
+                ),
+                "id_token": token_response.get("id_token", ""),
+            }
+        )
+
+    def set_user_data(self):
+        user_info_response = self.get_user_response()
+        email = user_info_response.get("email")
+        super().set_user_data(
+            {
+                "email": email,
+                "user": {
+                    "provider_id": user_info_response.get("id"),
+                    "email": email,
+                    "avatar": user_info_response.get("avatar_url"),
+                    "first_name": user_info_response.get("name"),
+                    "last_name": user_info_response.get("family_name"),
+                    "is_password_autoset": True,
+                },
+            }
+        )

apiserver/plane/authentication/urls.py

@@ -8,6 +8,8 @@ from .views import (
     ChangePasswordEndpoint,
     # App
     EmailCheckEndpoint,
+    GitLabCallbackEndpoint,
+    GitLabOauthInitiateEndpoint,
     GitHubCallbackEndpoint,
     GitHubOauthInitiateEndpoint,
     GoogleCallbackEndpoint,
@@ -22,6 +24,8 @@ from .views import (
     ResetPasswordSpaceEndpoint,
     # Space
     EmailCheckSpaceEndpoint,
+    GitLabCallbackSpaceEndpoint,
+    GitLabOauthInitiateSpaceEndpoint,
     GitHubCallbackSpaceEndpoint,
     GitHubOauthInitiateSpaceEndpoint,
     GoogleCallbackSpaceEndpoint,
@@ -151,6 +155,27 @@ urlpatterns = [
         GitHubCallbackSpaceEndpoint.as_view(),
         name="github-callback",
     ),
+    ## Gitlab Oauth
+    path(
+        "gitlab/",
+        GitLabOauthInitiateEndpoint.as_view(),
+        name="gitlab-initiate",
+    ),
+    path(
+        "gitlab/callback/",
+        GitLabCallbackEndpoint.as_view(),
+        name="gitlab-callback",
+    ),
+    path(
+        "spaces/gitlab/",
+        GitLabOauthInitiateSpaceEndpoint.as_view(),
+        name="gitlab-initiate",
+    ),
+    path(
+        "spaces/gitlab/callback/",
+        GitLabCallbackSpaceEndpoint.as_view(),
+        name="gitlab-callback",
+    ),
     # Email Check
     path(
         "email-check/",

apiserver/plane/authentication/views/__init__.py

@@ -14,6 +14,10 @@ from .app.github import (
     GitHubCallbackEndpoint,
     GitHubOauthInitiateEndpoint,
 )
+from .app.gitlab import (
+    GitLabCallbackEndpoint,
+    GitLabOauthInitiateEndpoint,
+)
 from .app.google import (
     GoogleCallbackEndpoint,
     GoogleOauthInitiateEndpoint,
@@ -34,6 +38,11 @@ from .space.github import (
     GitHubOauthInitiateSpaceEndpoint,
 )
 
+from .space.gitlab import (
+    GitLabCallbackSpaceEndpoint,
+    GitLabOauthInitiateSpaceEndpoint,
+)
+
 from .space.google import (
     GoogleCallbackSpaceEndpoint,
     GoogleOauthInitiateSpaceEndpoint,

apiserver/plane/authentication/views/app/gitlab.py

@@ -0,0 +1,131 @@
+import uuid
+from urllib.parse import urlencode, urljoin
+
+# Django import
+from django.http import HttpResponseRedirect
+from django.views import View
+
+# Module imports
+from plane.authentication.provider.oauth.gitlab import GitLabOAuthProvider
+from plane.authentication.utils.login import user_login
+from plane.authentication.utils.redirection_path import get_redirection_path
+from plane.authentication.utils.user_auth_workflow import (
+    post_user_auth_workflow,
+)
+from plane.license.models import Instance
+from plane.authentication.utils.host import base_host
+from plane.authentication.adapter.error import (
+    AuthenticationException,
+    AUTHENTICATION_ERROR_CODES,
+)
+
+
+class GitLabOauthInitiateEndpoint(View):
+
+    def get(self, request):
+        # Get host and next path
+        request.session["host"] = base_host(request=request, is_app=True)
+        next_path = request.GET.get("next_path")
+        if next_path:
+            request.session["next_path"] = str(next_path)
+
+        # Check instance configuration
+        instance = Instance.objects.first()
+        if instance is None or not instance.is_setup_done:
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "INSTANCE_NOT_CONFIGURED"
+                ],
+                error_message="INSTANCE_NOT_CONFIGURED",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(
+                base_host(request=request, is_app=True),
+                "?" + urlencode(params),
+            )
+            return HttpResponseRedirect(url)
+        try:
+            state = uuid.uuid4().hex
+            provider = GitLabOAuthProvider(request=request, state=state)
+            request.session["state"] = state
+            auth_url = provider.get_auth_url()
+            return HttpResponseRedirect(auth_url)
+        except AuthenticationException as e:
+            params = e.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(
+                base_host(request=request, is_app=True),
+                "?" + urlencode(params),
+            )
+            return HttpResponseRedirect(url)
+
+
+class GitLabCallbackEndpoint(View):
+
+    def get(self, request):
+        code = request.GET.get("code")
+        state = request.GET.get("state")
+        base_host = request.session.get("host")
+        next_path = request.session.get("next_path")
+
+        if state != request.session.get("state", ""):
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "GITLAB_OAUTH_PROVIDER_ERROR"
+                ],
+                error_message="GITLAB_OAUTH_PROVIDER_ERROR",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(
+                base_host,
+                "?" + urlencode(params),
+            )
+            return HttpResponseRedirect(url)
+
+        if not code:
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "GITLAB_OAUTH_PROVIDER_ERROR"
+                ],
+                error_message="GITLAB_OAUTH_PROVIDER_ERROR",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(
+                base_host,
+                "?" + urlencode(params),
+            )
+            return HttpResponseRedirect(url)
+
+        try:
+            provider = GitLabOAuthProvider(
+                request=request,
+                code=code,
+                callback=post_user_auth_workflow,
+            )
+            user = provider.authenticate()
+            # Login the user and record his device info
+            user_login(request=request, user=user, is_app=True)
+            # Get the redirection path
+            if next_path:
+                path = next_path
+            else:
+                path = get_redirection_path(user=user)
+            # redirect to referer path
+            url = urljoin(base_host, path)
+            return HttpResponseRedirect(url)
+        except AuthenticationException as e:
+            params = e.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(
+                base_host,
+                "?" + urlencode(params),
+            )
+            return HttpResponseRedirect(url)

apiserver/plane/authentication/views/space/gitlab.py

@@ -0,0 +1,109 @@
+# Python imports
+import uuid
+from urllib.parse import urlencode
+
+# Django import
+from django.http import HttpResponseRedirect
+from django.views import View
+
+# Module imports
+from plane.authentication.provider.oauth.gitlab import GitLabOAuthProvider
+from plane.authentication.utils.login import user_login
+from plane.license.models import Instance
+from plane.authentication.utils.host import base_host
+from plane.authentication.adapter.error import (
+    AUTHENTICATION_ERROR_CODES,
+    AuthenticationException,
+)
+
+
+class GitLabOauthInitiateSpaceEndpoint(View):
+
+    def get(self, request):
+        # Get host and next path
+        request.session["host"] = base_host(request=request, is_space=True)
+        next_path = request.GET.get("next_path")
+        if next_path:
+            request.session["next_path"] = str(next_path)
+
+        # Check instance configuration
+        instance = Instance.objects.first()
+        if instance is None or not instance.is_setup_done:
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "INSTANCE_NOT_CONFIGURED"
+                ],
+                error_message="INSTANCE_NOT_CONFIGURED",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
+            return HttpResponseRedirect(url)
+
+        try:
+            state = uuid.uuid4().hex
+            provider = GitLabOAuthProvider(request=request, state=state)
+            request.session["state"] = state
+            auth_url = provider.get_auth_url()
+            return HttpResponseRedirect(auth_url)
+        except AuthenticationException as e:
+            params = e.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
+            return HttpResponseRedirect(url)
+
+
+class GitLabCallbackSpaceEndpoint(View):
+
+    def get(self, request):
+        code = request.GET.get("code")
+        state = request.GET.get("state")
+        base_host = request.session.get("host")
+        next_path = request.session.get("next_path")
+
+        if state != request.session.get("state", ""):
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "GITLAB_OAUTH_PROVIDER_ERROR"
+                ],
+                error_message="GITLAB_OAUTH_PROVIDER_ERROR",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
+            return HttpResponseRedirect(url)
+
+        if not code:
+            exc = AuthenticationException(
+                error_code=AUTHENTICATION_ERROR_CODES[
+                    "GITLAB_OAUTH_PROVIDER_ERROR"
+                ],
+                error_message="GITLAB_OAUTH_PROVIDER_ERROR",
+            )
+            params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
+            return HttpResponseRedirect(url)
+
+        try:
+            provider = GitLabOAuthProvider(
+                request=request,
+                code=code,
+            )
+            user = provider.authenticate()
+            # Login the user and record his device info
+            user_login(request=request, user=user, is_space=True)
+            # Process workspace and project invitations
+            # redirect to referer path
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
+        except AuthenticationException as e:
+            params = e.get_error_dict()
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
+            return HttpResponseRedirect(url)

apiserver/plane/bgtasks/issue_activites_task.py

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

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

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-06-03 17:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0066_account_id_token_cycle_logo_props_module_logo_props'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='provider',
+            field=models.CharField(choices=[('google', 'Google'), ('github', 'Github'), ('gitlab', 'GitLab')]),
+        ),
+        migrations.AlterField(
+            model_name='socialloginconnection',
+            name='medium',
+            field=models.CharField(choices=[('Google', 'google'), ('Github', 'github'), ('GitLab', 'gitlab'), ('Jira', 'jira')], default=None, max_length=20),
+        ),
+    ]

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

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

apiserver/plane/db/models/__init__.py

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

apiserver/plane/db/models/deploy_board.py

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

apiserver/plane/db/models/estimate.py

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

apiserver/plane/db/models/issue.py

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

apiserver/plane/db/models/project.py

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

apiserver/plane/db/models/social_connection.py

@@ -10,7 +10,7 @@ from .base import BaseModel
 class SocialLoginConnection(BaseModel):
     medium = models.CharField(
         max_length=20,
-        choices=(("Google", "google"), ("Github", "github"), ("Jira", "jira")),
+        choices=(("Google", "google"), ("Github", "github"), ("GitLab", "gitlab"), ("Jira", "jira")),
         default=None,
     )
     last_login_at = models.DateTimeField(default=timezone.now, null=True)

apiserver/plane/db/models/user.py

@@ -182,7 +182,7 @@ class Account(TimeAuditModel):
     )
     provider_account_id = models.CharField(max_length=255)
     provider = models.CharField(
-        choices=(("google", "Google"), ("github", "Github")),
+        choices=(("google", "Google"), ("github", "Github"), ("gitlab", "GitLab")),
     )
     access_token = models.TextField()
     access_token_expired_at = models.DateTimeField(null=True)

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

@@ -54,6 +54,7 @@ class InstanceEndpoint(BaseAPIView):
             IS_GOOGLE_ENABLED,
             IS_GITHUB_ENABLED,
             GITHUB_APP_NAME,
+            IS_GITLAB_ENABLED,
             EMAIL_HOST,
             ENABLE_MAGIC_LINK_LOGIN,
             ENABLE_EMAIL_PASSWORD,
@@ -76,6 +77,10 @@ class InstanceEndpoint(BaseAPIView):
                     "key": "GITHUB_APP_NAME",
                     "default": os.environ.get("GITHUB_APP_NAME", ""),
                 },
+                {
+                    "key": "IS_GITLAB_ENABLED",
+                    "default": os.environ.get("IS_GITLAB_ENABLED", "0"),
+                },
                 {
                     "key": "EMAIL_HOST",
                     "default": os.environ.get("EMAIL_HOST", ""),
@@ -115,6 +120,7 @@ class InstanceEndpoint(BaseAPIView):
         # Authentication
         data["is_google_enabled"] = IS_GOOGLE_ENABLED == "1"
         data["is_github_enabled"] = IS_GITHUB_ENABLED == "1"
+        data["is_gitlab_enabled"] = IS_GITLAB_ENABLED == "1"
         data["is_magic_login_enabled"] = ENABLE_MAGIC_LINK_LOGIN == "1"
         data["is_email_password_enabled"] = ENABLE_EMAIL_PASSWORD == "1"
 

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

@@ -59,6 +59,24 @@ class Command(BaseCommand):
                 "category": "GITHUB",
                 "is_encrypted": True,
             },
+            {
+                "key": "GITLAB_HOST",
+                "value": os.environ.get("GITLAB_HOST"),
+                "category": "GITLAB",
+                "is_encrypted": False,
+            },
+            {
+                "key": "GITLAB_CLIENT_ID",
+                "value": os.environ.get("GITLAB_CLIENT_ID"),
+                "category": "GITLAB",
+                "is_encrypted": False,
+            },
+            {
+                "key": "GITLAB_CLIENT_SECRET",
+                "value": os.environ.get("GITLAB_CLIENT_SECRET"),
+                "category": "GITLAB",
+                "is_encrypted": True,
+            },
             {
                 "key": "EMAIL_HOST",
                 "value": os.environ.get("EMAIL_HOST", ""),
@@ -145,7 +163,7 @@ class Command(BaseCommand):
                     )
                 )
 
-        keys = ["IS_GOOGLE_ENABLED", "IS_GITHUB_ENABLED"]
+        keys = ["IS_GOOGLE_ENABLED", "IS_GITHUB_ENABLED", "IS_GITLAB_ENABLED"]
         if not InstanceConfiguration.objects.filter(key__in=keys).exists():
             for key in keys:
                 if key == "IS_GOOGLE_ENABLED":
@@ -216,6 +234,46 @@ class Command(BaseCommand):
                             f"{key} loaded with value from environment variable."
                         )
                     )
+                if key == "IS_GITLAB_ENABLED":
+                    GITLAB_HOST, GITLAB_CLIENT_ID, GITLAB_CLIENT_SECRET = (
+                        get_configuration_value(
+                            [
+                                {
+                                    "key": "GITLAB_HOST",
+                                    "default": os.environ.get(
+                                        "GITLAB_HOST", "https://gitlab.com"
+                                    ),
+                                },
+                                {
+                                    "key": "GITLAB_CLIENT_ID",
+                                    "default": os.environ.get(
+                                        "GITLAB_CLIENT_ID", ""
+                                    ),
+                                },
+                                {
+                                    "key": "GITLAB_CLIENT_SECRET",
+                                    "default": os.environ.get(
+                                        "GITLAB_CLIENT_SECRET", ""
+                                    ),
+                                },
+                            ]
+                        )
+                    )
+                    if bool(GITLAB_HOST) and bool(GITLAB_CLIENT_ID) and bool(GITLAB_CLIENT_SECRET):
+                        value = "1"
+                    else:
+                        value = "0"
+                    InstanceConfiguration.objects.create(
+                        key="IS_GITLAB_ENABLED",
+                        value=value,
+                        category="AUTHENTICATION",
+                        is_encrypted=False,
+                    )
+                    self.stdout.write(
+                        self.style.SUCCESS(
+                            f"{key} loaded with value from environment variable."
+                        )
+                    )
         else:
             for key in keys:
                 self.stdout.write(

apiserver/plane/license/migrations/0003_alter_changelog_title_alter_changelog_version_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 4.2.11 on 2024-06-05 13:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("license", "0002_rename_version_instance_current_version_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="changelog",
+            name="title",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="changelog",
+            name="version",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="instance",
+            name="current_version",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="instance",
+            name="latest_version",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="instance",
+            name="namespace",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="instance",
+            name="product",
+            field=models.CharField(default="plane-ce", max_length=255),
+        ),
+    ]

apiserver/plane/license/models/instance.py

@@ -21,15 +21,15 @@ class Instance(BaseModel):
     whitelist_emails = models.TextField(blank=True, null=True)
     instance_id = models.CharField(max_length=255, unique=True)
     license_key = models.CharField(max_length=256, null=True, blank=True)
-    current_version = models.CharField(max_length=10)
-    latest_version = models.CharField(max_length=10, null=True, blank=True)
+    current_version = models.CharField(max_length=255)
+    latest_version = models.CharField(max_length=255, null=True, blank=True)
     product = models.CharField(
-        max_length=50, default=ProductTypes.PLANE_CE.value
+        max_length=255, default=ProductTypes.PLANE_CE.value
     )
     domain = models.TextField(blank=True)
     # Instance specifics
     last_checked_at = models.DateTimeField()
-    namespace = models.CharField(max_length=50, blank=True, null=True)
+    namespace = models.CharField(max_length=255, blank=True, null=True)
     # telemetry and support
     is_telemetry_enabled = models.BooleanField(default=True)
     is_support_required = models.BooleanField(default=True)
@@ -86,9 +86,9 @@ class InstanceConfiguration(BaseModel):
 class ChangeLog(BaseModel):
     """Change Log model to store the release changelogs made in the application."""
 
-    title = models.CharField(max_length=100)
+    title = models.CharField(max_length=255)
     description = models.TextField(blank=True)
-    version = models.CharField(max_length=100)
+    version = models.CharField(max_length=255)
     tags = models.JSONField(default=list)
     release_date = models.DateTimeField(null=True)
     is_release_candidate = models.BooleanField(default=False)

apiserver/plane/space/urls/inbox.py

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

apiserver/plane/space/urls/issue.py

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

apiserver/plane/space/urls/project.py

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

apiserver/plane/space/views/__init__.py

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

apiserver/plane/space/views/inbox.py

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

apiserver/plane/space/views/issue.py

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

apiserver/plane/space/views/project.py

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

apiserver/plane/utils/analytics_plot.py

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

packages/constants/src/auth.ts

@@ -60,10 +60,13 @@ export enum EAuthErrorCodes {
   EXPIRED_MAGIC_CODE = "5095",
   EMAIL_CODE_ATTEMPT_EXHAUSTED = "5100",
   // Oauth
+  OAUTH_NOT_CONFIGURED = "5104",
   GOOGLE_NOT_CONFIGURED = "5105",
   GITHUB_NOT_CONFIGURED = "5110",
+  GITLAB_NOT_CONFIGURED = "5111",
   GOOGLE_OAUTH_PROVIDER_ERROR = "5115",
   GITHUB_OAUTH_PROVIDER_ERROR = "5120",
+  GITLAB_OAUTH_PROVIDER_ERROR = "5121",
   // Reset Password
   INVALID_PASSWORD_TOKEN = "5125",
   EXPIRED_PASSWORD_TOKEN = "5130",
@@ -215,6 +218,10 @@ const errorCodeMessages: {
   },
 
   // Oauth
+  [EAuthenticationErrorCodes.OAUTH_NOT_CONFIGURED]: {
+    title: `OAuth not configured`,
+    message: () => `OAuth not configured. Please contact your administrator.`,
+  },
   [EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED]: {
     title: `Google not configured`,
     message: () => `Google not configured. Please contact your administrator.`,
@@ -223,6 +230,10 @@ const errorCodeMessages: {
     title: `GitHub not configured`,
     message: () => `GitHub not configured. Please contact your administrator.`,
   },
+  [EAuthenticationErrorCodes.GITLAB_NOT_CONFIGURED]: {
+    title: `GitLab not configured`,
+    message: () => `GitLab not configured. Please contact your administrator.`,
+  },
   [EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR]: {
     title: `Google OAuth provider error`,
     message: () => `Google OAuth provider error. Please try again.`,
@@ -231,6 +242,10 @@ const errorCodeMessages: {
     title: `GitHub OAuth provider error`,
     message: () => `GitHub OAuth provider error. Please try again.`,
   },
+  [EAuthenticationErrorCodes.GITLAB_OAUTH_PROVIDER_ERROR]: {
+    title: `GitLab OAuth provider error`,
+    message: () => `GitLab OAuth provider error. Please try again.`,
+  },
 
   // Reset Password
   [EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN]: {

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

@@ -3,6 +3,7 @@ import { startImageUpload } from "src/ui/plugins/image/image-upload-handler";
 import { findTableAncestor } from "src/lib/utils";
 import { Selection } from "@tiptap/pm/state";
 import { UploadImage } from "src/types/upload-image";
+import { replaceCodeWithText } from "src/ui/extensions/code/utils/replace-code-block-with-text";
 
 export const setText = (editor: Editor, range?: Range) => {
   if (range) editor.chain().focus().deleteRange(range).clearNodes().run();
@@ -54,69 +55,11 @@ export const toggleUnderline = (editor: Editor, range?: Range) => {
   else editor.chain().focus().toggleUnderline().run();
 };
 
-const replaceCodeBlockWithContent = (editor: Editor) => {
-  try {
-    const { schema } = editor.state;
-    const { paragraph } = schema.nodes;
-    let replaced = false;
-
-    const replaceCodeBlock = (from: number, to: number, textContent: string) => {
-      const docSize = editor.state.doc.content.size;
-
-      if (from < 0 || to > docSize || from > to) {
-        console.error("Invalid range for replacement: ", from, to, "in a document of size", docSize);
-        return;
-      }
-
-      // split the textContent by new lines to handle each line as a separate paragraph
-      const lines = textContent.split(/\r?\n/);
-
-      const tr = editor.state.tr;
-
-      // Calculate the position for inserting the first paragraph
-      let insertPos = from;
-
-      // Remove the code block first
-      tr.delete(from, to);
-
-      // For each line, create a paragraph node and insert it
-      lines.forEach((line) => {
-        const paragraphNode = paragraph.create({}, schema.text(line));
-        tr.insert(insertPos, paragraphNode);
-        // Update insertPos for the next insertion
-        insertPos += paragraphNode.nodeSize;
-      });
-
-      // Dispatch the transaction
-      editor.view.dispatch(tr);
-      replaced = true;
-    };
-
-    editor.state.doc.nodesBetween(editor.state.selection.from, editor.state.selection.to, (node, pos) => {
-      if (node.type === schema.nodes.codeBlock) {
-        const startPos = pos;
-        const endPos = pos + node.nodeSize;
-        const textContent = node.textContent;
-        if (textContent.length === 0) {
-          editor.chain().focus().toggleCodeBlock().run();
-        }
-        replaceCodeBlock(startPos, endPos, textContent);
-        return false;
-      }
-    });
-
-    if (!replaced) {
-      console.log("No code block to replace.");
-    }
-  } catch (error) {
-    console.error("An error occurred while replacing code block content:", error);
-  }
-};
-
 export const toggleCodeBlock = (editor: Editor, range?: Range) => {
   try {
+    // if it's a code block, replace it with the code with paragraphs
     if (editor.isActive("codeBlock")) {
-      replaceCodeBlockWithContent(editor);
+      replaceCodeWithText(editor);
       return;
     }
 
@@ -124,11 +67,16 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {
     const text = editor.state.doc.textBetween(from, to, "\n");
     const isMultiline = text.includes("\n");
 
+    // if the selection is not a range i.e. empty, then simply convert it into a code block
     if (editor.state.selection.empty) {
       editor.chain().focus().toggleCodeBlock().run();
     } else if (isMultiline) {
+      // if the selection is multiline, then also replace the text content with
+      // a code block
       editor.chain().focus().deleteRange({ from, to }).insertContentAt(from, `\`\`\`\n${text}\n\`\`\``).run();
     } else {
+      // if the selection is single line, then simply convert it into inline
+      // code
       editor.chain().focus().toggleCode().run();
     }
   } catch (error) {

packages/editor/core/src/styles/editor.css

@@ -110,6 +110,11 @@ ul[data-type="taskList"] li > label input[type="checkbox"]:checked:hover {
   }
 }
 
+/* the p tag just after the ul tag */
+ul[data-type="taskList"] + p {
+  margin-top: 0.4rem !important;
+}
+
 ul[data-type="taskList"] li > label input[type="checkbox"] {
   position: relative;
   -webkit-appearance: none;
@@ -152,6 +157,10 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
   }
 }
 
+ul[data-type="taskList"] li > div > p {
+  margin-top: 10px;
+}
+
 ul[data-type="taskList"] li[data-checked="true"] > div > p {
   color: rgb(var(--color-text-400));
   text-decoration: line-through;

packages/editor/core/src/ui/extensions/code-inline/index.tsx

@@ -33,7 +33,7 @@ export const CustomCodeInlineExtension = Mark.create<CodeOptions>({
     return {
       HTMLAttributes: {
         class:
-          "rounded bg-custom-background-80 px-1 py-[2px] font-mono font-medium text-orange-500 border-[0.5px] border-custom-border-200 text-sm",
+          "rounded bg-custom-background-80 px-1 py-[2px] font-mono font-medium text-orange-500 border-[0.5px] border-custom-border-200",
         spellcheck: "false",
       },
     };

packages/editor/core/src/ui/extensions/code/utils/replace-code-block-with-text.ts

@@ -0,0 +1,124 @@
+import { Editor, findParentNode } from "@tiptap/core";
+
+type ReplaceCodeBlockParams = {
+  editor: Editor;
+  from: number;
+  to: number;
+  textContent: string;
+  cursorPosInsideCodeblock: number;
+};
+
+export function replaceCodeWithText(editor: Editor): void {
+  try {
+    const { from, to } = editor.state.selection;
+    const cursorPosInsideCodeblock = from;
+    let replaced = false;
+
+    editor.state.doc.nodesBetween(from, to, (node, pos) => {
+      if (node.type === editor.state.schema.nodes.codeBlock) {
+        const startPos = pos;
+        const endPos = pos + node.nodeSize;
+        const textContent = node.textContent;
+
+        if (textContent.length === 0) {
+          editor.chain().focus().toggleCodeBlock().run();
+        } else {
+          transformCodeBlockToParagraphs({
+            editor,
+            from: startPos,
+            to: endPos,
+            textContent,
+            cursorPosInsideCodeblock,
+          });
+        }
+
+        replaced = true;
+        return false;
+      }
+    });
+
+    if (!replaced) {
+      console.log("No code block to replace.");
+    }
+  } catch (error) {
+    console.error("An error occurred while replacing code block content:", error);
+  }
+}
+
+function transformCodeBlockToParagraphs({
+  editor,
+  from,
+  to,
+  textContent,
+  cursorPosInsideCodeblock,
+}: ReplaceCodeBlockParams): void {
+  const { schema } = editor.state;
+  const { paragraph } = schema.nodes;
+  const docSize = editor.state.doc.content.size;
+
+  if (from < 0 || to > docSize || from > to) {
+    console.error("Invalid range for replacement: ", from, to, "in a document of size", docSize);
+    return;
+  }
+
+  // Split the textContent by new lines to handle each line as a separate paragraph for Windows (\r\n) and Unix (\n)
+  const lines = textContent.split(/\r?\n/);
+  const tr = editor.state.tr;
+  let insertPos = from;
+
+  // Remove the code block first
+  tr.delete(from, to);
+
+  // For each line, create a paragraph node and insert it
+  lines.forEach((line) => {
+    // if the line is empty, create a paragraph node with no content
+    const paragraphNode = line.length === 0 ? paragraph.create({}) : paragraph.create({}, schema.text(line));
+    tr.insert(insertPos, paragraphNode);
+    insertPos += paragraphNode.nodeSize;
+  });
+
+  // Now persist the focus to the converted paragraph
+  const parentNodeOffset = findParentNode((node) => node.type === schema.nodes.codeBlock)(editor.state.selection)?.pos;
+
+  if (parentNodeOffset === undefined) throw new Error("Invalid code block offset");
+
+  const lineNumber = getLineNumber(textContent, cursorPosInsideCodeblock, parentNodeOffset);
+  const cursorPosOutsideCodeblock = cursorPosInsideCodeblock + (lineNumber - 1);
+
+  editor.view.dispatch(tr);
+  editor.chain().focus(cursorPosOutsideCodeblock).run();
+}
+
+/**
+ * Calculates the line number where the cursor is located inside the code block.
+ * Assumes the indexing of the content inside the code block is like ProseMirror's indexing.
+ *
+ * @param {string} textContent - The content of the code block.
+ * @param {number} cursorPosition - The absolute cursor position in the document.
+ * @param {number} codeBlockNodePos - The starting position of the code block node in the document.
+ * @returns {number} The 1-based line number where the cursor is located.
+ */
+function getLineNumber(textContent: string, cursorPosition: number, codeBlockNodePos: number): number {
+  // Split the text content into lines, handling both Unix and Windows newlines
+  const lines = textContent.split(/\r?\n/);
+  const cursorPosInsideCodeblockRelative = cursorPosition - codeBlockNodePos;
+
+  let startPosition = 0;
+  let lineNumber = 0;
+
+  for (let i = 0; i < lines.length; i++) {
+    // Calculate the end position of the current line
+    const endPosition = startPosition + lines[i].length + 1; // +1 for the newline character
+
+    // Check if the cursor position is within the current line
+    if (cursorPosInsideCodeblockRelative >= startPosition && cursorPosInsideCodeblockRelative <= endPosition) {
+      lineNumber = i + 1; // Line numbers are 1-based
+      break;
+    }
+
+    // Update the start position for the next line
+    startPosition = endPosition;
+  }
+
+  return lineNumber;
+}

packages/editor/core/src/ui/extensions/custom-list-keymap/list-helpers.ts

@@ -72,7 +72,7 @@ const getPrevListDepth = (typeOrName: string, state: EditorState) => {
   // Traverse up the document structure from the adjusted position
   for (let d = resolvedPos.depth; d > 0; d--) {
     const node = resolvedPos.node(d);
-    if (node.type.name === "bulletList" || node.type.name === "orderedList") {
+    if (node.type.name === "bulletList" || node.type.name === "orderedList" || node.type.name === "taskList") {
       // Increment depth for each list ancestor found
       depth++;
     }
@@ -146,6 +146,8 @@ export const handleBackspace = (editor: Editor, name: string, parentListTypes: s
   if (!isAtStartOfNode(editor.state)) {
     return false;
   }
+
+  // is the paragraph node inside of the current list item (maybe with a hard break)
   const isParaSibling = isCurrentParagraphASibling(editor.state);
   const isCurrentListItemSublist = prevListIsHigher(name, editor.state);
   const listItemPos = findListItemPos(name, editor.state);
@@ -306,7 +308,10 @@ const isCurrentParagraphASibling = (state: EditorState): boolean => {
   const currentParagraphNode = $from.parent; // Get the current node where the selection is.
 
   // Ensure we're in a paragraph and the parent is a list item.
-  if (currentParagraphNode.type.name === "paragraph" && listItemNode.type.name === "listItem") {
+  if (
+    currentParagraphNode.type.name === "paragraph" &&
+    (listItemNode.type.name === "listItem" || listItemNode.type.name === "taskItem")
+  ) {
     let paragraphNodesCount = 0;
     listItemNode.forEach((child) => {
       if (child.type.name === "paragraph") {
@@ -327,16 +332,19 @@ export function isCursorInSubList(editor: Editor) {
 
   // Check if the current node is a list item
   const listItem = editor.schema.nodes.listItem;
+  const taskItem = editor.schema.nodes.taskItem;
 
   // Traverse up the document tree from the current position
   for (let depth = $from.depth; depth > 0; depth--) {
     const node = $from.node(depth);
-    if (node.type === listItem) {
+    if (node.type === listItem || node.type === taskItem) {
       // If the parent of the list item is also a list, it's a sub-list
       const parent = $from.node(depth - 1);
       if (
         parent &&
-        (parent.type === editor.schema.nodes.bulletList || parent.type === editor.schema.nodes.orderedList)
+        (parent.type === editor.schema.nodes.bulletList ||
+          parent.type === editor.schema.nodes.orderedList ||
+          parent.type === editor.schema.nodes.taskList)
       ) {
         return true;
       }

packages/editor/core/src/ui/extensions/custom-list-keymap/list-keymap.ts

@@ -69,7 +69,7 @@ export const ListKeymap = ({ tabIndex }: { tabIndex?: number }) =>
 
             return handled;
           } catch (e) {
-            console.log("error in handling Backspac:", e);
+            console.log("Error in handling Delete:", e);
             return false;
           }
         },
@@ -104,7 +104,7 @@ export const ListKeymap = ({ tabIndex }: { tabIndex?: number }) =>
 
             return handled;
           } catch (e) {
-            console.log("error in handling Backspac:", e);
+            console.log("Error in handling Backspace:", e);
             return false;
           }
         },

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

@@ -15,9 +15,7 @@ declare module "@tiptap/core" {
   }
 }
 
-function autoJoin(tr: Transaction, newTr: Transaction, nodeType: NodeType) {
-  if (!tr.isGeneric) return false;
-
+function autoJoin(tr: Transaction, newTr: Transaction, nodeTypes: NodeType[]) {
   // Find all ranges where we might want to join.
   const ranges: Array<number> = [];
   for (let i = 0; i < tr.mapping.maps.length; i++) {
@@ -28,7 +26,7 @@ function autoJoin(tr: Transaction, newTr: Transaction, nodeType: NodeType) {
 
   // Figure out which joinable points exist inside those ranges,
   // by checking all node boundaries in their parent nodes.
-  const joinable = [];
+  const joinable: number[] = [];
   for (let i = 0; i < ranges.length; i += 2) {
     const from = ranges[i],
       to = ranges[i + 1];
@@ -40,7 +38,7 @@ function autoJoin(tr: Transaction, newTr: Transaction, nodeType: NodeType) {
       if (!after) break;
       if (index && joinable.indexOf(pos) == -1) {
         const before = parent.child(index - 1);
-        if (before.type == after.type && before.type === nodeType) joinable.push(pos);
+        if (before.type == after.type && nodeTypes.includes(before.type)) joinable.push(pos);
       }
       pos += after.nodeSize;
     }
@@ -88,25 +86,15 @@ export const CustomKeymap = Extension.create({
           // Create a new transaction.
           const newTr = newState.tr;
 
-          let joined = false;
-          for (const transaction of transactions) {
-            const anotherJoin = autoJoin(transaction, newTr, newState.schema.nodes["orderedList"]);
-            joined = anotherJoin || joined;
-          }
-          if (joined) {
-            return newTr;
-          }
-        },
-      }),
-      new Plugin({
-        key: new PluginKey("unordered-list-merging"),
-        appendTransaction(transactions, oldState, newState) {
-          // Create a new transaction.
-          const newTr = newState.tr;
+          const joinableNodes = [
+            newState.schema.nodes["orderedList"],
+            newState.schema.nodes["taskList"],
+            newState.schema.nodes["bulletList"],
+          ];
 
           let joined = false;
           for (const transaction of transactions) {
-            const anotherJoin = autoJoin(transaction, newTr, newState.schema.nodes["bulletList"]);
+            const anotherJoin = autoJoin(transaction, newTr, joinableNodes);
             joined = anotherJoin || joined;
           }
           if (joined) {

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

@@ -69,7 +69,6 @@ const Command = Extension.create<SlashCommandOptions>({
 
           return true;
         },
-        allowSpaces: true,
       },
     };
   },

packages/types/src/analytics.d.ts

@@ -54,7 +54,7 @@ export type TXAxisValues =
   | "state__group"
   | "labels__id"
   | "assignees__id"
-  | "estimate_point__value"
+  | "estimate_point"
   | "issue_cycle__cycle_id"
   | "issue_module__module_id"
   | "priority"

packages/types/src/current-user/accounts.d.ts

@@ -4,7 +4,7 @@ export type TCurrentUserAccount = {
   user: string | undefined;
 
   provider_account_id: string | undefined;
-  provider: "google" | "github" | string | undefined;
+  provider: "google" | "github" | "gitlab" | string | undefined;
   access_token: string | undefined;
   access_token_expired_at: Date | undefined;
   refresh_token: string | undefined;

packages/types/src/enums.ts

@@ -24,16 +24,3 @@ export enum EIssueCommentAccessSpecifier {
   EXTERNAL = "EXTERNAL",
   INTERNAL = "INTERNAL",
 }
-
-// estimates
-export enum EEstimateSystem {
-  POINTS = "points",
-  CATEGORIES = "categories",
-  TIME = "time",
-}
-
-export enum EEstimateUpdateStages {
-  CREATE = "create",
-  EDIT = "edit",
-  SWITCH = "switch",
-}

packages/types/src/estimate.d.ts

@@ -1,77 +1,40 @@
-import { EEstimateSystem, EEstimateUpdateStages } from "./enums";
-
-export interface IEstimatePoint {
-  id: string | undefined;
-  key: number | undefined;
-  value: string | undefined;
-  description: string | undefined;
-  workspace: string | undefined;
-  project: string | undefined;
-  estimate: string | undefined;
-  created_at: Date | undefined;
-  updated_at: Date | undefined;
-  created_by: string | undefined;
-  updated_by: string | undefined;
+export interface IEstimate {
+  created_at: Date;
+  created_by: string;
+  description: string;
+  id: string;
+  name: string;
+  project: string;
+  project_detail: IProject;
+  updated_at: Date;
+  updated_by: string;
+  points: IEstimatePoint[];
+  workspace: string;
+  workspace_detail: IWorkspace;
 }
 
-export type TEstimateSystemKeys =
-  | EEstimateSystem.POINTS
-  | EEstimateSystem.CATEGORIES
-  | EEstimateSystem.TIME;
-
-export interface IEstimate {
-  id: string | undefined;
-  name: string | undefined;
-  description: string | undefined;
-  type: TEstimateSystemKeys | undefined; // categories, points, time
-  points: IEstimatePoint[] | undefined;
-  workspace: string | undefined;
-  project: string | undefined;
-  last_used: boolean | undefined;
-  created_at: Date | undefined;
-  updated_at: Date | undefined;
-  created_by: string | undefined;
-  updated_by: string | undefined;
+export interface IEstimatePoint {
+  created_at: string;
+  created_by: string;
+  description: string;
+  estimate: string;
+  id: string;
+  key: number;
+  project: string;
+  updated_at: string;
+  updated_by: string;
+  value: string;
+  workspace: string;
 }
 
 export interface IEstimateFormData {
-  estimate?: {
-    name?: string;
-    type?: string;
-    last_used?: boolean;
+  estimate: {
+    name: string;
+    description: string;
   };
   estimate_points: {
-    id?: string | undefined;
+    id?: string;
     key: number;
     value: string;
   }[];
 }
-
-export type TEstimatePointsObject = {
-  id?: string | undefined;
-  key: number;
-  value: string;
-};
-
-export type TTemplateValues = {
-  title: string;
-  values: TEstimatePointsObject[];
-  hide?: boolean;
-};
-
-export type TEstimateSystem = {
-  name: string;
-  templates: Record<string, TTemplateValues>;
-  is_available: boolean;
-  is_ee: boolean;
-};
-
-export type TEstimateSystems = {
-  [K in TEstimateSystemKeys]: TEstimateSystem;
-};
-
-// update estimates
-export type TEstimateUpdateStageKeys =
-  | EEstimateUpdateStages.CREATE
-  | EEstimateUpdateStages.EDIT
-  | EEstimateUpdateStages.SWITCH;

packages/types/src/index.d.ts

@@ -15,6 +15,7 @@ export * from "./importer";
 export * from "./inbox";
 export * from "./analytics";
 export * from "./api_token";
+export * from "./app";
 export * from "./auth";
 export * from "./calendar";
 export * from "./instance";
@@ -27,4 +28,3 @@ export * from "./webhook";
 export * from "./workspace-views";
 export * from "./common";
 export * from "./pragmatic";
-export * from "./publish";

packages/types/src/instance/auth.d.ts

@@ -3,7 +3,8 @@ export type TInstanceAuthenticationMethodKeys =
   | "ENABLE_MAGIC_LINK_LOGIN"
   | "ENABLE_EMAIL_PASSWORD"
   | "IS_GOOGLE_ENABLED"
-  | "IS_GITHUB_ENABLED";
+  | "IS_GITHUB_ENABLED"
+  | "IS_GITLAB_ENABLED";
 
 export type TInstanceGoogleAuthenticationConfigurationKeys =
   | "GOOGLE_CLIENT_ID"
@@ -13,9 +14,15 @@ export type TInstanceGithubAuthenticationConfigurationKeys =
   | "GITHUB_CLIENT_ID"
   | "GITHUB_CLIENT_SECRET";
 
+export type TInstanceGitlabAuthenticationConfigurationKeys =
+  | "GITLAB_HOST"
+  | "GITLAB_CLIENT_ID"
+  | "GITLAB_CLIENT_SECRET";
+
 type TInstanceAuthenticationConfigurationKeys =
   | TInstanceGoogleAuthenticationConfigurationKeys
-  | TInstanceGithubAuthenticationConfigurationKeys;
+  | TInstanceGithubAuthenticationConfigurationKeys
+  | TInstanceGitlabAuthenticationConfigurationKeys;
 
 export type TInstanceAuthenticationKeys =
   | TInstanceAuthenticationMethodKeys

packages/types/src/instance/base.d.ts

@@ -38,6 +38,7 @@ export interface IInstance {
 export interface IInstanceConfig {
   is_google_enabled: boolean;
   is_github_enabled: boolean;
+  is_gitlab_enabled: boolean;
   is_magic_login_enabled: boolean;
   is_email_password_enabled: boolean;
   github_app_name: string | undefined;

packages/types/src/issues/issue.d.ts

@@ -15,7 +15,7 @@ export type TIssue = {
   priority: TIssuePriorities;
   label_ids: string[];
   assignee_ids: string[];
-  estimate_point: string | null;
+  estimate_point: number | null;
 
   sub_issues_count: number;
   attachment_count: number;

packages/types/src/module/modules.d.ts

@@ -44,8 +44,6 @@ export interface IModule {
   target_date: string | null;
   total_issues: number;
   unstarted_issues: number;
-  total_estimate_points?: number;
-  completed_estimate_points?: number;
   updated_at: string;
   updated_by?: string;
   archived_at: string | null;

packages/types/src/project/projects.d.ts

@@ -32,7 +32,7 @@ export interface IProject {
   estimate: string | null;
   id: string;
   identifier: string;
-  anchor: string | null;
+  is_deployed: boolean;
   is_favorite: boolean;
   is_member: boolean;
   logo_props: TLogoProps;

packages/types/src/publish.d.ts

@@ -1,41 +0,0 @@
-import { IProject, IProjectLite, IWorkspaceLite } from "@plane/types";
-
-export type TPublishEntityType = "project";
-
-export type TProjectPublishLayouts =
-  | "calendar"
-  | "gantt"
-  | "kanban"
-  | "list"
-  | "spreadsheet";
-
-export type TPublishViewProps = {
-  calendar?: boolean;
-  gantt?: boolean;
-  kanban?: boolean;
-  list?: boolean;
-  spreadsheet?: boolean;
-};
-
-export type TProjectDetails = IProjectLite &
-  Pick<IProject, "cover_image" | "logo_props" | "description">;
-
-export type TPublishSettings = {
-  anchor: string | undefined;
-  is_comments_enabled: boolean;
-  created_at: string | undefined;
-  created_by: string | undefined;
-  entity_identifier: string | undefined;
-  entity_name: TPublishEntityType | undefined;
-  id: string | undefined;
-  inbox: unknown;
-  project: string | undefined;
-  project_details: TProjectDetails | undefined;
-  is_reactions_enabled: boolean;
-  updated_at: string | undefined;
-  updated_by: string | undefined;
-  view_props: TViewProps | undefined;
-  is_votes_enabled: boolean;
-  workspace: string | undefined;
-  workspace_detail: IWorkspaceLite | undefined;
-};

packages/types/src/users.d.ts

@@ -5,7 +5,7 @@ import {
   TStateGroups,
 } from ".";
 
-type TLoginMediums = "email" | "magic-code" | "github" | "google";
+type TLoginMediums = "email" | "magic-code" | "github" | "gitlab" | "google";
 
 export interface IUser {
   id: string;
@@ -128,6 +128,7 @@ export interface IUserActivityResponse {
   prev_page_results: boolean;
   results: IIssueActivity[];
   total_pages: number;
+  total_results: number;
 }
 
 export type UserAuth = {

packages/ui/package.json

@@ -24,7 +24,7 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@blueprintjs/core": "^4.16.3",
     "@blueprintjs/popover2": "^1.13.3",
-    "@headlessui/react": "^2.0.3",
+    "@headlessui/react": "^1.7.17",
     "@popperjs/core": "^2.11.8",
     "clsx": "^2.0.0",
     "emoji-picker-react": "^4.5.16",
@@ -33,7 +33,7 @@
     "react-color": "^2.19.3",
     "react-dom": "^18.2.0",
     "react-popper": "^2.3.0",
-    "sonner": "^1.4.41",
+    "sonner": "^1.4.2",
     "tailwind-merge": "^2.0.0"
   },
   "devDependencies": {

packages/ui/src/dropdown/Readme.md

@@ -0,0 +1,44 @@
+Below is a detailed list of the props included:
+
+### Root Props
+- value: string | string[]; - Current selected value.
+- onChange: (value: string | string []) => void; - Callback function for handling value changes.
+- options: TDropdownOption[] | undefined; - Array of options.
+- onOpen?: () => void; - Callback function triggered when the dropdown opens.
+- onClose?: () => void; - Callback function triggered when the dropdown closes.
+- containerClassName?: (isOpen: boolean) => string; - Function to return the class name for the container based on the open state.
+- tabIndex?: number; - Sets the tab index for the dropdown.
+- placement?: Placement; - Determines the placement of the dropdown (e.g., top, bottom, left, right).
+- disabled?: boolean; - Disables the dropdown if set to true.
+
+---
+
+### Button Props
+- buttonContent?: (isOpen: boolean) => React.ReactNode; - Function to render the content of the button based on the open state.
+- buttonContainerClassName?: string; - Class name for the button container.
+- buttonClassName?: string; - Class name for the button itself.
+
+---
+
+### Input Props
+- disableSearch?: boolean; - Disables the search input if set to true.
+- inputPlaceholder?: string; - Placeholder text for the search input.
+- inputClassName?: string; - Class name for the search input.
+- inputIcon?: React.ReactNode; - Icon to be displayed in the search input.
+- inputContainerClassName?: string; - Class name for the search input container.
+
+---
+
+### Options Props
+- keyExtractor: (option: TDropdownOption) => string; - Function to extract the key from each option.
+- optionsContainerClassName?: string; - Class name for the options container.
+- queryArray: string[]; - Array of strings to be used for querying the options.
+- sortByKey: string; - Key to sort the options by.
+- firstItem?: (optionValue: string) => boolean; - Function to determine if an option should be the first item.
+- renderItem?: ({ value, selected }: { value: string; selected: boolean }) => React.ReactNode; - Function to render each option.
+- loader?: React.ReactNode; - Loader element to be displayed while options are being loaded.
+- disableSorting?: boolean; - Disables sorting of the options if set to true.
+
+---
+
+These properties offer extensive control over the dropdown's behavior and presentation, making it a highly versatile component suitable for various scenarios.

packages/ui/src/dropdown/common/button.tsx

@@ -0,0 +1,38 @@
+import React, { Fragment } from "react";
+// headless ui
+import { Combobox } from "@headlessui/react";
+// helper
+import { cn } from "../../../helpers";
+import { IMultiSelectDropdownButton, ISingleSelectDropdownButton } from "../dropdown";
+
+export const DropdownButton: React.FC<IMultiSelectDropdownButton | ISingleSelectDropdownButton> = (props) => {
+  const {
+    isOpen,
+    buttonContent,
+    buttonClassName,
+    buttonContainerClassName,
+    handleOnClick,
+    value,
+    setReferenceElement,
+    disabled,
+  } = props;
+  return (
+    <Combobox.Button as={Fragment}>
+      <button
+        ref={setReferenceElement}
+        type="button"
+        className={cn(
+          "clickable block h-full max-w-full outline-none",
+          {
+            "cursor-not-allowed text-custom-text-200": disabled,
+            "cursor-pointer": !disabled,
+          },
+          buttonContainerClassName
+        )}
+        onClick={handleOnClick}
+      >
+        {buttonContent ? <>{buttonContent(isOpen)}</> : <span className={cn("", buttonClassName)}>{value}</span>}
+      </button>
+    </Combobox.Button>
+  );
+};

packages/ui/src/dropdown/common/index.ts

@@ -0,0 +1,4 @@
+export * from "./input-search";
+export * from "./button";
+export * from "./options";
+export * from "./loader";

packages/ui/src/dropdown/common/input-search.tsx

@@ -0,0 +1,58 @@
+import React, { FC, useEffect, useRef } from "react";
+// headless ui
+import { Combobox } from "@headlessui/react";
+// icons
+import { Search } from "lucide-react";
+// helpers
+import { cn } from "../../../helpers";
+
+interface IInputSearch {
+  isOpen: boolean;
+  query: string;
+  updateQuery: (query: string) => void;
+  inputIcon?: React.ReactNode;
+  inputContainerClassName?: string;
+  inputClassName?: string;
+  inputPlaceholder?: string;
+}
+
+export const InputSearch: FC<IInputSearch> = (props) => {
+  const { isOpen, query, updateQuery, inputIcon, inputContainerClassName, inputClassName, inputPlaceholder } = props;
+
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  const searchInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (query !== "" && e.key === "Escape") {
+      e.stopPropagation();
+      updateQuery("");
+    }
+  };
+
+  useEffect(() => {
+    if (isOpen) {
+      inputRef.current && inputRef.current.focus();
+    }
+  }, [isOpen]);
+  return (
+    <div
+      className={cn(
+        "flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2",
+        inputContainerClassName
+      )}
+    >
+      {inputIcon ? <>{inputIcon}</> : <Search className="h-4 w-4 text-custom-text-300" aria-hidden="true" />}
+      <Combobox.Input
+        as="input"
+        ref={inputRef}
+        className={cn(
+          "w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none",
+          inputClassName
+        )}
+        value={query}
+        onChange={(e) => updateQuery(e.target.value)}
+        placeholder={inputPlaceholder ?? "Search"}
+        onKeyDown={searchInputKeyDown}
+      />
+    </div>
+  );
+};

packages/ui/src/dropdown/common/loader.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+
+export const DropdownOptionsLoader = () => (
+  <div className="flex flex-col gap-1 animate-pulse">
+    {Array.from({ length: 6 }, (_, i) => (
+      <div key={i} className="flex h-[1.925rem] w-full rounded px-1 py-1.5 bg-custom-background-90" />
+    ))}
+  </div>
+);

packages/ui/src/dropdown/common/options.tsx

@@ -0,0 +1,88 @@
+import React from "react";
+// headless ui
+import { Combobox } from "@headlessui/react";
+// icons
+import { Check } from "lucide-react";
+// components
+import { DropdownOptionsLoader, InputSearch } from ".";
+// helpers
+import { cn } from "../../../helpers";
+// types
+import { IMultiSelectDropdownOptions, ISingleSelectDropdownOptions } from "../dropdown";
+
+export const DropdownOptions: React.FC<IMultiSelectDropdownOptions | ISingleSelectDropdownOptions> = (props) => {
+  const {
+    isOpen,
+    query,
+    setQuery,
+    inputIcon,
+    inputPlaceholder,
+    inputClassName,
+    inputContainerClassName,
+    disableSearch,
+    keyExtractor,
+    options,
+    value,
+    renderItem,
+    loader,
+  } = props;
+  return (
+    <>
+      {!disableSearch && (
+        <InputSearch
+          isOpen={isOpen}
+          query={query}
+          updateQuery={(query) => setQuery(query)}
+          inputIcon={inputIcon}
+          inputPlaceholder={inputPlaceholder}
+          inputClassName={inputClassName}
+          inputContainerClassName={inputContainerClassName}
+        />
+      )}
+      <div className="mt-2 max-h-48 space-y-1 overflow-y-scroll">
+        <>
+          {options ? (
+            options.length > 0 ? (
+              options?.map((option) => (
+                <Combobox.Option
+                  key={keyExtractor(option)}
+                  value={option.data[option.value]}
+                  className={({ active, selected }) =>
+                    cn(
+                      "flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5",
+                      {
+                        "bg-custom-background-80": active,
+                        "text-custom-text-100": selected,
+                        "text-custom-text-200": !selected,
+                      },
+                      option.className && option.className({ active, selected })
+                    )
+                  }
+                >
+                  {({ selected }) => (
+                    <>
+                      {renderItem ? (
+                        <>{renderItem({ value: option.data[option.value], selected })}</>
+                      ) : (
+                        <>
+                          <span className="flex-grow truncate">{value}</span>
+                          {selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}
+                        </>
+                      )}
+                    </>
+                  )}
+                </Combobox.Option>
+              ))
+            ) : (
+              <p className="px-1.5 py-1 italic text-custom-text-400">No matching results</p>
+            )
+          ) : loader ? (
+            <> {loader} </>
+          ) : (
+            <DropdownOptionsLoader />
+          )}
+        </>
+      </div>
+    </>
+  );
+};

packages/ui/src/dropdown/dropdown.d.ts

@@ -0,0 +1,94 @@
+import { Placement } from "@popperjs/core";
+
+export interface IDropdown {
+  // root props
+  onOpen?: () => void;
+  onClose?: () => void;
+  containerClassName?: (isOpen: boolean) => string;
+  tabIndex?: number;
+  placement?: Placement;
+  disabled?: boolean;
+
+  // button props
+  buttonContent?: (isOpen: boolean) => React.ReactNode;
+  buttonContainerClassName?: string;
+  buttonClassName?: string;
+
+  // input props
+  disableSearch?: boolean;
+  inputPlaceholder?: string;
+  inputClassName?: string;
+  inputIcon?: React.ReactNode;
+  inputContainerClassName?: string;
+
+  // options props
+  keyExtractor: (option: TDropdownOption) => string;
+  optionsContainerClassName?: string;
+  queryArray: string[];
+  sortByKey: string;
+  firstItem?: (optionValue: string) => boolean;
+  renderItem?: ({ value, selected }: { value: string; selected: boolean }) => React.ReactNode;
+  loader?: React.ReactNode;
+  disableSorting?: boolean;
+}
+
+export interface TDropdownOption {
+  data: any;
+  value: string;
+  className?: ({ active, selected }: { active: boolean; selected: boolean }) => string;
+}
+
+export interface IMultiSelectDropdown extends IDropdown {
+  value: string[];
+  onChange: (value: string[]) => void;
+  options: TDropdownOption[] | undefined;
+}
+
+export interface ISingleSelectDropdown extends IDropdown {
+  value: string;
+  onChange: (value: string) => void;
+  options: TDropdownOption[] | undefined;
+}
+
+export interface IDropdownButton {
+  isOpen: boolean;
+  buttonContent?: (isOpen: boolean) => React.ReactNode;
+  buttonClassName?: string;
+  buttonContainerClassName?: string;
+  handleOnClick: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+  setReferenceElement: (element: HTMLButtonElement | null) => void;
+  disabled?: boolean;
+}
+
+export interface IMultiSelectDropdownButton extends IDropdownButton {
+  value: string[];
+}
+
+export interface ISingleSelectDropdownButton extends IDropdownButton {
+  value: string;
+}
+
+export interface IDropdownOptions {
+  isOpen: boolean;
+  query: string;
+  setQuery: (query: string) => void;
+
+  inputPlaceholder?: string;
+  inputClassName?: string;
+  inputIcon?: React.ReactNode;
+  inputContainerClassName?: string;
+  disableSearch?: boolean;
+
+  keyExtractor: (option: TDropdownOption) => string;
+  renderItem: (({ value, selected }: { value: string; selected: boolean }) => React.ReactNode) | undefined;
+  options: TDropdownOption[] | undefined;
+  loader?: React.ReactNode;
+}
+
+export interface IMultiSelectDropdownOptions extends IDropdownOptions {
+  value: string[];
+}
+
+export interface ISingleSelectDropdownOptions extends IDropdownOptions {
+  value: string;
+}

packages/ui/src/dropdown/index.ts

@@ -0,0 +1,3 @@
+export * from "./common";
+export * from "./multi-select";
+export * from "./single-select";

packages/ui/src/dropdown/multi-select.tsx

@@ -0,0 +1,167 @@
+import React, { FC, useMemo, useRef, useState } from "react";
+import sortBy from "lodash/sortBy";
+// headless ui
+import { Combobox } from "@headlessui/react";
+// popper-js
+import { usePopper } from "react-popper";
+// components
+import { DropdownButton } from "./common";
+import { DropdownOptions } from "./common/options";
+// hooks
+import { useDropdownKeyPressed } from "../hooks/use-dropdown-key-pressed";
+import useOutsideClickDetector from "../hooks/use-outside-click-detector";
+// helper
+import { cn } from "../../helpers";
+// types
+import { IMultiSelectDropdown } from "./dropdown";
+
+export const MultiSelectDropdown: FC<IMultiSelectDropdown> = (props) => {
+  const {
+    value,
+    onChange,
+    options,
+    onOpen,
+    onClose,
+    containerClassName,
+    tabIndex,
+    placement,
+    disabled,
+    buttonContent,
+    buttonContainerClassName,
+    buttonClassName,
+    disableSearch,
+    inputPlaceholder,
+    inputClassName,
+    inputIcon,
+    inputContainerClassName,
+    keyExtractor,
+    optionsContainerClassName,
+    queryArray,
+    sortByKey,
+    firstItem,
+    renderItem,
+    loader = false,
+    disableSorting,
+  } = props;
+
+  // states
+  const [isOpen, setIsOpen] = useState(false);
+  const [query, setQuery] = useState("");
+  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
+  // refs
+  const dropdownRef = useRef<HTMLDivElement | null>(null);
+  // popper-js refs
+  const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);
+
+  // popper-js init
+  const { styles, attributes } = usePopper(referenceElement, popperElement, {
+    placement: placement ?? "bottom-start",
+    modifiers: [
+      {
+        name: "preventOverflow",
+        options: {
+          padding: 12,
+        },
+      },
+    ],
+  });
+
+  // handlers
+  const toggleDropdown = () => {
+    if (!isOpen) onOpen?.();
+    setIsOpen((prevIsOpen) => !prevIsOpen);
+    if (isOpen) onClose?.();
+  };
+
+  const handleOnClick = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+    e.stopPropagation();
+    e.preventDefault();
+    toggleDropdown();
+  };
+
+  const handleClose = () => {
+    if (!isOpen) return;
+    setIsOpen(false);
+    onClose?.();
+    setQuery?.("");
+  };
+
+  // options
+  const sortedOptions = useMemo(() => {
+    if (!options) return undefined;
+
+    const filteredOptions = (options || []).filter((options) => {
+      const queryString = queryArray.map((query) => options.data[query]).join(" ");
+      return queryString.toLowerCase().includes(query.toLowerCase());
+    });
+
+    if (disableSorting) return filteredOptions;
+
+    return sortBy(filteredOptions, [
+      (option) => firstItem && firstItem(option.data[option.value]),
+      (option) => !(value ?? []).includes(option.data[option.value]),
+      () => sortByKey && sortByKey.toLowerCase(),
+    ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [query, options]);
+
+  // hooks
+  const handleKeyDown = useDropdownKeyPressed(toggleDropdown, handleClose);
+
+  useOutsideClickDetector(dropdownRef, handleClose);
+
+  return (
+    <Combobox
+      as="div"
+      ref={dropdownRef}
+      value={value}
+      onChange={onChange}
+      className={cn("h-full", containerClassName)}
+      tabIndex={tabIndex}
+      multiple
+      onKeyDown={handleKeyDown}
+      disabled={disabled}
+    >
+      <DropdownButton
+        value={value}
+        isOpen={isOpen}
+        setReferenceElement={setReferenceElement}
+        handleOnClick={handleOnClick}
+        buttonContent={buttonContent}
+        buttonClassName={buttonClassName}
+        buttonContainerClassName={buttonContainerClassName}
+        disabled={disabled}
+      />
+
+      {isOpen && (
+        <Combobox.Options className="fixed z-10" static>
+          <div
+            className={cn(
+              "my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 text-xs shadow-custom-shadow-rg focus:outline-none",
+              optionsContainerClassName
+            )}
+            ref={setPopperElement}
+            style={styles.popper}
+            {...attributes.popper}
+          >
+            <DropdownOptions
+              isOpen={isOpen}
+              query={query}
+              setQuery={setQuery}
+              inputIcon={inputIcon}
+              inputPlaceholder={inputPlaceholder}
+              inputClassName={inputClassName}
+              inputContainerClassName={inputContainerClassName}
+              disableSearch={disableSearch}
+              keyExtractor={keyExtractor}
+              options={sortedOptions}
+              value={value}
+              renderItem={renderItem}
+              loader={loader}
+            />
+          </div>
+        </Combobox.Options>
+      )}
+    </Combobox>
+  );
+};

packages/ui/src/dropdown/single-select.tsx

@@ -0,0 +1,166 @@
+import React, { FC, useMemo, useRef, useState } from "react";
+import sortBy from "lodash/sortBy";
+// headless ui
+import { Combobox } from "@headlessui/react";
+// popper-js
+import { usePopper } from "react-popper";
+// components
+import { DropdownButton } from "./common";
+import { DropdownOptions } from "./common/options";
+// hooks
+import { useDropdownKeyPressed } from "../hooks/use-dropdown-key-pressed";
+import useOutsideClickDetector from "../hooks/use-outside-click-detector";
+// helper
+import { cn } from "../../helpers";
+// types
+import { ISingleSelectDropdown } from "./dropdown";
+
+export const Dropdown: FC<ISingleSelectDropdown> = (props) => {
+  const {
+    value,
+    onChange,
+    options,
+    onOpen,
+    onClose,
+    containerClassName,
+    tabIndex,
+    placement,
+    disabled,
+    buttonContent,
+    buttonContainerClassName,
+    buttonClassName,
+    disableSearch,
+    inputPlaceholder,
+    inputClassName,
+    inputIcon,
+    inputContainerClassName,
+    keyExtractor,
+    optionsContainerClassName,
+    queryArray,
+    sortByKey,
+    firstItem,
+    renderItem,
+    loader = false,
+    disableSorting,
+  } = props;
+
+  // states
+  const [isOpen, setIsOpen] = useState(false);
+  const [query, setQuery] = useState("");
+  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
+  // refs
+  const dropdownRef = useRef<HTMLDivElement | null>(null);
+  // popper-js refs
+  const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);
+
+  // popper-js init
+  const { styles, attributes } = usePopper(referenceElement, popperElement, {
+    placement: placement ?? "bottom-start",
+    modifiers: [
+      {
+        name: "preventOverflow",
+        options: {
+          padding: 12,
+        },
+      },
+    ],
+  });
+
+  // handlers
+  const toggleDropdown = () => {
+    if (!isOpen) onOpen?.();
+    setIsOpen((prevIsOpen) => !prevIsOpen);
+    if (isOpen) onClose?.();
+  };
+
+  const handleOnClick = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+    e.stopPropagation();
+    e.preventDefault();
+    toggleDropdown();
+  };
+
+  const handleClose = () => {
+    if (!isOpen) return;
+    setIsOpen(false);
+    onClose?.();
+    setQuery?.("");
+  };
+
+  // options
+  const sortedOptions = useMemo(() => {
+    if (!options) return undefined;
+
+    const filteredOptions = (options || []).filter((options) => {
+      const queryString = queryArray.map((query) => options.data[query]).join(" ");
+      return queryString.toLowerCase().includes(query.toLowerCase());
+    });
+
+    if (disableSorting) return filteredOptions;
+
+    return sortBy(filteredOptions, [
+      (option) => firstItem && firstItem(option.data[option.value]),
+      (option) => !(value ?? []).includes(option.data[option.value]),
+      () => sortByKey && sortByKey.toLowerCase(),
+    ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [query, options]);
+
+  // hooks
+  const handleKeyDown = useDropdownKeyPressed(toggleDropdown, handleClose);
+
+  useOutsideClickDetector(dropdownRef, handleClose);
+
+  return (
+    <Combobox
+      as="div"
+      ref={dropdownRef}
+      value={value}
+      onChange={onChange}
+      className={cn("h-full", containerClassName)}
+      tabIndex={tabIndex}
+      onKeyDown={handleKeyDown}
+      disabled={disabled}
+    >
+      <DropdownButton
+        value={value}
+        isOpen={isOpen}
+        setReferenceElement={setReferenceElement}
+        handleOnClick={handleOnClick}
+        buttonContent={buttonContent}
+        buttonClassName={buttonClassName}
+        buttonContainerClassName={buttonContainerClassName}
+        disabled={disabled}
+      />
+
+      {isOpen && (
+        <Combobox.Options className="fixed z-10" static>
+          <div
+            className={cn(
+              "my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 text-xs shadow-custom-shadow-rg focus:outline-none",
+              optionsContainerClassName
+            )}
+            ref={setPopperElement}
+            style={styles.popper}
+            {...attributes.popper}
+          >
+            <DropdownOptions
+              isOpen={isOpen}
+              query={query}
+              setQuery={setQuery}
+              inputIcon={inputIcon}
+              inputPlaceholder={inputPlaceholder}
+              inputClassName={inputClassName}
+              inputContainerClassName={inputContainerClassName}
+              disableSearch={disableSearch}
+              keyExtractor={keyExtractor}
+              options={sortedOptions}
+              value={value}
+              renderItem={renderItem}
+              loader={loader}
+            />
+          </div>
+        </Combobox.Options>
+      )}
+    </Combobox>
+  );
+};

packages/ui/src/hooks/use-dropdown-key-pressed.ts

@@ -0,0 +1,36 @@
+import { useCallback } from "react";
+
+type TUseDropdownKeyPressed = {
+  (
+    onEnterKeyDown: () => void,
+    onEscKeyDown: () => void,
+    stopPropagation?: boolean
+  ): (event: React.KeyboardEvent<HTMLElement>) => void;
+};
+
+export const useDropdownKeyPressed: TUseDropdownKeyPressed = (onEnterKeyDown, onEscKeyDown, stopPropagation = true) => {
+  const stopEventPropagation = useCallback(
+    (event: React.KeyboardEvent<HTMLElement>) => {
+      if (stopPropagation) {
+        event.stopPropagation();
+        event.preventDefault();
+      }
+    },
+    [stopPropagation]
+  );
+
+  const handleKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLElement>) => {
+      if (event.key === "Enter") {
+        stopEventPropagation(event);
+        onEnterKeyDown();
+      } else if (event.key === "Escape") {
+        stopEventPropagation(event);
+        onEscKeyDown();
+      } else if (event.key === "Tab") onEscKeyDown();
+    },
+    [onEnterKeyDown, onEscKeyDown, stopEventPropagation]
+  );
+
+  return handleKeyDown;
+};

packages/ui/src/icons/gitlab-icon.tsx

@@ -0,0 +1,28 @@
+import * as React from "react";
+
+import { ISvgIcons } from "./type";
+
+export const GitlabIcon: React.FC<ISvgIcons> = ({ width = "24", height = "24", className, color }) => (
+  <svg
+    width={width}
+    height={height}
+    className={className}
+    viewBox="0 0 24 24"
+    fill="currentColor"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <g clipPath="url(#clip0_282_232)">
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M10 0C4.475 0 0 4.475 0 10C0 14.425 2.8625 18.1625 6.8375 19.4875C7.3375 19.575 7.525 19.275 7.525 19.0125C7.525 18.775 7.5125 17.9875 7.5125 17.15C5 17.6125 4.35 16.5375 4.15 15.975C4.0375 15.6875 3.55 14.8 3.125 14.5625C2.775 14.375 2.275 13.9125 3.1125 13.9C3.9 13.8875 4.4625 14.625 4.65 14.925C5.55 16.4375 6.9875 16.0125 7.5625 15.75C7.65 15.1 7.9125 14.6625 8.2 14.4125C5.975 14.1625 3.65 13.3 3.65 9.475C3.65 8.3875 4.0375 7.4875 4.675 6.7875C4.575 6.5375 4.225 5.5125 4.775 4.1375C4.775 4.1375 5.6125 3.875 7.525 5.1625C8.325 4.9375 9.175 4.825 10.025 4.825C10.875 4.825 11.725 4.9375 12.525 5.1625C14.4375 3.8625 15.275 4.1375 15.275 4.1375C15.825 5.5125 15.475 6.5375 15.375 6.7875C16.0125 7.4875 16.4 8.375 16.4 9.475C16.4 13.3125 14.0625 14.1625 11.8375 14.4125C12.2 14.725 12.5125 15.325 12.5125 16.2625C12.5125 17.6 12.5 18.675 12.5 19.0125C12.5 19.275 12.6875 19.5875 13.1875 19.4875C15.1726 18.8173 16.8976 17.5414 18.1197 15.8395C19.3418 14.1375 19.9994 12.0952 20 10C20 4.475 15.525 0 10 0Z"
+        fill={color ? color : "rgb(var(--color-text-200))"}
+      />
+    </g>
+    <defs>
+      <clipPath id="clip0_282_232">
+        <rect width={width} height={height} />
+      </clipPath>
+    </defs>
+  </svg>
+);

packages/ui/src/icons/index.ts

@@ -12,6 +12,7 @@ export * from "./dice-icon";
 export * from "./discord-icon";
 export * from "./full-screen-panel-icon";
 export * from "./github-icon";
+export * from "./gitlab-icon";
 export * from "./layer-stack";
 export * from "./layers-icon";
 export * from "./photo-filter-icon";

packages/ui/src/index.ts

@@ -4,6 +4,7 @@ export * from "./badge";
 export * from "./button";
 export * from "./emoji";
 export * from "./dropdowns";
+export * from "./dropdown";
 export * from "./form-fields";
 export * from "./icons";
 export * from "./progress";
@@ -13,6 +14,5 @@ export * from "./loader";
 export * from "./control-link";
 export * from "./toast";
 export * from "./drag-handle";
-export * from "./typography";
 export * from "./drop-indicator";
 export * from "./sortable";

packages/ui/src/sortable/sortable.stories.tsx

@@ -1,5 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import React from "react";
+import { Draggable } from "./draggable";
 import { Sortable } from "./sortable";
 
 const meta: Meta<typeof Sortable> = {
@@ -12,7 +13,7 @@ type Story = StoryObj<typeof Sortable>;
 
 const data = [
   { id: "1", name: "John Doe" },
-  { id: "2", name: "Satish" },
+  { id: "2", name: "Jane Doe 2" },
   { id: "3", name: "Alice" },
   { id: "4", name: "Bob" },
   { id: "5", name: "Charlie" },

packages/ui/src/sortable/sortable.tsx

@@ -8,7 +8,7 @@ type Props<T> = {
   onChange: (data: T[]) => void;
   keyExtractor: (item: T, index: number) => string;
   containerClassName?: string;
-  id?: string;
+  id: string;
 };
 
 const moveItem = <T,>(
@@ -17,7 +17,7 @@ const moveItem = <T,>(
   destination: T & Record<symbol, string>,
   keyExtractor: (item: T, index: number) => string
 ) => {
-  const sourceIndex = data.findIndex((item, index) => keyExtractor(item, index) === keyExtractor(source, 0));
+  const sourceIndex = data.indexOf(source);
   if (sourceIndex === -1) return data;
 
   const destinationIndex = data.findIndex((item, index) => keyExtractor(item, index) === keyExtractor(destination, 0));

space/app/[workspaceSlug]/[projectId]/page.ts

@@ -1,42 +0,0 @@
-import { notFound, redirect } from "next/navigation";
-// types
-import { TPublishSettings } from "@plane/types";
-// services
-import PublishService from "@/services/publish.service";
-
-const publishService = new PublishService();
-
-type Props = {
-  params: {
-    workspaceSlug: string;
-    projectId: string;
-  };
-  searchParams: any;
-};
-
-export default async function IssuesPage(props: Props) {
-  const { params, searchParams } = props;
-  // query params
-  const { workspaceSlug, projectId } = params;
-  const { board, peekId } = searchParams;
-
-  let response: TPublishSettings | undefined = undefined;
-  try {
-    response = await publishService.fetchAnchorFromProjectDetails(workspaceSlug, projectId);
-  } catch (error) {
-    // redirect to 404 page on error
-    notFound();
-  }
-
-  let url = "";
-  if (response?.entity_name === "project") {
-    url = `/issues/${response?.anchor}`;
-    const params = new URLSearchParams();
-    if (board) params.append("board", board);
-    if (peekId) params.append("peekId", peekId);
-    if (params.toString()) url += `?${params.toString()}`;
-    redirect(url);
-  } else {
-    notFound();
-  }
-}

space/app/[workspace_slug]/[project_id]/layout.tsx

@@ -1,39 +1,25 @@
-"use client";
-
-import { observer } from "mobx-react-lite";
 import Image from "next/image";
-import useSWR from "swr";
+import { notFound } from "next/navigation";
 // components
-import { LogoSpinner } from "@/components/common";
-import { IssuesNavbarRoot } from "@/components/issues";
-// hooks
-import { usePublish, usePublishList } from "@/hooks/store";
+import IssueNavbar from "@/components/issues/navbar";
 // assets
-import planeLogo from "@/public/plane-logo.svg";
+import planeLogo from "public/plane-logo.svg";
 
-type Props = {
+export default async function ProjectLayout({
+  children,
+  params,
+}: {
   children: React.ReactNode;
-  params: {
-    anchor: string;
-  };
-};
+  params: { workspace_slug: string; project_id: string };
+}) {
+  const { workspace_slug, project_id } = params;
 
-const IssuesLayout = observer((props: Props) => {
-  const { children, params } = props;
-  // params
-  const { anchor } = params;
-  // store hooks
-  const { fetchPublishSettings } = usePublishList();
-  const publishSettings = usePublish(anchor);
-  // fetch publish settings
-  useSWR(anchor ? `PUBLISH_SETTINGS_${anchor}` : null, anchor ? () => fetchPublishSettings(anchor) : null);
-
-  if (!publishSettings) return <LogoSpinner />;
+  if (!workspace_slug || !project_id) notFound();
 
   return (
     <div className="relative flex h-screen min-h-[500px] w-screen flex-col overflow-hidden">
       <div className="relative flex h-[60px] flex-shrink-0 select-none items-center border-b border-custom-border-300 bg-custom-sidebar-background-100">
-        <IssuesNavbarRoot publishSettings={publishSettings} />
+        <IssueNavbar workspaceSlug={workspace_slug} projectId={project_id} />
       </div>
       <div className="relative h-full w-full overflow-hidden bg-custom-background-90">{children}</div>
       <a
@@ -51,6 +37,4 @@ const IssuesLayout = observer((props: Props) => {
       </a>
     </div>
   );
-});
-
-export default IssuesLayout;
+}

space/app/[workspace_slug]/[project_id]/page.tsx

@@ -0,0 +1,16 @@
+"use client";
+
+import { useSearchParams } from "next/navigation";
+// components
+import { ProjectDetailsView } from "@/components/views";
+
+export default function WorkspaceProjectPage({ params }: { params: { workspace_slug: any; project_id: any } }) {
+  const { workspace_slug, project_id } = params;
+
+  const searchParams = useSearchParams();
+  const peekId = searchParams.get("peekId") || undefined;
+
+  if (!workspace_slug || !project_id) return <></>;
+
+  return <ProjectDetailsView workspaceSlug={workspace_slug} projectId={project_id} peekId={peekId} />;
+}

space/app/error.tsx

@@ -1,47 +1,38 @@
 "use client";
 
-// ui
+import Image from "next/image";
+import { useTheme } from "next-themes";
 import { Button } from "@plane/ui";
+// assets
+import InstanceFailureDarkImage from "@/public/instance/instance-failure-dark.svg";
+import InstanceFailureImage from "@/public/instance/instance-failure.svg";
+
+export default function InstanceError() {
+  const { resolvedTheme } = useTheme();
+
+  const instanceImage = resolvedTheme === "dark" ? InstanceFailureDarkImage : InstanceFailureImage;
 
-const ErrorPage = () => {
   const handleRetry = () => {
     window.location.reload();
   };
 
   return (
-    <div className="grid h-screen place-items-center p-4">
-      <div className="space-y-8 text-center">
-        <div className="space-y-2">
-          <h3 className="text-lg font-semibold">Exception Detected!</h3>
-          <p className="mx-auto w-1/2 text-sm text-custom-text-200">
-            We{"'"}re Sorry! An exception has been detected, and our engineering team has been notified. We apologize
-            for any inconvenience this may have caused. Please reach out to our engineering team at{" "}
-            <a href="mailto:support@plane.so" className="text-custom-primary">
-              support@plane.so
-            </a>{" "}
-            or on our{" "}
-            <a
-              href="https://discord.com/invite/A92xrEGCge"
-              target="_blank"
-              className="text-custom-primary"
-              rel="noopener noreferrer"
-            >
-              Discord
-            </a>{" "}
-            server for further assistance.
+    <div className="relative h-screen overflow-x-hidden overflow-y-auto container px-5 mx-auto flex justify-center items-center">
+      <div className="w-auto max-w-2xl relative space-y-8 py-10">
+        <div className="relative flex flex-col justify-center items-center space-y-4">
+          <Image src={instanceImage} alt="Plane instance failure image" />
+          <h3 className="font-medium text-2xl text-white ">Unable to fetch instance details.</h3>
+          <p className="font-medium text-base text-center">
+            We were unable to fetch the details of the instance. <br />
+            Fret not, it might just be a connectivity issue.
           </p>
         </div>
-        <div className="flex items-center justify-center gap-2">
-          <Button variant="primary" size="md" onClick={handleRetry}>
-            Refresh
+        <div className="flex justify-center">
+          <Button size="md" onClick={handleRetry}>
+            Retry
           </Button>
-          {/* <Button variant="neutral-primary" size="md" onClick={() => {}}>
-            Sign out
-          </Button> */}
         </div>
       </div>
     </div>
   );
-};
-
-export default ErrorPage;
+}

space/app/issues/[anchor]/page.tsx

@@ -1,30 +0,0 @@
-"use client";
-
-import { observer } from "mobx-react-lite";
-import { useSearchParams } from "next/navigation";
-// components
-import { IssuesLayoutsRoot } from "@/components/issues";
-// hooks
-import { usePublish } from "@/hooks/store";
-
-type Props = {
-  params: {
-    anchor: string;
-  };
-};
-
-const IssuesPage = observer((props: Props) => {
-  const { params } = props;
-  const { anchor } = params;
-  // params
-  const searchParams = useSearchParams();
-  const peekId = searchParams.get("peekId") || undefined;
-
-  const publishSettings = usePublish(anchor);
-
-  if (!publishSettings) return null;
-
-  return <IssuesLayoutsRoot peekId={peekId} publishSettings={publishSettings} />;
-});
-
-export default IssuesPage;

space/app/not-found.tsx

@@ -4,18 +4,20 @@ import Image from "next/image";
 // assets
 import UserLoggedInImage from "public/user-logged-in.svg";
 
-const NotFound = () => (
-  <div className="h-screen w-screen grid place-items-center">
-    <div className="text-center">
-      <div className="mx-auto size-52 grid place-items-center rounded-full bg-custom-background-80">
-        <div className="size-32">
-          <Image src={UserLoggedInImage} alt="User already logged in" />
+export default function NotFound() {
+  return (
+    <div className="flex h-screen w-screen flex-col">
+      <div className="grid h-full w-full place-items-center p-6">
+        <div className="text-center">
+          <div className="mx-auto grid h-52 w-52 place-items-center rounded-full bg-custom-background-80">
+            <div className="h-32 w-32">
+              <Image src={UserLoggedInImage} alt="User already logged in" />
+            </div>
+          </div>
+          <h1 className="mt-12 text-3xl font-semibold">Not Found</h1>
+          <p className="mt-4">Please enter the appropriate project URL to view the issue board.</p>
         </div>
       </div>
-      <h1 className="mt-12 text-3xl font-semibold">Not Found</h1>
-      <p className="mt-4">Please enter the appropriate project URL to view the issue board.</p>
     </div>
-  </div>
-);
-
-export default NotFound;
+  );
+}

space/components/account/auth-forms/auth-root.tsx

@@ -85,7 +85,7 @@ export const AuthRoot: FC = observer(() => {
   const isSMTPConfigured = config?.is_smtp_configured || false;
   const isMagicLoginEnabled = config?.is_magic_login_enabled || false;
   const isEmailPasswordEnabled = config?.is_email_password_enabled || false;
-  const isOAuthEnabled = (config && (config?.is_google_enabled || config?.is_github_enabled)) || false;
+  const isOAuthEnabled = (config && (config?.is_google_enabled || config?.is_github_enabled || config?.is_gitlab_enabled)) || false;
 
   // submit handler- email verification
   const handleEmailVerification = async (data: IEmailCheckData) => {