Hide empty namespace without a search match

Minor cleanup jest tests

Addresses some minor review comments with
the jest tests for the transfer group form.

app/assets/javascripts/groups/init_transfer_group_form.js

@@ -41,7 +41,7 @@ export default () => {
         },
         on: {
           confirm: () => {
-            if (targetFormId) document.getElementById(targetFormId)?.submit();
+            document.getElementById(targetFormId)?.submit();
           },
         },
       });

app/assets/javascripts/vue_shared/components/namespace_select/namespace_select.vue

@@ -83,6 +83,10 @@ export default {
     selectedNamespaceText() {
       return this.selectedNamespace?.humanName || this.defaultText;
     },
+    filteredEmptyNamespaceTitle() {
+      const { includeEmptyNamespace, emptyNamespaceTitle, searchTerm } = this;
+      return includeEmptyNamespace && emptyNamespaceTitle.toLowerCase().includes(searchTerm);
+    },
   },
   methods: {
     handleSelect(item) {
@@ -101,7 +105,7 @@ export default {
     <template #header>
       <gl-search-box-by-type v-model.trim="searchTerm" />
     </template>
-    <div v-if="includeEmptyNamespace">
+    <div v-if="filteredEmptyNamespaceTitle">
       <gl-dropdown-item
         data-qa-selector="namespaces_list_item"
         @click="handleSelectEmptyNamespace()"

locale/gitlab.pot

@@ -17346,9 +17346,6 @@ msgstr ""
 msgid "GroupSettings|There was a problem updating the pipeline settings: %{error_messages}."
 msgstr ""
 
-msgid "GroupSettings|This group can't be transferred because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group."
-msgstr ""
-
 msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup."
 msgstr ""
 
@@ -36629,6 +36626,9 @@ msgstr ""
 msgid "This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group."
 msgstr ""
 
+msgid "This group can't be transfered because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group."
+msgstr ""
+
 msgid "This group cannot be invited to a project inside a group with enforced SSO"
 msgstr ""
 

spec/frontend/groups/components/transfer_group_form_spec.js

 import { GlAlert, GlSprintf } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import Component, { i18n } from '~/groups/components/transfer_group_form.vue';
+import Component from '~/groups/components/transfer_group_form.vue';
 import ConfirmDanger from '~/vue_shared/components/confirm_danger/confirm_danger.vue';
 import NamespaceSelect from '~/vue_shared/components/namespace_select/namespace_select.vue';
 
@@ -43,54 +43,57 @@ describe('Transfer group form', () => {
   const findNamespaceSelect = () => wrapper.findComponent(NamespaceSelect);
   const findHiddenInput = () => wrapper.find('[name="new_parent_group_id"]');
 
-  beforeEach(() => {
-    wrapper = createComponent();
-  });
-
   afterEach(() => {
     wrapper.destroy();
   });
 
-  it('renders the namespace select component', () => {
-    expect(findNamespaceSelect().exists()).toBe(true);
-  });
+  describe('default', () => {
+    beforeEach(() => {
+      wrapper = createComponent();
+    });
 
-  it('sets the namespace select properties', () => {
-    expect(findNamespaceSelect().props()).toMatchObject({
-      defaultText: 'Select parent group',
-      fullWidth: false,
-      includeHeaders: false,
-      emptyNamespaceTitle: 'No parent group',
-      includeEmptyNamespace: true,
-      data: { groups },
+    it('renders the namespace select component', () => {
+      expect(findNamespaceSelect().exists()).toBe(true);
     });
-  });
 
-  it('renders the hidden input field', () => {
-    expect(findHiddenInput().exists()).toBe(true);
-    expect(findHiddenInput().attributes('value')).toBeUndefined();
-  });
+    it('sets the namespace select properties', () => {
+      expect(findNamespaceSelect().props()).toMatchObject({
+        defaultText: 'Select parent group',
+        fullWidth: false,
+        includeHeaders: false,
+        emptyNamespaceTitle: 'No parent group',
+        includeEmptyNamespace: true,
+        data: { groups },
+      });
+    });
 
-  it('does not render the alert message', () => {
-    expect(findAlert().exists()).toBe(false);
-  });
+    it('renders the hidden input field', () => {
+      expect(findHiddenInput().exists()).toBe(true);
+      expect(findHiddenInput().attributes('value')).toBeUndefined();
+    });
 
-  it('renders the confirm danger component', () => {
-    expect(findConfirmDanger().exists()).toBe(true);
-  });
+    it('does not render the alert message', () => {
+      expect(findAlert().exists()).toBe(false);
+    });
+
+    it('renders the confirm danger component', () => {
+      expect(findConfirmDanger().exists()).toBe(true);
+    });
 
-  it('sets the confirm danger properties', () => {
-    expect(findConfirmDanger().props()).toMatchObject({
-      buttonClass: 'qa-transfer-button',
-      disabled: true,
-      buttonText: confirmButtonText,
-      phrase: confirmationPhrase,
+    it('sets the confirm danger properties', () => {
+      expect(findConfirmDanger().props()).toMatchObject({
+        buttonClass: 'qa-transfer-button',
+        disabled: true,
+        buttonText: confirmButtonText,
+        phrase: confirmationPhrase,
+      });
     });
   });
 
   describe('with a selected project', () => {
     const [firstGroup] = groups;
     beforeEach(() => {
+      wrapper = createComponent();
       findNamespaceSelect().vm.$emit('select', firstGroup);
     });
 
@@ -117,14 +120,6 @@ describe('Transfer group form', () => {
       wrapper = createComponent({ isPaidGroup: true });
     });
 
-    it('renders a warning alert with a link for additional information', () => {
-      expect(findAlert().text()).toMatchInterpolatedText(i18n.paidGroupMessage);
-      expect(findAlert().props()).toMatchObject({
-        dismissible: false,
-        variant: 'warning',
-      });
-    });
-
     it('disables the transfer button', () => {
       expect(findConfirmDanger().props()).toMatchObject({ disabled: true });
     });

spec/frontend/vue_shared/components/namespace_select/namespace_select_spec.js

+import { nextTick } from 'vue';
 import { GlDropdown, GlDropdownItem, GlDropdownSectionHeader } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import NamespaceSelect, {
@@ -99,12 +100,12 @@ describe('Namespace Select', () => {
   describe('with an empty namespace option', () => {
     const emptyNamespaceTitle = 'No namespace selected';
 
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper = createComponent({
         includeEmptyNamespace: true,
         emptyNamespaceTitle,
       });
-      return wrapper.vm.$nextTick();
+      await nextTick();
     });
 
     it('includes the empty namespace', () => {