Merge branch '344881-address-minor-bugs' into 'master'

Improve modal interaction

See merge request gitlab-org/gitlab!75690

ee/app/assets/javascripts/threat_monitoring/components/policies/scan_new_policy_modal.vue

@@ -54,9 +54,11 @@ export default {
   },
   data() {
     return {
+      previouslySelectedProject: {},
       selectedProject: { ...this.assignedPolicyProject },
       hasSelectedNewProject: false,
       shouldShowUnlinkWarning: false,
+      savingChanges: false,
     };
   },
   computed: {
@@ -94,6 +96,8 @@ export default {
           throw new Error(data.securityPolicyProjectAssign.errors);
         }
 
+        this.previouslySelectedProject = this.selectedProject;
+
         this.$emit('project-updated', {
           text: this.$options.i18n.save.okLink,
           variant: 'success',
@@ -122,7 +126,7 @@ export default {
         }
 
         this.shouldShowUnlinkWarning = false;
-        this.selectedProject = {};
+        this.previouslySelectedProject = {};
         this.$emit('project-updated', {
           text: this.$options.i18n.save.okUnlink,
           variant: 'success',
@@ -136,6 +140,7 @@ export default {
     },
 
     async saveChanges() {
+      this.savingChanges = true;
       this.$emit('updating-project');
 
       if (this.shouldShowUnlinkWarning) {
@@ -144,7 +149,7 @@ export default {
         await this.linkProject();
       }
 
-      this.hasSelectedNewProject = false;
+      this.savingChanges = false;
     },
     setSelectedProject(data) {
       this.shouldShowUnlinkWarning = false;
@@ -154,8 +159,18 @@ export default {
     },
     confirmDeletion() {
       this.shouldShowUnlinkWarning = !this.shouldShowUnlinkWarning;
+      this.selectedProject = {};
+      this.hasSelectedNewProject = true;
+    },
+    restoreProject() {
+      this.selectedProject = this.previouslySelectedProject;
     },
     closeModal() {
+      if (this.hasSelectedNewProject && !this.savingChanges) {
+        this.restoreProject();
+      }
+
+      this.hasSelectedNewProject = false;
       this.shouldShowUnlinkWarning = false;
       this.$emit('close');
     },
@@ -211,7 +226,7 @@ export default {
           />
         </gl-dropdown>
         <gl-button
-          v-if="selectedProjectId"
+          v-if="selectedProjectId || shouldShowUnlinkWarning"
           icon="remove"
           class="gl-ml-3"
           :aria-label="$options.i18n.unlinkButtonLabel"

ee/spec/frontend/threat_monitoring/components/policies/scan_new_policy_modal_spec.js

@@ -27,16 +27,20 @@ describe('ScanNewPolicyModal Component', () => {
   const findAlert = () => wrapper.findComponent(GlAlert);
   const findModal = () => wrapper.findComponent(GlModal);
 
-  const selectProject = async (
+  const selectProject = async ({
     project = {
       id: 'gid://gitlab/Project/1',
       name: 'Test 1',
     },
-  ) => {
+    shouldSubmit = true,
+  } = {}) => {
     findInstanceProjectSelector().vm.$emit('projectClicked', project);
     await wrapper.vm.$nextTick();
-    findModal().vm.$emit('ok');
-    await wrapper.vm.$nextTick();
+
+    if (shouldSubmit) {
+      findModal().vm.$emit('ok');
+      await wrapper.vm.$nextTick();
+    }
   };
 
   const createWrapper = ({
@@ -100,11 +104,17 @@ describe('ScanNewPolicyModal Component', () => {
     });
   });
 
-  it('emits close event when gl-modal emits change event', () => {
+  it('emits close event when gl-modal emits change event', async () => {
     createWrapper();
-    findModal().vm.$emit('change');
+    await selectProject({ shouldSubmit: false });
 
+    findModal().vm.$emit('change');
     expect(wrapper.emitted('close')).toEqual([[]]);
+    expect(findInstanceProjectSelector().props('selectedProjects')[0].name).toBe('Test 1');
+
+    // should restore the previous state when action is not submitted
+    await wrapper.vm.$nextTick();
+    expect(findInstanceProjectSelector().props('selectedProjects')[0].name).toBeUndefined();
   });
 
   describe('unlinking project', () => {
@@ -169,6 +179,10 @@ describe('ScanNewPolicyModal Component', () => {
         text: 'Security policy project was linked successfully',
         variant: 'success',
       });
+
+      expect(findInstanceProjectSelector().props('selectedProjects')).toEqual([
+        { id: 'gid://gitlab/Project/1', name: 'Test 1' },
+      ]);
     });
 
     it('emits an event with an error message', async () => {