fix: refactor

apps/web/ce/components/issues/issue-details/index.ts

@@ -5,3 +5,4 @@ export * from "./issue-type-activity";
 export * from "./parent-select-root";
 export * from "./issue-creator";
 export * from "./additional-activity-root";
+export * from "./page";

apps/web/ce/components/issues/issue-details/page.tsx

@@ -0,0 +1,8 @@
+"use client";
+
+import { FC } from "react";
+import { observer } from "mobx-react";
+
+export type TIssuePageActivity = { activityId: string; showIssue?: boolean; ends?: "top" | "bottom" | undefined };
+
+export const IssuePageActivity: FC<TIssuePageActivity> = observer(() => <></>);

apps/web/ce/components/workspace-notifications/index.ts

@@ -1,2 +1,3 @@
 export * from "./notification-card/root";
 export * from "./list-root";
+export * from "./notification-card/content";

apps/web/ce/components/workspace-notifications/notification-card/content.ts

@@ -0,0 +1,19 @@
+import { replaceUnderscoreIfSnakeCase } from "@plane/utils";
+
+export const renderAdditionalAction = (notificationField: string, verb: string | undefined) => {
+  const baseAction = !["comment", "archived_at"].includes(notificationField) ? verb : "";
+  return `${baseAction} ${replaceUnderscoreIfSnakeCase(notificationField)}`;
+};
+
+export const renderAdditionalValue = (
+  notificationField: string | undefined,
+  newValue: string | undefined,
+  oldValue: string | undefined
+) => newValue;
+
+export const shouldShowConnector = (notificationField: string | undefined) =>
+  !["comment", "archived_at", "None", "assignees", "labels", "start_date", "target_date", "parent"].includes(
+    notificationField || ""
+  );
+
+export const shouldRender = (notificationField: string | undefined, verb: string | undefined) => verb !== "deleted";

apps/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx

@@ -5,7 +5,11 @@ import { getValidKeysFromObject } from "@plane/utils";
 // hooks
 import { useIssueDetail } from "@/hooks/store";
 // plane web components
-import { IssueTypeActivity, AdditionalActivityRoot } from "@/plane-web/components/issues/issue-details";
+import {
+  IssueTypeActivity,
+  AdditionalActivityRoot,
+  IssuePageActivity,
+} from "@/plane-web/components/issues/issue-details";
 import { useTimeLineRelationOptions } from "@/plane-web/components/relations";
 // local components
 import {
@@ -89,6 +93,8 @@ export const IssueActivityItem: FC<TIssueActivityItem> = observer((props) => {
       return <IssueInboxActivity {...componentDefaultProps} />;
     case "type":
       return <IssueTypeActivity {...componentDefaultProps} />;
+    case "page":
+      return <IssuePageActivity {...componentDefaultProps} />;
     default:
       return <AdditionalActivityRoot {...componentDefaultProps} field={activityField} />;
   }

apps/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx

@@ -1,4 +1,5 @@
 import { FC } from "react";
+
 import { TNotification } from "@plane/types";
 import {
   convertMinutesToHoursMinutesString,
@@ -9,6 +10,12 @@ import {
 } from "@plane/utils";
 // components
 import { LiteTextEditor } from "@/components/editor/lite-text";
+import {
+  renderAdditionalAction,
+  renderAdditionalValue,
+  shouldShowConnector,
+  shouldRender,
+} from "@/plane-web/components/workspace-notifications";
 
 export const NotificationContent: FC<{
   notification: TNotification;
@@ -57,8 +64,7 @@ export const NotificationContent: FC<{
     }
     if (notificationField === "None") return null;
 
-    const baseAction = !["comment", "archived_at"].includes(notificationField) ? verb : "";
-    return `${baseAction} ${replaceUnderscoreIfSnakeCase(notificationField)}`;
+    return renderAdditionalAction(notificationField, verb);
   };
 
   const renderValue = () => {
@@ -75,27 +81,16 @@ export const NotificationContent: FC<{
       return newValue !== ""
         ? convertMinutesToHoursMinutesString(Number(newValue))
         : convertMinutesToHoursMinutesString(Number(oldValue));
-    return newValue;
+    return renderAdditionalValue(notificationField, newValue, oldValue);
   };
 
-  const shouldShowConnector = ![
-    "comment",
-    "archived_at",
-    "None",
-    "assignees",
-    "labels",
-    "start_date",
-    "target_date",
-    "parent",
-  ].includes(notificationField || "");
-
   return (
     <>
       {renderTriggerName()}
       <span className="text-custom-text-300">{renderAction()} </span>
-      {verb !== "deleted" && (
+      {shouldRender(notificationField, verb) && (
         <>
-          {shouldShowConnector && <span className="text-custom-text-300">to </span>}
+          {shouldShowConnector(notificationField) && <span className="text-custom-text-300">to </span>}
           <span className="text-custom-text-100 font-medium">{renderValue()}</span>
           {notificationField === "comment" && renderCommentBox && (
             <div className="scale-75 origin-left">

apps/web/ee/components/issues/issue-details/index.ts

@@ -4,3 +4,4 @@ export * from "./issue-type-switcher";
 export * from "./issue-type-activity";
 export * from "./parent-select-root";
 export * from "./issue-creator";
+export * from "./page";

apps/web/ee/components/issues/issue-details/page.tsx

@@ -0,0 +1 @@
+export * from "ce/components/issues/issue-details/page";

packages/types/src/activity.ts

@@ -27,4 +27,4 @@ export type TProjectBaseActivity<K extends string = string, V extends string = s
   project: string;
 };
 
-export type TBaseActivityVerbs = "created" | "updated" | "deleted";
+export type TBaseActivityVerbs = "created" | "updated" | "deleted" | "added";

packages/types/src/workspace-notifications.ts

@@ -28,7 +28,7 @@ export type TNotificationData = {
     actor: string | undefined;
     field: string | undefined;
     issue_comment: string | undefined;
-    verb: "created" | "updated" | "deleted";
+    verb: "created" | "updated" | "deleted" | "added";
     new_value: string | undefined;
     old_value: string | undefined;
   };