From 464c13fcd03a0168ad363c735632079a33ba13d5 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:14:41 +0530
Subject: [PATCH] fix: issue parent activity (#1629)

---
 .../core/gantt-chart-view/index.tsx           |  2 +-
 apps/app/components/issues/activity.tsx       | 49 ++++++++++---------
 .../{ => attachment}/attachment-upload.tsx    | 11 +++--
 .../issues/{ => attachment}/attachments.tsx   |  6 +--
 .../delete-attachment-modal.tsx               |  3 +-
 .../app/components/issues/attachment/index.ts |  3 ++
 apps/app/components/issues/index.ts           |  5 +-
 .../projects/[projectId]/issues/[issueId].tsx |  3 ++
 8 files changed, 45 insertions(+), 37 deletions(-)
 rename apps/app/components/issues/{ => attachment}/attachment-upload.tsx (94%)
 rename apps/app/components/issues/{ => attachment}/attachments.tsx (96%)
 rename apps/app/components/issues/{ => attachment}/delete-attachment-modal.tsx (97%)
 create mode 100644 apps/app/components/issues/attachment/index.ts

diff --git a/apps/app/components/core/gantt-chart-view/index.tsx b/apps/app/components/core/gantt-chart-view/index.tsx
index ca07e3d7a..a881cb7aa 100644
--- a/apps/app/components/core/gantt-chart-view/index.tsx
+++ b/apps/app/components/core/gantt-chart-view/index.tsx
@@ -2,7 +2,7 @@ import { useRouter } from "next/router";
 
 // components
 import { CycleIssuesGanttChartView } from "components/cycles";
-import { IssueGanttChartView } from "components/issues/gantt-chart";
+import { IssueGanttChartView } from "components/issues";
 import { ModuleIssuesGanttChartView } from "components/modules";
 import { ViewIssuesGanttChartView } from "components/views";
 
diff --git a/apps/app/components/issues/activity.tsx b/apps/app/components/issues/activity.tsx
index 58808d8a1..958a707d8 100644
--- a/apps/app/components/issues/activity.tsx
+++ b/apps/app/components/issues/activity.tsx
@@ -54,8 +54,22 @@ const activityDetails: {
   },
   attachment: {
     message: (activity) => {
-      if (activity.verb === "created") return "uploaded a new attachment.";
-      else return "removed the attachment.";
+      if (activity.verb === "created")
+        return (
+          <>
+            uploaded a new{" "}
+            <a
+              href={`${activity.new_value}`}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
+            >
+              attachment
+              <Icon iconName="launch" className="!text-xs" />
+            </a>
+          </>
+        );
+      else return "removed an attachment.";
     },
     icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
   },
@@ -187,28 +201,15 @@ const activityDetails: {
               href={`${activity.new_value}`}
               target="_blank"
               rel="noopener noreferrer"
-              className="text-custom-text-100"
+              className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               link
+              <Icon iconName="launch" className="!text-xs" />
             </a>{" "}
             to the issue.
           </>
         );
-      else
-        return (
-          <>
-            removed this{" "}
-            <a
-              href={`${activity.old_value}`}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-custom-text-100"
-            >
-              link
-            </a>{" "}
-            from the issue.
-          </>
-        );
+      else return "removed a link.";
     },
     icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
   },
