From 7b9f80628e3b58d4232e8875d0fde670aab09b8a Mon Sep 17 00:00:00 2001
From: Vamsi Krishna <46787868+vamsikrishnamathala@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:03:14 +0530
Subject: [PATCH] [WEB-3972]fix: epics sub work items order (#3078)

* fix: epics customer activity

* fix: updated the order for sub work items properties
---
 .../sub-issues/issues-list/properties.tsx     | 47 +++++++++----------
 .../epics/details/sidebar/activity/helper.tsx | 12 ++---
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/properties.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/properties.tsx
index 8ab70db445..2a281782c4 100644
--- a/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/properties.tsx
+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/properties.tsx
@@ -43,6 +43,29 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
   maxDate?.setDate(maxDate.getDate());
   return (
     <div className="relative flex items-center gap-2">
+      <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="state">
+        <div className="h-5 flex-shrink-0">
+          <StateDropdown
+            value={issue.state_id}
+            projectId={issue.project_id ?? undefined}
+            onChange={(val) =>
+              issue.project_id &&
+              updateSubIssue(
+                workspaceSlug,
+                issue.project_id,
+                parentIssueId,
+                issueId,
+                {
+                  state_id: val,
+                },
+                { ...issue }
+              )
+            }
+            disabled={!disabled}
+            buttonVariant="border-with-text"
+          />
+        </div>
+      </WithDisplayPropertiesHOC>
       <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="start_date">
         <div className="h-5 flex-shrink-0" onFocus={handleEventPropagation} onClick={handleEventPropagation}>
           <DateDropdown
@@ -97,30 +120,6 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
         </div>
       </WithDisplayPropertiesHOC>
 
-      <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="state">
-        <div className="h-5 flex-shrink-0">
-          <StateDropdown
-            value={issue.state_id}
-            projectId={issue.project_id ?? undefined}
-            onChange={(val) =>
-              issue.project_id &&
-              updateSubIssue(
-                workspaceSlug,
-                issue.project_id,
-                parentIssueId,
-                issueId,
-                {
-                  state_id: val,
-                },
-                { ...issue }
-              )
-            }
-            disabled={!disabled}
-            buttonVariant="border-with-text"
-          />
-        </div>
-      </WithDisplayPropertiesHOC>
-
       <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="priority">
         <div className="h-5 flex-shrink-0">
           <PriorityDropdown
diff --git a/web/ee/components/epics/details/sidebar/activity/helper.tsx b/web/ee/components/epics/details/sidebar/activity/helper.tsx
index d36a46c780..2ad6461892 100644
--- a/web/ee/components/epics/details/sidebar/activity/helper.tsx
+++ b/web/ee/components/epics/details/sidebar/activity/helper.tsx
@@ -17,7 +17,7 @@ export type TEpicActivityFields =
   | "name"
   | "description"
   | "state"
-  | "assignee"
+  | "assignees"
   | "priority"
   | "start_date"
   | "target_date"
@@ -79,7 +79,7 @@ export const EPIC_UPDATES_HELPER_MAP: Partial<TEpicActivityDetailsHelperMap> = {
       </>
     ),
   }),
-  assignee_updated: (activity: TIssueActivity) => ({
+  assignees_updated: (activity: TIssueActivity) => ({
     icon: <Users className={commonIconClassName} />,
     message: (
       <>
@@ -204,7 +204,7 @@ export const EPIC_UPDATES_HELPER_MAP: Partial<TEpicActivityDetailsHelperMap> = {
     icon: <CustomersIcon className={commonIconClassName} />,
     message: (
       <>
-        added this work item to the customer request{" "}
+        added this epic to the customer request{" "}
         <a
           href={`/${activity.workspace_detail?.slug}/customers/${activity.new_identifier}`}
           target="_blank"
@@ -220,7 +220,7 @@ export const EPIC_UPDATES_HELPER_MAP: Partial<TEpicActivityDetailsHelperMap> = {
     icon: <CustomersIcon className={commonIconClassName} />,
     message: (
       <>
-        removed this work item from the customer request{" "}
+        removed this epic from the customer request{" "}
         <a
           href={`/${activity.workspace_detail?.slug}/customers/${activity.old_identifier}`}
           target="_blank"
@@ -236,7 +236,7 @@ export const EPIC_UPDATES_HELPER_MAP: Partial<TEpicActivityDetailsHelperMap> = {
     icon: <CustomersIcon className={commonIconClassName} />,
     message: (
       <>
-        added this work item to the customer{" "}
+        added this epic to the customer{" "}
         <a
           href={`/${activity.workspace_detail?.slug}/customers/${activity.new_identifier}`}
           target="_blank"
@@ -252,7 +252,7 @@ export const EPIC_UPDATES_HELPER_MAP: Partial<TEpicActivityDetailsHelperMap> = {
     icon: <CustomersIcon className={commonIconClassName} />,
     message: (
       <>
-        removed this work item from the customer{" "}
+        removed this epic from the customer{" "}
         <a
           href={`/${activity.workspace_detail?.slug}/customers/${activity.old_identifier}`}
           target="_blank"