π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-3856]chore: refactor work item activity (#6923)
Vamsi Krishnac401b26dd4e4
diff --git a/web/ce/components/issues/issue-details/additional-activity-root.tsx b/web/ce/components/issues/issue-details/additional-activity-root.tsxnew file mode 100644index 0000000000..cd0383e6e2--- /dev/null+++ b/web/ce/components/issues/issue-details/additional-activity-root.tsx@@ -0,0 +1,13 @@+"use client";++import { FC } from "react";+import { observer } from "mobx-react";++export type TAdditionalActivityRoot = {+ activityId: string;+ showIssue?: boolean;+ ends: "top" | "bottom" | undefined;+ field: string | undefined;+};++export const AdditionalActivityRoot: FC<TAdditionalActivityRoot> = observer(() => <></>);diff --git a/web/ce/components/issues/issue-details/index.ts b/web/ce/components/issues/issue-details/index.tsindex 4125ebf832..c5724f0f73 100644--- a/web/ce/components/issues/issue-details/index.ts+++ b/web/ce/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 "./additional-activity-root";diff --git a/web/ce/components/issues/issue-details/issue-properties-activity/helper.tsx b/web/ce/components/issues/issue-details/issue-properties-activity/helper.tsxdeleted file mode 100644index b7131709d7..0000000000--- a/web/ce/components/issues/issue-details/issue-properties-activity/helper.tsx+++ /dev/null@@ -1,3 +0,0 @@-import { TIssueActivity } from "@plane/types";--export const renderEstimate = (activity: TIssueActivity, value: string) => value;diff --git a/web/ce/components/issues/issue-details/issue-properties-activity/index.ts b/web/ce/components/issues/issue-details/issue-properties-activity/index.tsindex 3f57a6c8b3..1efe34c51e 100644--- a/web/ce/components/issues/issue-details/issue-properties-activity/index.ts+++ b/web/ce/components/issues/issue-details/issue-properties-activity/index.ts@@ -1,2 +1 @@export * from "./root";-export * from "./helper";diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsxindex d62ec7866c..f324cb83e8 100644--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx@@ -4,7 +4,6 @@ import { Triangle } from "lucide-react";// hooksimport { useIssueDetail } from "@/hooks/store";// components-import { renderEstimate } from "@/plane-web/components/issues/issue-details";import { IssueActivityBlockComponent, IssueLink } from "./";type TIssueEstimateActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };@@ -27,10 +26,8 @@ export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((propsends={ends}><>- {activity.new_value ? `set the estimate to ` : `removed the estimate `}- {activity.new_value- ? renderEstimate(activity, activity.new_value)- : renderEstimate(activity, activity?.old_value || "")}+ {activity.new_value ? `set the estimate point to ` : `removed the estimate point`}+ {activity.new_value ? activity.new_value : activity?.old_value}{showIssue && (activity.new_value ? ` to ` : ` from `)}{showIssue && <IssueLink activityId={activityId} />}.</>diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsxindex d8d0b59dd3..73a57ac1f0 100644--- a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx+++ b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx@@ -5,7 +5,7 @@ import { getValidKeysFromObject } from "@/helpers/array.helper";// hooksimport { useIssueDetail } from "@/hooks/store";// plane web components-import { IssueTypeActivity } from "@/plane-web/components/issues/issue-details";+import { IssueTypeActivity, AdditionalActivityRoot } from "@/plane-web/components/issues/issue-details";import { useTimeLineRelationOptions } from "@/plane-web/components/relations";// local componentsimport {@@ -61,6 +61,7 @@ export const IssueActivityItem: FC<TIssueActivityItem> = observer((props) => {case "priority":return <IssuePriorityActivity {...componentDefaultProps} showIssue={false} />;case "estimate_point":+ case "estimate_categories":return <IssueEstimateActivity {...componentDefaultProps} showIssue={false} />;case "parent":return <IssueParentActivity {...componentDefaultProps} showIssue={false} />;@@ -88,6 +89,6 @@ export const IssueActivityItem: FC<TIssueActivityItem> = observer((props) => {case "type":return <IssueTypeActivity {...componentDefaultProps} />;default:- return <></>;+ return <AdditionalActivityRoot {...componentDefaultProps} field={activityField} />;}});diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx b/web/core/components/workspace-notifications/sidebar/notification-card/content.tsxindex ecdded0cfb..feb8c373ce 100644--- a/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx+++ b/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx@@ -3,7 +3,7 @@ import { TNotification } from "@plane/types";// componentsimport { LiteTextReadOnlyEditor } from "@/components/editor";// helpers-import { renderFormattedDate } from "@/helpers/date-time.helper";+import { convertMinutesToHoursMinutesString, renderFormattedDate } from "@/helpers/date-time.helper";import { sanitizeCommentForNotification } from "@/helpers/notification.helper";import { replaceUnderscoreIfSnakeCase, stripAndTruncateHTML } from "@/helpers/string.helper";@@ -68,6 +68,10 @@ export const NotificationContent: FC<{if (notificationField === "assignees") return newValue !== "" ? newValue : oldValue;if (notificationField === "labels") return newValue !== "" ? newValue : oldValue;if (notificationField === "parent") return newValue !== "" ? newValue : oldValue;+ if (notificationField === "estimate_time")+ return newValue !== ""+ ? convertMinutesToHoursMinutesString(Number(newValue))+ : convertMinutesToHoursMinutesString(Number(oldValue));return newValue;};diff --git a/web/ee/components/issues/issue-details/additional-activity-root.tsx b/web/ee/components/issues/issue-details/additional-activity-root.tsxnew file mode 100644index 0000000000..c6c26375ef--- /dev/null+++ b/web/ee/components/issues/issue-details/additional-activity-root.tsx@@ -0,0 +1 @@+export { AdditionalActivityRoot } from "ce/components/issues/issue-details/additional-activity-root";diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/helper.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/helper.tsxdeleted file mode 100644index a5ecf60ef9..0000000000--- a/web/ee/components/issues/issue-details/issue-properties-activity/helper.tsx+++ /dev/null@@ -1 +0,0 @@-export * from "ce/components/issues/issue-details/issue-properties-activity";