fix: plane deploy peek overview bugs

apiserver/plane/api/serializers/issue.py

@@ -680,7 +680,7 @@ class Meta:
 class IssuePublicSerializer(BaseSerializer):
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    issue_reactions = IssueReactionLiteSerializer(read_only=True, many=True)
+    reactions = IssueReactionLiteSerializer(read_only=True, many=True, source="issue_reactions")
     votes = IssueVoteSerializer(read_only=True, many=True)
 
     class Meta:
@@ -697,12 +697,13 @@ class Meta:
             "workspace",
             "priority",
             "target_date",
-            "issue_reactions",
+            "reactions",
             "votes",
         ]
         read_only_fields = fields
 
 
+
 class IssueSubscriberSerializer(BaseSerializer):
     class Meta:
         model = IssueSubscriber

apiserver/plane/api/views/cycle.py

@@ -191,11 +191,10 @@ def list(self, request, slug, project_id):
                             workspace__slug=slug,
                             project_id=project_id,
                         )
-                        .annotate(first_name=F("assignees__first_name"))
-                        .annotate(last_name=F("assignees__last_name"))
+                        .annotate(display_name=F("assignees__display_name"))
                         .annotate(assignee_id=F("assignees__id"))
                         .annotate(avatar=F("assignees__avatar"))
-                        .values("first_name", "last_name", "assignee_id", "avatar")
+                        .values("display_name", "assignee_id", "avatar")
                         .annotate(total_issues=Count("assignee_id"))
                         .annotate(
                             completed_issues=Count(
@@ -209,7 +208,7 @@ def list(self, request, slug, project_id):
                                 filter=Q(completed_at__isnull=True),
                             )
                         )
-                        .order_by("first_name", "last_name")
+                        .order_by("display_name")
                     )
 
                     label_distribution = (

apiserver/plane/api/views/issue.py

@@ -28,7 +28,7 @@
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.parsers import MultiPartParser, FormParser
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import AllowAny, IsAuthenticated
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -1504,7 +1504,7 @@ def destroy(self, request, slug, project_id, comment_id, reaction_code):
                     {
                         "reaction": str(reaction_code),
                         "identifier": str(comment_reaction.id),
-                        "comment_id": str(comment_id)
+                        "comment_id": str(comment_id),
                     }
                 ),
             )
@@ -1532,6 +1532,18 @@ class IssueCommentPublicViewSet(BaseViewSet):
         "workspace__id",
     ]
 
+    def get_permissions(self):
+        if self.action in ["list", "retrieve"]:
+            self.permission_classes = [
+                AllowAny,
+            ]
+        else:
+            self.permission_classes = [
+                IsAuthenticated,
+            ]
+
+        return super(IssueCommentPublicViewSet, self).get_permissions()
+
     def get_queryset(self):
         project_deploy_board = ProjectDeployBoard.objects.get(
             workspace__slug=self.kwargs.get("slug"),
@@ -1741,7 +1753,7 @@ def create(self, request, slug, project_id, issue_id):
                     issue_id=str(self.kwargs.get("issue_id", None)),
                     project_id=str(self.kwargs.get("project_id", None)),
                     current_instance=None,
-                )    
+                )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except ProjectDeployBoard.DoesNotExist:
@@ -1855,7 +1867,7 @@ def create(self, request, slug, project_id, comment_id):
                     issue_id=None,
                     project_id=str(self.kwargs.get("project_id", None)),
                     current_instance=None,
-                )    
+                )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except IssueComment.DoesNotExist:
@@ -1903,7 +1915,7 @@ def destroy(self, request, slug, project_id, comment_id, reaction_code):
                     {
                         "reaction": str(reaction_code),
                         "identifier": str(comment_reaction.id),
-                        "comment_id": str(comment_id)
+                        "comment_id": str(comment_id),
                     }
                 ),
             )
@@ -1953,13 +1965,13 @@ def create(self, request, slug, project_id, issue_id):
             issue_vote.vote = request.data.get("vote", 1)
             issue_vote.save()
             issue_activity.delay(
-                    type="issue_vote.activity.created",
-                    requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
-                    actor_id=str(self.request.user.id),
-                    issue_id=str(self.kwargs.get("issue_id", None)),
-                    project_id=str(self.kwargs.get("project_id", None)),
-                    current_instance=None,
-                )
+                type="issue_vote.activity.created",
+                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=None,
+            )
             serializer = IssueVoteSerializer(issue_vote)
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         except Exception as e:
@@ -2170,4 +2182,3 @@ def get(self, request, slug, project_id):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-

