Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 1 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
index 6a43fdb541f..8aa1c862055 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
@@ -43,7 +43,6 @@ export default {
         };
       },
       update(data) {
-        this.canUpdate = data.workItem.userPermissions.updateWorkItem;
         return (
           data.workItem.widgets.find((widget) => widget.type === WIDGET_TYPE_HIERARCHY)?.children
             .nodes ?? []
@@ -54,6 +53,7 @@ export default {
       },
       result({ data }) {
         this.canUpdate = data.workItem.userPermissions.updateWorkItem;
+        this.confidential = data.workItem.confidential;
       },
     },
   },
@@ -63,6 +63,7 @@ export default {
       isOpen: true,
       children: [],
       canUpdate: false,
+      confidential: false,
     };
   },
   computed: {
@@ -164,6 +165,7 @@ export default {
           data-testid="add-links-form"
           :issuable-gid="issuableGid"
           :children-ids="childrenIds"
+          :parent-confidential="confidential"
           @cancel="hideAddForm"
           @addWorkItemChild="addChild"
         />
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
index d01d59050e6..707baf81d29 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
@@ -28,6 +28,11 @@ export default {
       required: false,
       default: () => [],
     },
+    parentConfidential: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   apollo: {
     availableWorkItems: {
@@ -123,6 +128,7 @@ export default {
               hierarchyWidget: {
                 parentId: this.issuableGid,
               },
+              confidential: this.parentConfidential,
             },
           },
         })
diff --git a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql
index 921f75ccb0a..827976551e0 100644
--- a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql
@@ -8,6 +8,7 @@ query workItemQuery($id: WorkItemID!) {
     userPermissions {
       updateWorkItem
     }
+    confidential
     widgets {
       type
       ... on WorkItemWidgetHierarchy {