@@ -244,18 +245,18 @@ const activityDetails: {
   },
   parent: {
     message: (activity) => {
-      if (!activity.old_value)
+      if (!activity.new_value)
         return (
           <>
-            set the parent to{" "}
-            <span className="font-medium text-custom-text-100">{activity.new_value}</span>.
+            removed the parent{" "}
+            <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
           </>
         );
       else
         return (
           <>
-            removed the parent{" "}
-            <span className="font-medium text-custom-text-100">{activity.old_value}</span>.
+            set the parent to{" "}
+            <span className="font-medium text-custom-text-100">{activity.new_value}</span>.
           </>
         );
     },
@@ -373,7 +374,7 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
         {issueActivities.map((activityItem, index) => {
           // determines what type of action is performed
           const message = activityItem.field
-            ? activityDetails[activityItem.field as keyof typeof activityDetails].message(
+            ? activityDetails[activityItem.field as keyof typeof activityDetails]?.message(
                 activityItem
               )
             : "created the issue.";
diff --git a/apps/app/components/issues/attachment-upload.tsx b/apps/app/components/issues/attachment/attachment-upload.tsx
similarity index 94%
rename from apps/app/components/issues/attachment-upload.tsx
rename to apps/app/components/issues/attachment/attachment-upload.tsx
index bf43a536b..be75f703b 100644
--- a/apps/app/components/issues/attachment-upload.tsx
+++ b/apps/app/components/issues/attachment/attachment-upload.tsx
@@ -6,14 +6,14 @@ import { mutate } from "swr";
 
 // react-dropzone
 import { useDropzone } from "react-dropzone";
-// toast
-import useToast from "hooks/use-toast";
-// fetch key
-import { ISSUE_ATTACHMENTS } from "constants/fetch-keys";
 // services
 import issuesService from "services/issues.service";
-// type
+// hooks
+import useToast from "hooks/use-toast";
+// types
 import { IIssueAttachment } from "types";
+// fetch-keys
+import { ISSUE_ATTACHMENTS, PROJECT_ISSUES_ACTIVITY } from "constants/fetch-keys";
 
 const maxFileSize = 5 * 1024 * 1024; // 5 MB
 
@@ -56,6 +56,7 @@ export const IssueAttachmentUpload: React.FC<Props> = ({ disabled = false }) =>
           (prevData) => [res, ...(prevData ?? [])],
           false
         );
+        mutate(PROJECT_ISSUES_ACTIVITY(issueId as string));
         setToastAlert({
           type: "success",
           title: "Success!",
diff --git a/apps/app/components/issues/attachments.tsx b/apps/app/components/issues/attachment/attachments.tsx
similarity index 96%
rename from apps/app/components/issues/attachments.tsx
rename to apps/app/components/issues/attachment/attachments.tsx
index ee4bf1134..67b5be5db 100644
--- a/apps/app/components/issues/attachments.tsx
+++ b/apps/app/components/issues/attachment/attachments.tsx
@@ -81,12 +81,12 @@ export const IssueAttachments = () => {
                         } uploaded on ${renderLongDateFormat(file.updated_at)}`}
                       >
                         <span>
-                          <ExclamationIcon className="h-3 w-3 fill-current text-custom-text-100" />
+                          <ExclamationIcon className="h-3 w-3 fill-current" />
                         </span>
                       </Tooltip>
                     </div>
 
-                    <div className="flex items-center gap-3 text-xs text-gray-500">
+                    <div className="flex items-center gap-3 text-xs text-custom-text-200">
                       <span>{getFileExtension(file.asset).toUpperCase()}</span>
                       <span>{convertBytesToSize(file.attributes.size)}</span>
                     </div>
@@ -101,7 +101,7 @@ export const IssueAttachments = () => {
                 setAttachmentDeleteModal(true);
               }}
             >
-              <XMarkIcon className="h-4 w-4 text-gray-500 hover:text-gray-800" />
+              <XMarkIcon className="h-4 w-4 text-custom-text-200 hover:text-custom-text-100" />
             </button>
           </div>
         ))}
diff --git a/apps/app/components/issues/delete-attachment-modal.tsx b/apps/app/components/issues/attachment/delete-attachment-modal.tsx
similarity index 97%
rename from apps/app/components/issues/delete-attachment-modal.tsx
rename to apps/app/components/issues/attachment/delete-attachment-modal.tsx
index 0ea0f9684..7c0495dd6 100644
--- a/apps/app/components/issues/delete-attachment-modal.tsx
+++ b/apps/app/components/issues/attachment/delete-attachment-modal.tsx
@@ -19,7 +19,7 @@ import { getFileName } from "helpers/attachment.helper";
 // types
 import type { IIssueAttachment } from "types";
 // fetch-keys
-import { ISSUE_ATTACHMENTS } from "constants/fetch-keys";
+import { ISSUE_ATTACHMENTS, PROJECT_ISSUES_ACTIVITY } from "constants/fetch-keys";
 
 type Props = {
   isOpen: boolean;
@@ -53,6 +53,7 @@ export const DeleteAttachmentModal: React.FC<Props> = ({ isOpen, setIsOpen, data
         issueId as string,
         assetId as string
       )
+      .then(() => mutate(PROJECT_ISSUES_ACTIVITY(issueId as string)))
       .catch(() => {
         setToastAlert({
           type: "error",
diff --git a/apps/app/components/issues/attachment/index.ts b/apps/app/components/issues/attachment/index.ts
new file mode 100644
index 000000000..9546de31e
--- /dev/null
+++ b/apps/app/components/issues/attachment/index.ts
@@ -0,0 +1,3 @@
+export * from "./attachment-upload";
+export * from "./attachments";
+export * from "./delete-attachment-modal";
diff --git a/apps/app/components/issues/index.ts b/apps/app/components/issues/index.ts
index 7549d19d4..0ac13c992 100644
--- a/apps/app/components/issues/index.ts
+++ b/apps/app/components/issues/index.ts
@@ -1,3 +1,4 @@
+export * from "./attachment";
 export * from "./comment";
 export * from "./sidebar-select";
 export * from "./view-select";
@@ -5,12 +6,10 @@ export * from "./activity";
 export * from "./delete-issue-modal";
 export * from "./description-form";
 export * from "./form";
+export * from "./gantt-chart";
 export * from "./main-content";
 export * from "./modal";
 export * from "./my-issues-list-item";
 export * from "./parent-issues-list-modal";
 export * from "./sidebar";
 export * from "./sub-issues-list";
-export * from "./attachment-upload";
-export * from "./attachments";
-export * from "./delete-attachment-modal";
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
index 9af7f7c7e..0c70ff2e9 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
@@ -76,6 +76,9 @@ const IssueDetailsPage: NextPage = () => {
         ...formData,
       };
 
+      delete payload.blocker_issues;
+      delete payload.blocked_issues;
+
       await issuesService
         .patchIssue(workspaceSlug as string, projectId as string, issueId as string, payload, user)
         .then(() => {