1 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/comment_field_layout.vue b/app/assets/javascripts/notes/components/comment_field_layout.vue
index 84bda1b0b5c..cc372520c70 100644
--- a/app/assets/javascripts/notes/components/comment_field_layout.vue
+++ b/app/assets/javascripts/notes/components/comment_field_layout.vue
@@ -1,14 +1,18 @@
 <script>
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import NoteableWarning from '~/vue_shared/components/notes/noteable_warning.vue';
 import EmailParticipantsWarning from './email_participants_warning.vue';
+import AttachmentsWarning from './attachments_warning.vue';
 
 const DEFAULT_NOTEABLE_TYPE = 'Issue';
 
 export default {
   components: {
+    AttachmentsWarning,
     EmailParticipantsWarning,
     NoteableWarning,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     noteableData: {
       type: Object,
@@ -29,6 +33,11 @@ export default {
       required: false,
       default: false,
     },
+    containsLink: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     isLocked() {
@@ -46,6 +55,13 @@ export default {
     showEmailParticipantsWarning() {
       return this.emailParticipants.length && !this.isInternalNote;
     },
+    showAttachmentWarning() {
+      return (
+        this.glFeatures.serviceDeskNewNoteEmailNativeAttachments &&
+        this.showEmailParticipantsWarning &&
+        this.containsLink
+      );
+    },
   },
 };
 </script>
@@ -68,6 +84,7 @@ export default {
       :confidential-noteable-docs-path="noteableData.confidential_issues_docs_path"
     />
     <slot></slot>
+    <attachments-warning v-if="showAttachmentWarning" />
     <email-participants-warning
       v-if="showEmailParticipantsWarning"
       class="gl-border-t-1 gl-border-t-solid gl-border-t-gray-100 gl-rounded-base gl-rounded-top-left-none! gl-rounded-top-right-none!"