3 files changed, 46 insertions, 24 deletions
diff --git a/app/assets/javascripts/work_items/list/queries/base_work_item_widgets.fragment.graphql b/app/assets/javascripts/work_items/list/queries/base_work_item_widgets.fragment.graphql
new file mode 100644
index 00000000000..1198973d184
--- /dev/null
+++ b/app/assets/javascripts/work_items/list/queries/base_work_item_widgets.fragment.graphql
@@ -0,0 +1,38 @@
+#import "~/graphql_shared/fragments/user.fragment.graphql"
+
+fragment BaseWorkItemWidgets on WorkItemWidget {
+  ... on WorkItemWidgetAssignees {
+    type
+    assignees {
+      nodes {
+        ...User
+      }
+    }
+  }
+  ... on WorkItemWidgetLabels {
+    type
+    allowsScopedLabels
+    labels {
+      nodes {
+        id
+        color
+        description
+        title
+      }
+    }
+  }
+  ... on WorkItemWidgetMilestone {
+    type
+    milestone {
+      id
+      dueDate
+      startDate
+      title
+      webPath
+    }
+  }
+  ... on WorkItemWidgetStartAndDueDate {
+    type
+    dueDate
+  }
+}
diff --git a/app/assets/javascripts/work_items/list/queries/get_work_items.query.graphql b/app/assets/javascripts/work_items/list/queries/get_work_items.query.graphql
index 7ada2cf12dd..623527302f1 100644
--- a/app/assets/javascripts/work_items/list/queries/get_work_items.query.graphql
+++ b/app/assets/javascripts/work_items/list/queries/get_work_items.query.graphql
@@ -1,3 +1,5 @@
+#import "ee_else_ce/work_items/list/queries/work_item_widgets.fragment.graphql"
+
 query getWorkItems($fullPath: ID!) {
   group(fullPath: $fullPath) {
     id
@@ -21,30 +23,7 @@ query getWorkItems($fullPath: ID!) {
         updatedAt
         webUrl
         widgets {
-          ... on WorkItemWidgetAssignees {
-            assignees {
-              nodes {
-                id
-                avatarUrl
-                name
-                username
-                webUrl
-              }
-            }
-            type
-          }
-          ... on WorkItemWidgetLabels {
-            allowsScopedLabels
-            labels {
-              nodes {
-                id
-                color
-                description
-                title
-              }
-            }
-            type
-          }
+          ...WorkItemWidgets
         }
         workItemType {
           id
diff --git a/app/assets/javascripts/work_items/list/queries/work_item_widgets.fragment.graphql b/app/assets/javascripts/work_items/list/queries/work_item_widgets.fragment.graphql
new file mode 100644
index 00000000000..6862df5d330
--- /dev/null
+++ b/app/assets/javascripts/work_items/list/queries/work_item_widgets.fragment.graphql
@@ -0,0 +1,5 @@
+#import "./base_work_item_widgets.fragment.graphql"
+
+fragment WorkItemWidgets on WorkItemWidget {
+  ...BaseWorkItemWidgets
+}