apiserver/plane/db/models/issue.py

@@ -293,7 +293,7 @@ class IssueComment(ProjectBaseModel):
     comment_json = models.JSONField(blank=True, default=dict)
     comment_html = models.TextField(blank=True, default="<p></p>")
     attachments = ArrayField(models.URLField(), size=10, blank=True, default=list)
-    issue = models.ForeignKey(Issue, on_delete=models.CASCADE)
+    issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="issue_comments")
     # System can also create comment
     actor = models.ForeignKey(
         settings.AUTH_USER_MODEL,

apps/app/components/gantt-chart/helpers/draggable.tsx

@@ -73,9 +73,11 @@ export const ChartDraggable: React.FC<Props> = ({
   };
 
   // handle block resize from the left end
-  const handleBlockLeftResize = () => {
+  const handleBlockLeftResize = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     if (!currentViewData || !resizableRef.current || !block.position) return;
 
+    if (e.button !== 0) return;
+
     const resizableDiv = resizableRef.current;
 
     const columnWidth = currentViewData.data.width;
@@ -126,9 +128,11 @@ export const ChartDraggable: React.FC<Props> = ({
   };
 
   // handle block resize from the right end
-  const handleBlockRightResize = () => {
+  const handleBlockRightResize = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     if (!currentViewData || !resizableRef.current || !block.position) return;
 
+    if (e.button !== 0) return;
+
     const resizableDiv = resizableRef.current;
 
     const columnWidth = currentViewData.data.width;
@@ -173,6 +177,8 @@ export const ChartDraggable: React.FC<Props> = ({
   const handleBlockMove = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     if (!enableBlockMove || !currentViewData || !resizableRef.current || !block.position) return;
 
+    if (e.button !== 0) return;
+
     e.preventDefault();
     e.stopPropagation();
 
@@ -266,7 +272,7 @@ export const ChartDraggable: React.FC<Props> = ({
       <div
         id={`block-${block.id}`}
         ref={resizableRef}
-        className="relative group cursor-pointer font-medium rounded shadow-sm h-full inline-flex items-center transition-all"
+        className="relative group cursor-pointer font-medium h-full inline-flex items-center transition-all"
         style={{
           marginLeft: `${block.position?.marginLeft}px`,
           width: `${block.position?.width}px`,

apps/app/pages/[workspaceSlug]/editor.tsx

@@ -0,0 +1,192 @@
+import { TipTapEditor } from "components/tiptap";
+import type { NextPage } from "next";
+import { useCallback, useEffect, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+import issuesService from "services/issues.service";
+import { ICurrentUserResponse, IIssue } from "types";
+import useReloadConfirmations from "hooks/use-reload-confirmation";
+import { Spinner } from "components/ui";
+import Image404 from "public/404.svg";
+import DefaultLayout from "layouts/default-layout";
+import Image from "next/image";
+import userService from "services/user.service";
+import { useRouter } from "next/router";
+
+const Editor: NextPage = () => {
+  const [user, setUser] = useState<ICurrentUserResponse | undefined>();
+  const [isSubmitting, setIsSubmitting] = useState<"submitting" | "submitted" | "saved">("saved");
+  const [isLoading, setIsLoading] = useState("false");
+  const { setShowAlert } = useReloadConfirmations();
+  const [cookies, setCookies] = useState<any>({});
+  const [issueDetail, setIssueDetail] = useState<IIssue | null>(null);
+  const router = useRouter();
+  const { editable } = router.query;
+  const {
+    handleSubmit,
+    watch,
+    setValue,
+    control,
+    formState: { errors },
+  } = useForm<IIssue>({
+    defaultValues: {
+      name: "",
+      description: "",
+      description_html: "",
+    },
+  });
+
+  const getCookies = () => {
+    const cookies = document.cookie.split(";");
+    const cookieObj: any = {};
+    cookies.forEach((cookie) => {
+      const cookieArr = cookie.split("=");
+      cookieObj[cookieArr[0].trim()] = cookieArr[1];
+    });
+
+    setCookies(cookieObj);
+    return cookieObj;
+  };
+
+  const getIssueDetail = async (cookiesData: any) => {
+    try {
+      setIsLoading("true");
+      const userData = await userService.currentUser();
+      setUser(userData);
+      const issueDetail = await issuesService.retrieve(
+        cookiesData.MOBILE_slug,
+        cookiesData.MOBILE_project_id,
+        cookiesData.MOBILE_issue_id
+      );
+      setIssueDetail(issueDetail);
+      setIsLoading("false");
+      setValue("description_html", issueDetail.description_html);
+      setValue("description", issueDetail.description);
+    } catch (e) {
+      setIsLoading("error");
+      console.log(e);
+    }
+  };
+  useEffect(() => {
+    const cookiesData = getCookies();
+
+    getIssueDetail(cookiesData);
+  }, []);
+
+  useEffect(() => {
+    if (isSubmitting === "submitted") {
+      setShowAlert(false);
+      setTimeout(async () => {
+        setIsSubmitting("saved");
+      }, 2000);
+    } else if (isSubmitting === "submitting") {
+      setShowAlert(true);
+    }
+  }, [isSubmitting, setShowAlert]);
+
+  const submitChanges = async (
+    formData: Partial<IIssue>,
+    workspaceSlug: string,
+    projectId: string,
+    issueId: string
+  ) => {
+    if (!workspaceSlug || !projectId || !issueId) return;
+
+    const payload: Partial<IIssue> = {
+      ...formData,
+    };
+
+    delete payload.blocker_issues;
+    delete payload.blocked_issues;
+    await issuesService
+      .patchIssue(workspaceSlug as string, projectId as string, issueId as string, payload, user)
+      .catch((e) => {
+        console.log(e);
+      });
+  };
+
+  const handleDescriptionFormSubmit = useCallback(
+    async (formData: Partial<IIssue>) => {
+      if (!formData) return;
+
+      await submitChanges(
+        {
+          name: issueDetail?.name ?? "",
+          description: formData.description ?? "",
+          description_html: formData.description_html ?? "<p></p>",
+        },
+        cookies.MOBILE_slug,
+        cookies.MOBILE_project_id,
+        cookies.MOBILE_issue_id
+      );
+    },
+    [submitChanges]
+  );
+
+  return isLoading === "error" ? (
+    <ErrorEncountered />
+  ) : isLoading === "true" ? (
+    <div className="grid place-items-center h-screen w-full">
+      <Spinner />
+    </div>
+  ) : (
+    <div className="flex blur-none shadow-none backdrop:backdrop-blur-none  justify-center items-center">
+      <Controller
+        name="description_html"
+        control={control}
+        render={({ field: { value, onChange } }) => (
+          <TipTapEditor
+            borderOnFocus={false}
+            value={
+              !value ||
+              value === "" ||
+              (typeof value === "object" && Object.keys(value).length === 0)
+                ? watch("description_html")
+                : value
+            }
+            editable={editable === "true"}
+            noBorder={true}
+            workspaceSlug={cookies.MOBILE_slug ?? ""}
+            debouncedUpdatesEnabled={true}
+            setShouldShowAlert={setShowAlert}
+            setIsSubmitting={setIsSubmitting}
+            customClassName="min-h-[150px] shadow-sm"
+            editorContentCustomClassNames="pb-9"
+            onChange={(description: Object, description_html: string) => {
+              setShowAlert(true);
+              setIsSubmitting("submitting");
+              onChange(description_html);
+              setValue("description", description);
+              handleSubmit(handleDescriptionFormSubmit)().finally(() => {
+                setIsSubmitting("submitted");
+              });
+            }}
+          />
+        )}
+      />
+      <div
+        className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${
+          isSubmitting === "saved" ? "fadeOut" : "fadeIn"
+        }`}
+      >
+        {isSubmitting === "submitting" ? "Saving..." : "Saved"}
+      </div>
+    </div>
+  );
+};
+
+const ErrorEncountered: NextPage = () => (
+  <DefaultLayout>
+    <div className="grid max-h-fit place-items-center p-4">
+      <div className="space-y-8 text-center">
+        <div className="relative mx-auto h-40 w-40 lg:h-40 lg:w-40">
+          <Image src={Image404} layout="fill" alt="404- Page not found" />
+        </div>
+        <div className="space-y-2">
+          <h3 className="text-lg font-semibold">Oops! Something went wrong.</h3>
+        </div>
+      </div>
+    </div>
+  </DefaultLayout>
+);
+
+export default Editor;

apps/space/components/issues/navbar/index.tsx

@@ -68,11 +68,6 @@ const IssueNavbar = observer(() => {
         <NavbarSearch />
       </div>
 
-      {/* issue filters */}
-      <div className="flex-shrink-0 relative flex items-center gap-2">
-        <NavbarIssueFilter />
-      </div>
-
       {/* issue views */}
       <div className="flex-shrink-0 relative flex items-center gap-1 transition-all ease-in-out delay-150">
         <NavbarIssueBoardView />