Merge branch '327587-geo-resync-all-warning' into 'master'

Geo Replication - Confirm Resync/Reverify Action

See merge request gitlab-org/gitlab!63238

ee/app/assets/javascripts/geo_replicable/components/geo_replicable_filter_bar.vue

 <script>
-import { GlSearchBoxByType, GlDropdown, GlDropdownItem, GlButton } from '@gitlab/ui';
+import {
+  GlSearchBoxByType,
+  GlDropdown,
+  GlDropdownItem,
+  GlButton,
+  GlModal,
+  GlSprintf,
+  GlModalDirective,
+} from '@gitlab/ui';
 import { mapActions, mapState, mapGetters } from 'vuex';
-import { __, sprintf } from '~/locale';
-import { DEFAULT_SEARCH_DELAY, ACTION_TYPES, FILTER_STATES } from '../constants';
+import { s__, __, sprintf } from '~/locale';
+import { DEFAULT_SEARCH_DELAY, ACTION_TYPES, FILTER_STATES, RESYNC_MODAL_ID } from '../constants';
 
 export default {
   name: 'GeoReplicableFilterBar',
+  i18n: {
+    resyncAll: s__('Geo|Resync all'),
+    resyncAllReplicables: s__('Geo|Resync all %{replicableType}'),
+    dropdownTitle: s__('Geo|Filter by status'),
+    searchPlaceholder: s__('Geo|Filter by name'),
+    modalBody: s__(
+      'Geo|This will resync all %{replicableType}. It may take some time to complete. Are you sure you want to continue?',
+    ),
+  },
   components: {
     GlSearchBoxByType,
     GlDropdown,
     GlDropdownItem,
     GlButton,
+    GlModal,
+    GlSprintf,
+  },
+  directives: {
+    GlModalDirective,
   },
   computed: {
     ...mapState(['currentFilterIndex', 'filterOptions', 'searchFilter']),
@@ -25,7 +47,7 @@ export default {
       },
     },
     resyncText() {
-      return sprintf(__('Resync all %{replicableType}'), {
+      return sprintf(this.$options.i18n.resyncAllReplicables, {
         replicableType: this.replicableTypeName,
       });
     },
@@ -40,6 +62,13 @@ export default {
   actionTypes: ACTION_TYPES,
   filterStates: FILTER_STATES,
   debounce: DEFAULT_SEARCH_DELAY,
+  MODAL_PRIMARY_ACTION: {
+    text: s__('Geo|Resync all'),
+  },
+  MODAL_CANCEL_ACTION: {
+    text: __('Cancel'),
+  },
+  RESYNC_MODAL_ID,
 };
 </script>
 
@@ -48,7 +77,7 @@ export default {
     <div class="row d-flex flex-column flex-sm-row">
       <div class="col">
         <div class="d-sm-flex mx-n1">
-          <gl-dropdown :text="__('Filter by status')" class="px-1 my-1 my-sm-0 w-100">
+          <gl-dropdown :text="$options.i18n.dropdownTitle" class="px-1 my-1 my-sm-0 w-100">
             <gl-dropdown-item
               v-for="(filter, index) in filterOptions"
               :key="index"
@@ -66,15 +95,27 @@ export default {
             :debounce="$options.debounce"
             class="px-1 my-1 my-sm-0 bg-white w-100"
             type="text"
-            :placeholder="__('Filter by name')"
+            :placeholder="$options.i18n.searchPlaceholder"
           />
         </div>
       </div>
       <div class="col col-sm-5 d-flex justify-content-end my-1 my-sm-0 w-100">
-        <gl-button @click="initiateAllReplicableSyncs($options.actionTypes.RESYNC)">{{
-          __('Resync all')
+        <gl-button v-gl-modal-directive="$options.RESYNC_MODAL_ID">{{
+          $options.i18n.resyncAll
         }}</gl-button>
       </div>
     </div>
+    <gl-modal
+      :modal-id="$options.RESYNC_MODAL_ID"
+      :title="resyncText"
+      :action-primary="$options.MODAL_PRIMARY_ACTION"
+      :action-cancel="$options.MODAL_CANCEL_ACTION"
+      size="sm"
+      @primary="initiateAllReplicableSyncs($options.actionTypes.RESYNC)"
+    >
+      <gl-sprintf :message="$options.i18n.modalBody">
+        <template #replicableType>{{ replicableTypeName }}</template>
+      </gl-sprintf>
+    </gl-modal>
   </nav>
 </template>

ee/app/assets/javascripts/geo_replicable/constants.js

@@ -49,3 +49,5 @@ export const PREV = 'prev';
 export const NEXT = 'next';
 
 export const DEFAULT_PAGE_SIZE = 20;
+
+export const RESYNC_MODAL_ID = 'resync-all-geo';

ee/app/helpers/ee/geo_helper.rb

@@ -142,11 +142,39 @@ module EE
     end
 
     def resync_all_button
-      button_to(s_("Geo|Resync all"), { controller: controller_name, action: :resync_all }, class: "btn btn-default btn-md mr-2")
+      # This is deprecated and Hard Coded for Projects.
+      # All new replicable types should be using geo_replicable/app.vue
+
+      resync_all_projects_modal_data = {
+        path: resync_all_admin_geo_projects_url,
+        method: 'post',
+        modal_attributes: {
+          title: s_('Geo|Resync all projects'),
+          message: s_('Geo|This will resync all projects. It may take some time to complete. Are you sure you want to continue?'),
+          okTitle: s_('Geo|Resync all'),
+          size: 'sm'
+        }
+      }
+
+      button_tag(s_("Geo|Resync all"), type: "button", class: 'gl-button btn btn-default gl-mr-3 js-confirm-modal-button', data: resync_all_projects_modal_data)
     end
 
     def reverify_all_button
-      button_to(s_("Geo|Reverify all"), { controller: controller_name, action: :reverify_all }, class: "btn btn-default btn-md")
+      # This is deprecated and Hard Coded for Projects.
+      # All new replicable types should be using geo_replicable/app.vue
+
+      reverify_all_projects_modal_data = {
+        path: reverify_all_admin_geo_projects_url,
+        method: 'post',
+        modal_attributes: {
+          title: s_('Geo|Reverify all projects'),
+          message: s_('Geo|This will reverify all projects. It may take some time to complete. Are you sure you want to continue?'),
+          okTitle: s_('Geo|Reverify all'),
+          size: 'sm'
+        }
+      }
+
+      button_tag(s_("Geo|Reverify all"), type: "button", class: 'gl-button btn btn-default gl-mr-3 js-confirm-modal-button', data: reverify_all_projects_modal_data)
     end
 
     def replicable_types

ee/spec/features/admin/geo/admin_geo_projects_spec.rb

@@ -209,9 +209,13 @@ RSpec.describe 'admin Geo Projects', :js, :geo do
       wait_for_requests
     end
 
-    it 'fires job to resync all projects' do
+    it 'opens confirm modal and then fires job to resync all projects' do
       page.click_button('Resync all')
 
+      page.within('.modal') do
+        page.click_button('Resync all')
+      end
+
       expect(find_toast).to have_text('All projects are being scheduled for resync')
     end
   end
@@ -222,9 +226,13 @@ RSpec.describe 'admin Geo Projects', :js, :geo do
       wait_for_requests
     end
 
-    it 'fires job to reverify all projects' do
+    it 'opens confirm modal and then fires job to reverify all projects' do
       page.click_button('Reverify all')
 
+      page.within('.modal') do
+        page.click_button('Reverify all')
+      end
+
       expect(find_toast).to have_text('All projects are being scheduled for reverify')
     end
   end

ee/spec/frontend/geo_replicable/components/geo_replicable_filter_bar_spec.js

-import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlButton } from '@gitlab/ui';
-import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlButton, GlModal } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
 import Vuex from 'vuex';
 import GeoReplicableFilterBar from 'ee/geo_replicable/components/geo_replicable_filter_bar.vue';
-import { DEFAULT_SEARCH_DELAY } from 'ee/geo_replicable/constants';
+import { DEFAULT_SEARCH_DELAY, RESYNC_MODAL_ID } from 'ee/geo_replicable/constants';
 import { getStoreConfig } from 'ee/geo_replicable/store';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { MOCK_REPLICABLE_TYPE } from '../mock_data';
 
-const localVue = createLocalVue();
-localVue.use(Vuex);
+Vue.use(Vuex);
 
 describe('GeoReplicableFilterBar', () => {
   let wrapper;
@@ -25,8 +26,10 @@ describe('GeoReplicableFilterBar', () => {
       actions: actionSpies,
     });
     wrapper = shallowMount(GeoReplicableFilterBar, {
-      localVue,
       store: fakeStore,
+      directives: {
+        GlModalDirective: createMockDirective(),
+      },
     });
   };
 
@@ -35,11 +38,12 @@ describe('GeoReplicableFilterBar', () => {
   });
 
   const findNavContainer = () => wrapper.find('nav');
-  const findGlDropdown = () => findNavContainer().find(GlDropdown);
-  const findGlDropdownItems = () => findNavContainer().findAll(GlDropdownItem);
+  const findGlDropdown = () => findNavContainer().findComponent(GlDropdown);
+  const findGlDropdownItems = () => findNavContainer().findAllComponents(GlDropdownItem);
   const findDropdownItemsText = () => findGlDropdownItems().wrappers.map((w) => w.text());
-  const findGlSearchBox = () => findNavContainer().find(GlSearchBoxByType);
-  const findGlButton = () => findNavContainer().find(GlButton);
+  const findGlSearchBox = () => findNavContainer().findComponent(GlSearchBoxByType);
+  const findGlButton = () => findNavContainer().findComponent(GlButton);
+  const findGlModal = () => findNavContainer().findComponent(GlModal);
 
   describe('template', () => {
     beforeEach(() => {
@@ -47,11 +51,11 @@ describe('GeoReplicableFilterBar', () => {
     });
 
     it('renders nav container always', () => {
-      expect(findNavContainer().exists()).toBeTruthy();
+      expect(findNavContainer().exists()).toBe(true);
     });
 
     it('renders dropdown always', () => {
-      expect(findGlDropdown().exists()).toBeTruthy();
+      expect(findGlDropdown().exists()).toBe(true);
     });
 
     describe('Filter options', () => {
@@ -100,11 +104,23 @@ describe('GeoReplicableFilterBar', () => {
 
     describe('Re-sync all button', () => {
       it('renders always', () => {
-        expect(findGlButton().exists()).toBeTruthy();
+        expect(findGlButton().exists()).toBe(true);
       });
 
-      it('calls initiateAllReplicableSyncs when clicked', () => {
-        findGlButton().vm.$emit('click');
+      it('triggers GlModal', () => {
+        const binding = getBinding(findGlButton().element, 'gl-modal-directive');
+
+        expect(binding.value).toBe(RESYNC_MODAL_ID);
+      });
+    });
+
+    describe('GlModal', () => {
+      it('renders always', () => {
+        expect(findGlModal().exists()).toBe(true);
+      });
+
+      it('calls initiateAllReplicableSyncs when primary action is emitted', () => {
+        findGlModal().vm.$emit('primary');
         expect(actionSpies.initiateAllReplicableSyncs).toHaveBeenCalled();
       });
     });

locale/gitlab.pot

@@ -14071,9 +14071,6 @@ msgstr ""
 msgid "Filter by name"
 msgstr ""
 
-msgid "Filter by status"
-msgstr ""
-
 msgid "Filter by test cases that are currently archived."
 msgstr ""
 
@@ -14575,6 +14572,9 @@ msgstr ""
 msgid "Geo|Failed"
 msgstr ""
 
+msgid "Geo|Filter by name"
+msgstr ""
+
 msgid "Geo|Filter by status"
 msgstr ""
 
@@ -14746,6 +14746,12 @@ msgstr ""
 msgid "Geo|Resync all"
 msgstr ""
 
+msgid "Geo|Resync all %{replicableType}"
+msgstr ""
+
+msgid "Geo|Resync all projects"
+msgstr ""
+
 msgid "Geo|Retry count"
 msgstr ""
 
@@ -14755,6 +14761,9 @@ msgstr ""
 msgid "Geo|Reverify all"
 msgstr ""
 
+msgid "Geo|Reverify all projects"
+msgstr ""
+
 msgid "Geo|Review replication status, and resynchronize and reverify items with the primary node."
 msgstr ""
 
@@ -14806,6 +14815,15 @@ msgstr ""
 msgid "Geo|There was an error fetching the Geo Nodes"
 msgstr ""
 
+msgid "Geo|This will resync all %{replicableType}. It may take some time to complete. Are you sure you want to continue?"
+msgstr ""
+
+msgid "Geo|This will resync all projects. It may take some time to complete. Are you sure you want to continue?"
+msgstr ""
+
+msgid "Geo|This will reverify all projects. It may take some time to complete. Are you sure you want to continue?"
+msgstr ""
+
 msgid "Geo|Tracking database entry will be removed. Are you sure?"
 msgstr ""
 
@@ -27945,12 +27963,6 @@ msgstr ""
 msgid "Resync"
 msgstr ""
 
-msgid "Resync all"
-msgstr ""
-
-msgid "Resync all %{replicableType}"
-msgstr ""
-
 msgid "Retry"
 msgstr ""