From 9d7b0c6daafa7d1a8b83605c0d5493dc7dcd5a83 Mon Sep 17 00:00:00 2001
From: LAKHAN BAHETI <lakhanbaheti9@gmail.com>
Date: Mon, 4 Dec 2023 17:19:39 +0530
Subject: [PATCH] chore: issue update status in peek view

---
 .../issue-peek-overview/issue-detail.tsx      | 41 ++++++++-----------
 .../issues/issue-peek-overview/view.tsx       | 38 ++++++++++++++---
 .../project-issues/project/issue.store.ts     | 14 ++++++-
 web/store/issues/types.ts                     |  3 ++
 4 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/web/components/issues/issue-peek-overview/issue-detail.tsx b/web/components/issues/issue-peek-overview/issue-detail.tsx
index 60d20483e..763d3acf3 100644
--- a/web/components/issues/issue-peek-overview/issue-detail.tsx
+++ b/web/components/issues/issue-peek-overview/issue-detail.tsx
@@ -25,19 +25,32 @@ interface IPeekOverviewIssueDetails {
   issueUpdate: (issue: Partial<IIssue>) => void;
   issueReactionCreate: (reaction: string) => void;
   issueReactionRemove: (reaction: string) => void;
+  setShowAlert: (value: boolean) => void;
 }
 
 export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = (props) => {
-  const { workspaceSlug, issue, issueReactions, user, issueUpdate, issueReactionCreate, issueReactionRemove } = props;
+  const {
+    workspaceSlug,
+    issue,
+    issueReactions,
+    user,
+    issueUpdate,
+    issueReactionCreate,
+    issueReactionRemove,
+    setShowAlert,
+  } = props;
   // store
-  const { user: userStore } = useMobxStore();
+  const {
+    user: userStore,
+    projectIssues: { isSubmitting, setIsSubmitting },
+  } = useMobxStore();
   const { currentProjectRole } = userStore;
   const isAllowed = [15, 20].includes(currentProjectRole || 0);
   // states
-  const [isSubmitting, setIsSubmitting] = useState<"submitting" | "submitted" | "saved">("saved");
+
   const [characterLimit, setCharacterLimit] = useState(false);
   // hooks
-  const { setShowAlert } = useReloadConfirmations();
+
   const editorSuggestions = useEditorSuggestions();
 
   const {
@@ -75,20 +88,9 @@ export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = (props) =
   }, [issueTitleCurrentValue, localTitleValue]);
 
   const debouncedFormSave = debounce(async () => {
-    handleSubmit(handleDescriptionFormSubmit)().finally(() => setIsSubmitting("submitted"));
+    handleSubmit(handleDescriptionFormSubmit)();
   }, 1500);
 
-  useEffect(() => {
-    if (isSubmitting === "submitted") {
-      setShowAlert(false);
-      setTimeout(async () => {
-        setIsSubmitting("saved");
-      }, 2000);
-    } else if (isSubmitting === "submitting") {
-      setShowAlert(true);
-    }
-  }, [isSubmitting, setShowAlert]);
-
   // reset form values
   useEffect(() => {
     if (!issue) return;
@@ -171,13 +173,6 @@ export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = (props) =
             />
           )}
         />
-        <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>
       <IssueReaction
         issueReactions={issueReactions}
diff --git a/web/components/issues/issue-peek-overview/view.tsx b/web/components/issues/issue-peek-overview/view.tsx
index 25b8884cf..968c4af74 100644
--- a/web/components/issues/issue-peek-overview/view.tsx
+++ b/web/components/issues/issue-peek-overview/view.tsx
@@ -1,8 +1,8 @@
-import { FC, ReactNode, useState } from "react";
+import { FC, ReactNode, useEffect, useState } from "react";
 import { useRouter } from "next/router";
 import { observer } from "mobx-react-lite";
 import useSWR from "swr";
-import { MoveRight, MoveDiagonal, Bell, Link2, Trash2 } from "lucide-react";
+import { MoveRight, MoveDiagonal, Bell, Link2, Trash2, RefreshCw } from "lucide-react";
 // components
 import { PeekOverviewIssueDetails } from "./issue-detail";
 import { PeekOverviewProperties } from "./properties";
@@ -14,6 +14,7 @@ import { DeleteArchivedIssueModal } from "../delete-archived-issue-modal";
 import { IIssue } from "types";
 // hooks
 import { useMobxStore } from "lib/mobx/store-provider";
+import useReloadConfirmations from "hooks/use-reload-confirmation";
 
 interface IIssueView {
   workspaceSlug: string;
@@ -89,11 +90,17 @@ export const IssueView: FC<IIssueView> = observer((props) => {
   const router = useRouter();
   const { peekIssueId } = router.query as { peekIssueId: string };
 
-  const { user: userStore, issueDetail: issueDetailStore } = useMobxStore();
+  const {
+    user: userStore,
+    issueDetail: issueDetailStore,
+    projectIssues: { isSubmitting, setIsSubmitting },
+  } = useMobxStore();
 
   const [peekMode, setPeekMode] = useState<TPeekModes>("side-peek");
   const [deleteIssueModal, setDeleteIssueModal] = useState(false);
 
+  const { setShowAlert } = useReloadConfirmations();
+
   const updateRoutePeekId = () => {
     if (issueId != peekIssueId) {
       issueDetailStore.setPeekId(issueId);
@@ -136,6 +143,17 @@ export const IssueView: FC<IIssueView> = observer((props) => {
 
   const currentMode = peekOptions.find((m) => m.key === peekMode);
 
+  useEffect(() => {
+    if (isSubmitting === "submitted") {
+      setShowAlert(false);
+      setTimeout(async () => {
+        setIsSubmitting("saved");
+      }, 2000);
+    } else if (isSubmitting === "submitting") {
+      setShowAlert(true);
+    }
+  }, [isSubmitting, setShowAlert]);
+
   return (
     <>
       {issue && !isArchived && (
@@ -235,12 +253,20 @@ export const IssueView: FC<IIssueView> = observer((props) => {
                       {issueSubscription && issueSubscription.subscribed ? "Unsubscribe" : "Subscribe"}
                     </Button>
                   )}
+                <div className={`flex items-center gap-x-2 ${isSubmitting === "saved" ? "fadeOut" : "fadeIn"}`}>
+                  {isSubmitting !== "submitted" && isSubmitting !== "saved" && (
+                    <RefreshCw className="h-4 w-4 stroke-custom-text-300" />
+                  )}
+                  <span className="text-sm text-custom-text-300">
+                    {isSubmitting === "submitting" ? "Saving..." : "Saved"}
+                  </span>
+                </div>
                 <button onClick={handleCopyText}>
-                  <Link2 className="h-4 w-4 text-custom-text-400 hover:text-custom-text-200 -rotate-45" />
+                  <Link2 className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200 -rotate-45" />
                 </button>
                 {!disableUserActions && (
                   <button onClick={() => setDeleteIssueModal(true)}>
-                    <Trash2 className="h-4 w-4 text-custom-text-400 hover:text-custom-text-200" />
+                    <Trash2 className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200" />
                   </button>
                 )}
               </div>
@@ -261,6 +287,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {
                           <div className="absolute top-0 left-0 h-full min-h-full w-full z-[9] flex items-center justify-center bg-custom-background-100 opacity-60" />
                         )}
                         <PeekOverviewIssueDetails
+                          setShowAlert={setShowAlert}
                           workspaceSlug={workspaceSlug}
                           issue={issue}
                           issueUpdate={issueUpdate}
@@ -295,6 +322,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {
                         <div className="relative w-full h-full space-y-6 p-4 py-5 overflow-auto">
                           <div className={isArchived ? "pointer-events-none" : ""}>
                             <PeekOverviewIssueDetails
+                              setShowAlert={setShowAlert}
                               workspaceSlug={workspaceSlug}
                               issue={issue}
                               issueReactions={issueReactions}
diff --git a/web/store/issues/project-issues/project/issue.store.ts b/web/store/issues/project-issues/project/issue.store.ts
index e2c2b8ad6..b1c0ee8b5 100644
--- a/web/store/issues/project-issues/project/issue.store.ts
+++ b/web/store/issues/project-issues/project/issue.store.ts
@@ -6,12 +6,13 @@ import { IssueService } from "services/issue/issue.service";
 // types
 import { TIssueGroupByOptions } from "types";
 import { IIssue } from "types/issues";
-import { IIssueResponse, TLoader, IGroupedIssues, ISubGroupedIssues, TUnGroupedIssues, ViewFlags } from "../../types";
+import { IIssueResponse, TLoader, IGroupedIssues, ISubGroupedIssues, TUnGroupedIssues, ViewFlags, TIssueUpdateStatus } from "../../types";
 import { RootStore } from "store/root";
 
 export interface IProjectIssuesStore {
   // observable
   loader: TLoader;
+  isSubmitting: TIssueUpdateStatus;
   issues: { [project_id: string]: IIssueResponse } | undefined;
   // computed
   getIssues: IIssueResponse | undefined;
@@ -22,12 +23,14 @@ export interface IProjectIssuesStore {
   updateIssue: (workspaceSlug: string, projectId: string, issueId: string, data: Partial<IIssue>) => Promise<IIssue>;
   removeIssue: (workspaceSlug: string, projectId: string, issueId: string) => Promise<IIssue>;
   quickAddIssue: (workspaceSlug: string, projectId: string, data: IIssue) => Promise<IIssue>;
+  setIsSubmitting: (value: TIssueUpdateStatus) => void;
 
   viewFlags: ViewFlags;
 }
 
 export class ProjectIssuesStore extends IssueBaseStore implements IProjectIssuesStore {
   loader: TLoader = "init-loader";
+  isSubmitting: TIssueUpdateStatus = "saved";
   issues: { [project_id: string]: IIssueResponse } | undefined = undefined;
   // root store
   rootStore;
@@ -48,6 +51,7 @@ export class ProjectIssuesStore extends IssueBaseStore implements IProjectIssues
       // observable
       loader: observable.ref,
       issues: observable.ref,
+      isSubmitting: observable.ref,
       // computed
       getIssues: computed,
       getIssuesIds: computed,
@@ -57,6 +61,7 @@ export class ProjectIssuesStore extends IssueBaseStore implements IProjectIssues
       updateIssue: action,
       removeIssue: action,
       quickAddIssue: action,
+      setIsSubmitting: action,
     });
 
     this.rootStore = _rootStore;
@@ -72,6 +77,10 @@ export class ProjectIssuesStore extends IssueBaseStore implements IProjectIssues
     });
   }
 
+  setIsSubmitting = (value: "submitting" | "submitted" | "saved") => {
+    this.isSubmitting = value;
+  };
+
   get getIssues() {
     const projectId = this.rootStore?.project.projectId;
     if (!projectId || !this.issues || !this.issues[projectId]) return undefined;
@@ -157,11 +166,14 @@ export class ProjectIssuesStore extends IssueBaseStore implements IProjectIssues
       _issues[projectId][issueId] = { ..._issues[projectId][issueId], ...data };
 
       runInAction(() => {
+        this.isSubmitting = "submitting";
         this.issues = _issues;
       });
 
       const response = await this.issueService.patchIssue(workspaceSlug, projectId, issueId, data);
 
+      this.isSubmitting = "submitted";
+
       return response;
     } catch (error) {
       this.fetchIssues(workspaceSlug, projectId, "mutation");
diff --git a/web/store/issues/types.ts b/web/store/issues/types.ts
index 9330aba01..dbdc6d516 100644
--- a/web/store/issues/types.ts
+++ b/web/store/issues/types.ts
@@ -31,3 +31,6 @@ export interface ViewFlags {
   enableIssueCreation: boolean;
   enableInlineEditing: boolean;
 }
+
+// issue update status
+export type TIssueUpdateStatus = "saved" | "submitting" | "submitted";