From a7f3d9cb2af8319c68e7d386fcf20c0a36920611 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Thu, 8 May 2025 23:21:49 -0400
Subject: [PATCH 01/12] Remove default selection in project import dropdown

Specific to importing projects from GitHub, Bitbucket, Gitea,
this changes the default in the dropdown, and adds an error
message if no destination namespace is selected.

Changelog: changed
---
 .../components/provider_repo_table_row.vue    | 29 +++++++++++++++++--
 locale/gitlab.pot                             |  9 ++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index ab166b8fba197d..849360cba69351 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -60,6 +60,8 @@ export default {
     return {
       isSelectedForReimport: false,
       showMembershipsModal: false,
+      namespaceNotSelectedYet: true,
+      showNamespaceRequiredModal: false,
     };
   },
 
@@ -128,6 +130,11 @@ export default {
         this.updateImportTarget({ newName: value });
       },
     },
+    showMissingNamespaceWarning() {
+      return (
+        (this.isImportNotStarted || this.isSelectedForReimport) && this.namespaceNotSelectedYet
+      );
+    },
   },
 
   methods: {
@@ -156,7 +163,9 @@ export default {
     },
 
     onImportClick() {
-      if (this.showMembershipsWarning) {
+      if (this.showMissingNamespaceWarning) {
+        this.showNamespaceRequiredModal = true;
+      } else if (this.showMembershipsWarning) {
         this.showMembershipsModal = true;
       } else {
         this.handleImportRepo();
@@ -164,6 +173,9 @@ export default {
     },
 
     onSelect(value) {
+      if (this.namespaceNotSelectedYet) {
+        this.namespaceNotSelectedYet = false;
+      }
       this.updateImportTarget({ targetNamespace: value });
     },
   },
@@ -208,7 +220,8 @@ export default {
         <template v-else-if="isImportNotStarted || isSelectedForReimport">
           <div class="gl-flex gl-w-full gl-items-stretch">
             <import-target-dropdown
-              :selected="importTarget.targetNamespace"
+              :selected="namespaceNotSelectedYet ? null : importTarget.targetNamespace"
+              :toggle-text="__('Select ')"
               :user-namespace="userNamespace"
               @select="onSelect"
             />
@@ -264,9 +277,11 @@ export default {
       <gl-modal
         v-if="showMembershipsWarning"
         v-model="showMembershipsModal"
+        modal-id="show-memberships-modal"
         :title="
           s__('ImportProjects|Are you sure you want to import the project to a personal namespace?')
         "
+        data-testid="memberships-warning-modal"
         :action-primary="$options.actionPrimary"
         :action-cancel="$options.actionCancel"
         @primary="handleImportRepo"
@@ -284,6 +299,16 @@ export default {
           >.
         </p>
       </gl-modal>
+      <gl-modal
+        v-model="showNamespaceRequiredModal"
+        :title="s__('ImportProjects|Unable to import')"
+        :action-cancel="$options.actionCancel"
+        modal-id="namespace-required-modal"
+      >
+        <p data-testid="namespace-required-warning">
+          {{ s__('ImportProjects|Please select a destination namespace before importing.') }}
+        </p>
+      </gl-modal>
       <span class="gl-ml-3 gl-inline-flex gl-gap-3">
         <help-popover
           v-show="showMembershipsWarning"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6b7ec2c5c142b0..022a7d94b1ac5a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31993,6 +31993,9 @@ msgstr ""
 msgid "ImportProjects|Owned"
 msgstr ""
 
+msgid "ImportProjects|Please select a destination namespace before importing."
+msgstr ""
+
 msgid "ImportProjects|Re-import creates a new project. It does not sync with the existing project."
 msgstr ""
 
@@ -32020,6 +32023,9 @@ msgstr ""
 msgid "ImportProjects|To import collaborators, or if your project has Git LFS files, you must use a classic personal access token with %{codeStart}read:org%{codeEnd} scope. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
+msgid "ImportProjects|Unable to import"
+msgstr ""
+
 msgid "ImportProjects|Update of imported projects with realtime changes failed"
 msgstr ""
 
@@ -56918,6 +56924,9 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+msgid "Select "
+msgstr ""
+
 msgid "Select Git revision"
 msgstr ""
 
-- 
GitLab


From 40e2da51c948be44c417cec18c413b1f4940c097 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Thu, 8 May 2025 23:25:06 -0400
Subject: [PATCH 02/12] Modify tests to account for no default selection

---
 .../provider_repo_table_row_spec.js           | 116 +++++++++++++-----
 1 file changed, 84 insertions(+), 32 deletions(-)

diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
index a135570656693c..6c6a0859d32319 100644
--- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
@@ -1,4 +1,4 @@
-import { GlBadge, GlButton, GlModal } from '@gitlab/ui';
+import { GlBadge, GlButton } from '@gitlab/ui';
 import Vue, { nextTick } from 'vue';
 // eslint-disable-next-line no-restricted-imports
 import Vuex from 'vuex';
@@ -45,7 +45,9 @@ describe('ProviderRepoTableRow', () => {
   const findImportStatus = () => wrapper.findComponent(ImportStatus);
   const findProviderLink = () => wrapper.findByTestId('provider-link');
   const findMembershipsWarning = () => wrapper.findByTestId('memberships-warning');
-  const findGlModal = () => wrapper.findComponent(GlModal);
+  const findMembershipsWarningModal = () => wrapper.findByTestId('memberships-warning-modal');
+  const findNamespaceRequiredWarning = () => wrapper.findByTestId('namespace-required-warning');
+  const findNamespaceRequiredModal = () => wrapper.find('[modalid="namespace-required-modal"]');
 
   const findCancelButton = () => {
     const buttons = wrapper
@@ -97,6 +99,29 @@ describe('ProviderRepoTableRow', () => {
       expect(findImportTargetDropdown().exists()).toBe(true);
     });
 
+    it('renders the dropdown without a default selected', () => {
+      expect(findImportTargetDropdown().props().toggleText).toBe('Select ');
+    });
+
+    describe('when no namespace is selected', () => {
+      it('shows namespace required modal when import button is clicked', async () => {
+        findImportButton().vm.$emit('click');
+        await nextTick();
+
+        expect(findNamespaceRequiredModal().exists()).toBe(true);
+        expect(findNamespaceRequiredWarning().text()).toContain(
+          'Please select a destination namespace before importing',
+        );
+      });
+
+      it('does not trigger import when clicking import button', async () => {
+        findImportButton().vm.$emit('click');
+        await nextTick();
+
+        expect(fetchImport).not.toHaveBeenCalled();
+      });
+    });
+
     describe('when user namespace is selected as import target', () => {
       beforeEach(() => {
         mountComponent(
@@ -105,15 +130,17 @@ describe('ProviderRepoTableRow', () => {
         );
       });
 
-      it('shows memberships warning', () => {
+      it('shows memberships warning', async () => {
+        await nextTick();
         expect(findMembershipsWarning().isVisible()).toBe(true);
       });
 
       it('shows modal with warning message when import button is clicked', async () => {
+        await nextTick();
         findImportButton().vm.$emit('click');
         await nextTick();
 
-        const modal = findGlModal();
+        const modal = findMembershipsWarningModal();
         expect(modal.props('title')).toBe(
           'Are you sure you want to import the project to a personal namespace?',
         );
@@ -122,11 +149,18 @@ describe('ProviderRepoTableRow', () => {
         );
       });
 
+      it('does not show `missing namespace` warning', async () => {
+        await nextTick();
+
+        const modal = findNamespaceRequiredModal();
+        expect(modal.attributes('visible')).not.toBe('true');
+      });
+
       it('triggers import when clicking modal primary button', async () => {
         findImportButton().vm.$emit('click');
         await nextTick();
 
-        findGlModal().vm.$emit('primary');
+        findMembershipsWarningModal().vm.$emit('primary');
 
         expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
           repoId: repo.importSource.id,
@@ -136,53 +170,69 @@ describe('ProviderRepoTableRow', () => {
     });
 
     describe('when group namespace is selected as import target', () => {
+      beforeEach(async () => {
+        const dropdown = findImportTargetDropdown();
+        dropdown.vm.$emit('select', 'target');
+        await nextTick();
+      });
+
       it('does not show memberships warning', () => {
         expect(findMembershipsWarning().isVisible()).toBe(false);
       });
 
-      it('does not show modal when import button is clicked', async () => {
+      it('does not show memberships modal when import button is clicked', async () => {
         findImportButton().vm.$emit('click');
         await nextTick();
 
-        expect(findGlModal().exists()).toBe(false);
+        expect(findMembershipsWarningModal().exists()).toBe(false);
       });
-    });
 
-    it('renders import button', () => {
-      expect(findImportButton().exists()).toBe(true);
-    });
+      it('does not show `missing namespace` warning when import button is clicked', async () => {
+        findImportButton().vm.$emit('click');
+        await nextTick();
+        const modal = findNamespaceRequiredModal();
+        expect(modal.attributes('visible')).not.toBe('true');
+      });
 
-    it('imports repo when clicking import button', async () => {
-      findImportButton().vm.$emit('click');
+      it('renders import button', () => {
+        expect(findImportButton().exists()).toBe(true);
+      });
 
-      await nextTick();
+      it('imports repo when clicking import button', async () => {
+        findImportButton().vm.$emit('click');
 
-      expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
-        repoId: repo.importSource.id,
-        optionalStages: {},
+        await nextTick();
+
+        expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
+          repoId: repo.importSource.id,
+          optionalStages: {},
+        });
       });
-    });
 
-    it('includes optionalStages to import', async () => {
-      const OPTIONAL_STAGES = { stage1: true, stage2: false };
+      it('includes optionalStages to import', async () => {
+        const OPTIONAL_STAGES = { stage1: true, stage2: false };
 
-      mountComponent({
-        repo,
-        optionalStages: OPTIONAL_STAGES,
-      });
+        mountComponent({
+          repo,
+          optionalStages: OPTIONAL_STAGES,
+        });
 
-      findImportButton().vm.$emit('click');
+        const dropdown = findImportTargetDropdown();
+        dropdown.vm.$emit('select', 'target');
+        await nextTick();
 
-      await nextTick();
+        findImportButton().vm.$emit('click');
+        await nextTick();
 
-      expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
-        repoId: repo.importSource.id,
-        optionalStages: OPTIONAL_STAGES,
+        expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
+          repoId: repo.importSource.id,
+          optionalStages: OPTIONAL_STAGES,
+        });
       });
-    });
 
-    it('does not render re-import button', () => {
-      expect(findReimportButton().exists()).toBe(false);
+      it('does not render re-import button', () => {
+        expect(findReimportButton().exists()).toBe(false);
+      });
     });
   });
 
@@ -252,6 +302,8 @@ describe('ProviderRepoTableRow', () => {
 
     beforeEach(() => {
       mountComponent({ repo });
+      // to reimport, a namespace must have been previously selected
+      wrapper.vm.namespaceNotSelectedYet = false;
     });
 
     it('renders project information', () => {
-- 
GitLab


From 076130490ca43bcf81d7943618373ae26ff8f2a8 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Fri, 9 May 2025 08:47:59 -0400
Subject: [PATCH 03/12] Update copy to match guidelines

---
 .../import_projects/components/provider_repo_table_row.vue  | 2 +-
 locale/gitlab.pot                                           | 6 +++---
 .../components/provider_repo_table_row_spec.js              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 849360cba69351..a60cf75b877074 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -306,7 +306,7 @@ export default {
         modal-id="namespace-required-modal"
       >
         <p data-testid="namespace-required-warning">
-          {{ s__('ImportProjects|Please select a destination namespace before importing.') }}
+          {{ s__('ImportProjects|Select a destination namespace before importing.') }}
         </p>
       </gl-modal>
       <span class="gl-ml-3 gl-inline-flex gl-gap-3">
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 022a7d94b1ac5a..a3333b9e931c54 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31993,9 +31993,6 @@ msgstr ""
 msgid "ImportProjects|Owned"
 msgstr ""
 
-msgid "ImportProjects|Please select a destination namespace before importing."
-msgstr ""
-
 msgid "ImportProjects|Re-import creates a new project. It does not sync with the existing project."
 msgstr ""
 
@@ -32008,6 +32005,9 @@ msgstr ""
 msgid "ImportProjects|Requesting your %{provider} repositories failed"
 msgstr ""
 
+msgid "ImportProjects|Select a destination namespace before importing."
+msgstr ""
+
 msgid "ImportProjects|Select the repositories you want to import"
 msgstr ""
 
diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
index 6c6a0859d32319..c49f13a1c09728 100644
--- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
@@ -110,7 +110,7 @@ describe('ProviderRepoTableRow', () => {
 
         expect(findNamespaceRequiredModal().exists()).toBe(true);
         expect(findNamespaceRequiredWarning().text()).toContain(
-          'Please select a destination namespace before importing',
+          'Select a destination namespace before importing',
         );
       });
 
-- 
GitLab


From cee62350a8caeff825693659a3a977716429f1b4 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Mon, 12 May 2025 10:57:34 -0400
Subject: [PATCH 04/12] Remove space after select

---
 .../import_projects/components/provider_repo_table_row.vue     | 2 +-
 locale/gitlab.pot                                              | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index a60cf75b877074..4ab070c1cdf260 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -221,7 +221,7 @@ export default {
           <div class="gl-flex gl-w-full gl-items-stretch">
             <import-target-dropdown
               :selected="namespaceNotSelectedYet ? null : importTarget.targetNamespace"
-              :toggle-text="__('Select ')"
+              :toggle-text="__('Select')"
               :user-namespace="userNamespace"
               @select="onSelect"
             />
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a3333b9e931c54..cce026ace07560 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -56924,9 +56924,6 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-msgid "Select "
-msgstr ""
-
 msgid "Select Git revision"
 msgstr ""
 
-- 
GitLab


From f0dede42312fffe263ab8f3e3421066c5411ddcc Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Fri, 16 May 2025 18:53:18 -0400
Subject: [PATCH 05/12] Replace modal with simple error message

When a destination namespace is not selected during import,
show an inline error message instead of a popup modal.
Also ensures the error does not appear on manifest import
page, where namespace is pre-selected.
---
 .../components/provider_repo_table_row.vue    | 45 ++++++++++---------
 locale/gitlab.pot                             |  8 ++--
 .../provider_repo_table_row_spec.js           | 18 +++-----
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 4ab070c1cdf260..8e3eb96e782c89 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -60,8 +60,8 @@ export default {
     return {
       isSelectedForReimport: false,
       showMembershipsModal: false,
-      namespaceNotSelectedYet: true,
-      showNamespaceRequiredModal: false,
+      userHasSelectedNamespace: false,
+      showNamespaceRequiredError: false,
     };
   },
 
@@ -130,9 +130,15 @@ export default {
         this.updateImportTarget({ newName: value });
       },
     },
-    showMissingNamespaceWarning() {
+    isNamespaceSelectionNeeded() {
+      if (this.isSelectedForReimport && this.importTarget.targetNamespace) {
+        return false;
+      }
+
       return (
-        (this.isImportNotStarted || this.isSelectedForReimport) && this.namespaceNotSelectedYet
+        !this.repo.importSource.target &&
+        (this.isImportNotStarted || this.isSelectedForReimport) &&
+        !this.userHasSelectedNamespace
       );
     },
   },
@@ -163,8 +169,8 @@ export default {
     },
 
     onImportClick() {
-      if (this.showMissingNamespaceWarning) {
-        this.showNamespaceRequiredModal = true;
+      if (this.isNamespaceSelectionNeeded) {
+        this.showNamespaceRequiredError = true;
       } else if (this.showMembershipsWarning) {
         this.showMembershipsModal = true;
       } else {
@@ -173,9 +179,8 @@ export default {
     },
 
     onSelect(value) {
-      if (this.namespaceNotSelectedYet) {
-        this.namespaceNotSelectedYet = false;
-      }
+      this.userHasSelectedNamespace = true;
+      this.showNamespaceRequiredError = false;
       this.updateImportTarget({ targetNamespace: value });
     },
   },
@@ -220,8 +225,8 @@ export default {
         <template v-else-if="isImportNotStarted || isSelectedForReimport">
           <div class="gl-flex gl-w-full gl-items-stretch">
             <import-target-dropdown
-              :selected="namespaceNotSelectedYet ? null : importTarget.targetNamespace"
-              :toggle-text="__('Select')"
+              :selected="!userHasSelectedNamespace ? null : importTarget.targetNamespace"
+              :toggle-text="s__('ImportProjects|Select namespace')"
               :user-namespace="userNamespace"
               @select="onSelect"
             />
@@ -237,6 +242,14 @@ export default {
               data-testid="project-path-field"
             />
           </div>
+          <p
+            v-if="showNamespaceRequiredError"
+            class="gl-m-0 gl-mt-2 gl-text-danger"
+            role="alert"
+            data-testid="namespace-required-warning"
+          >
+            {{ s__('ImportProjects|Select a destination namespace.') }}
+          </p>
         </template>
         <template v-else-if="repo.importedProject">{{ displayFullPath }}</template>
       </div>
@@ -299,16 +312,6 @@ export default {
           >.
         </p>
       </gl-modal>
-      <gl-modal
-        v-model="showNamespaceRequiredModal"
-        :title="s__('ImportProjects|Unable to import')"
-        :action-cancel="$options.actionCancel"
-        modal-id="namespace-required-modal"
-      >
-        <p data-testid="namespace-required-warning">
-          {{ s__('ImportProjects|Select a destination namespace before importing.') }}
-        </p>
-      </gl-modal>
       <span class="gl-ml-3 gl-inline-flex gl-gap-3">
         <help-popover
           v-show="showMembershipsWarning"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cce026ace07560..9e1167be57a16e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -32005,7 +32005,10 @@ msgstr ""
 msgid "ImportProjects|Requesting your %{provider} repositories failed"
 msgstr ""
 
-msgid "ImportProjects|Select a destination namespace before importing."
+msgid "ImportProjects|Select a destination namespace."
+msgstr ""
+
+msgid "ImportProjects|Select namespace"
 msgstr ""
 
 msgid "ImportProjects|Select the repositories you want to import"
@@ -32023,9 +32026,6 @@ msgstr ""
 msgid "ImportProjects|To import collaborators, or if your project has Git LFS files, you must use a classic personal access token with %{codeStart}read:org%{codeEnd} scope. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
-msgid "ImportProjects|Unable to import"
-msgstr ""
-
 msgid "ImportProjects|Update of imported projects with realtime changes failed"
 msgstr ""
 
diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
index c49f13a1c09728..a2dcf8f0541152 100644
--- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
@@ -47,7 +47,6 @@ describe('ProviderRepoTableRow', () => {
   const findMembershipsWarning = () => wrapper.findByTestId('memberships-warning');
   const findMembershipsWarningModal = () => wrapper.findByTestId('memberships-warning-modal');
   const findNamespaceRequiredWarning = () => wrapper.findByTestId('namespace-required-warning');
-  const findNamespaceRequiredModal = () => wrapper.find('[modalid="namespace-required-modal"]');
 
   const findCancelButton = () => {
     const buttons = wrapper
@@ -100,18 +99,15 @@ describe('ProviderRepoTableRow', () => {
     });
 
     it('renders the dropdown without a default selected', () => {
-      expect(findImportTargetDropdown().props().toggleText).toBe('Select ');
+      expect(findImportTargetDropdown().props().toggleText).toBe('Select namespace');
     });
 
     describe('when no namespace is selected', () => {
-      it('shows namespace required modal when import button is clicked', async () => {
+      it('shows namespace required warning when import button is clicked', async () => {
         findImportButton().vm.$emit('click');
         await nextTick();
 
-        expect(findNamespaceRequiredModal().exists()).toBe(true);
-        expect(findNamespaceRequiredWarning().text()).toContain(
-          'Select a destination namespace before importing',
-        );
+        expect(findNamespaceRequiredWarning().text()).toContain('Select a destination namespace.');
       });
 
       it('does not trigger import when clicking import button', async () => {
@@ -152,8 +148,7 @@ describe('ProviderRepoTableRow', () => {
       it('does not show `missing namespace` warning', async () => {
         await nextTick();
 
-        const modal = findNamespaceRequiredModal();
-        expect(modal.attributes('visible')).not.toBe('true');
+        expect(findNamespaceRequiredWarning().exists()).toBe(false);
       });
 
       it('triggers import when clicking modal primary button', async () => {
@@ -190,8 +185,7 @@ describe('ProviderRepoTableRow', () => {
       it('does not show `missing namespace` warning when import button is clicked', async () => {
         findImportButton().vm.$emit('click');
         await nextTick();
-        const modal = findNamespaceRequiredModal();
-        expect(modal.attributes('visible')).not.toBe('true');
+        expect(findNamespaceRequiredWarning().exists()).toBe(false);
       });
 
       it('renders import button', () => {
@@ -343,6 +337,8 @@ describe('ProviderRepoTableRow', () => {
       await nextTick();
 
       findReimportButton().vm.$emit('click');
+      await nextTick();
+      expect(findNamespaceRequiredWarning().exists()).toBe(false);
 
       expect(fetchImport).toHaveBeenCalledWith(expect.anything(), {
         repoId: repo.importSource.id,
-- 
GitLab


From 500de3de0f106ef4657cb32b0d8e7f3de3de8865 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Fri, 16 May 2025 20:21:52 -0400
Subject: [PATCH 06/12] Remove memberships warning icon on page load

With this MR, when the table row loads, the
dropdown no longer has the userNamespace as selected
though that injected value is truthy. We should only
show the warning against personal namespace if the user
selected the personal namespace.
---
 .../components/provider_repo_table_row.vue         |  2 +-
 .../components/provider_repo_table_row_spec.js     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 8e3eb96e782c89..9ef96530afb5df 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -75,7 +75,7 @@ export default {
 
     showMembershipsWarning() {
       const userNamespaceSelected = this.importTarget.targetNamespace === this.userNamespace;
-      return (this.isImportNotStarted || this.isSelectedForReimport) && userNamespaceSelected;
+      return (this.isImportNotStarted || this.isSelectedForReimport) && userNamespaceSelected && this.userHasSelectedNamespace;
     },
 
     isFinished() {
diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
index a2dcf8f0541152..f9d11d005bd599 100644
--- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
@@ -119,20 +119,22 @@ describe('ProviderRepoTableRow', () => {
     });
 
     describe('when user namespace is selected as import target', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         mountComponent(
           { repo },
           { storeOptions: { importTarget: { targetNamespace: userNamespace } } },
         );
-      });
 
-      it('shows memberships warning', async () => {
+        const dropdown = findImportTargetDropdown();
+        dropdown.vm.$emit('select', userNamespace);
         await nextTick();
+      });
+
+      it('shows memberships warning', () => {
         expect(findMembershipsWarning().isVisible()).toBe(true);
       });
 
       it('shows modal with warning message when import button is clicked', async () => {
-        await nextTick();
         findImportButton().vm.$emit('click');
         await nextTick();
 
@@ -145,9 +147,7 @@ describe('ProviderRepoTableRow', () => {
         );
       });
 
-      it('does not show `missing namespace` warning', async () => {
-        await nextTick();
-
+      it('does not show `missing namespace` warning', () => {
         expect(findNamespaceRequiredWarning().exists()).toBe(false);
       });
 
-- 
GitLab


From 1ab2313ce8af1909dbad2e78a818ce85d40cda5a Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Fri, 16 May 2025 20:30:21 -0400
Subject: [PATCH 07/12] Format table row file

---
 .../import_projects/components/provider_repo_table_row.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 9ef96530afb5df..15323aa24e17ce 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -75,7 +75,11 @@ export default {
 
     showMembershipsWarning() {
       const userNamespaceSelected = this.importTarget.targetNamespace === this.userNamespace;
-      return (this.isImportNotStarted || this.isSelectedForReimport) && userNamespaceSelected && this.userHasSelectedNamespace;
+      return (
+        (this.isImportNotStarted || this.isSelectedForReimport) &&
+        userNamespaceSelected &&
+        this.userHasSelectedNamespace
+      );
     },
 
     isFinished() {
-- 
GitLab


From 371f6251c4c58dd2a3e3acb1ab0b281d04aa100d Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Sat, 17 May 2025 00:25:54 -0400
Subject: [PATCH 08/12] Address manifest import test failure

The condition under which memberships warning renders
cannot be the same for external imports and manifest uploads.
For the manifest import flow, userHasSelectedNamespace is
always false. This change prevents the check on
userHasSelectedNamespace for the manifest import page.
---
 .../components/provider_repo_table_row.vue    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 15323aa24e17ce..3c3464e566cd56 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -74,12 +74,17 @@ export default {
     },
 
     showMembershipsWarning() {
-      const userNamespaceSelected = this.importTarget.targetNamespace === this.userNamespace;
-      return (
-        (this.isImportNotStarted || this.isSelectedForReimport) &&
-        userNamespaceSelected &&
-        this.userHasSelectedNamespace
-      );
+      const usersNamespaceIsSelected = this.importTarget.targetNamespace === this.userNamespace;
+
+      if (this.repo.importSource.target) {
+        return this.isPendingImport && usersNamespaceIsSelected;
+      }
+
+      return this.isPendingImport && usersNamespaceIsSelected && this.userHasSelectedNamespace;
+    },
+
+    isPendingImport() {
+      return this.isImportNotStarted || this.isSelectedForReimport;
     },
 
     isFinished() {
@@ -140,9 +145,7 @@ export default {
       }
 
       return (
-        !this.repo.importSource.target &&
-        (this.isImportNotStarted || this.isSelectedForReimport) &&
-        !this.userHasSelectedNamespace
+        !this.repo.importSource.target && this.isPendingImport && !this.userHasSelectedNamespace
       );
     },
   },
-- 
GitLab


From 6b0bdc9aacd95bdd30a8356c16d6e3ea3d63e533 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Wed, 21 May 2025 21:10:58 -0400
Subject: [PATCH 09/12] Remove default targetNamespace in store

---
 .../import_entities/import_projects/store/getters.js            | 2 +-
 .../import_entities/import_projects/store/actions_spec.js       | 2 +-
 .../import_entities/import_projects/store/getters_spec.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/store/getters.js b/app/assets/javascripts/import_entities/import_projects/store/getters.js
index 31ddffd4eb4cb3..f2d8740bffd4a2 100644
--- a/app/assets/javascripts/import_entities/import_projects/store/getters.js
+++ b/app/assets/javascripts/import_entities/import_projects/store/getters.js
@@ -19,6 +19,6 @@ export const getImportTarget = (state) => (repoId) => {
 
   return {
     newName: repo.importSource.sanitizedName,
-    targetNamespace: state.defaultTargetNamespace,
+    targetNamespace: null,
   };
 };
diff --git a/spec/frontend/import_entities/import_projects/store/actions_spec.js b/spec/frontend/import_entities/import_projects/store/actions_spec.js
index 918821dfa59816..aa57ae9f041371 100644
--- a/spec/frontend/import_entities/import_projects/store/actions_spec.js
+++ b/spec/frontend/import_entities/import_projects/store/actions_spec.js
@@ -55,7 +55,7 @@ describe('import_projects store actions', () => {
   let localState;
   const importRepoId = 1;
   const otherImportRepoId = 2;
-  const defaultTargetNamespace = 'default';
+  const defaultTargetNamespace = null;
   const sanitizedName = 'sanitizedName';
   const defaultImportTarget = { newName: sanitizedName, targetNamespace: defaultTargetNamespace };
 
diff --git a/spec/frontend/import_entities/import_projects/store/getters_spec.js b/spec/frontend/import_entities/import_projects/store/getters_spec.js
index fced5670f25b3e..e25a6e099287de 100644
--- a/spec/frontend/import_entities/import_projects/store/getters_spec.js
+++ b/spec/frontend/import_entities/import_projects/store/getters_spec.js
@@ -99,7 +99,7 @@ describe('import_projects store getters', () => {
 
       expect(getImportTarget(localState)(IMPORTABLE_REPO.importSource.id)).toStrictEqual({
         newName: IMPORTABLE_REPO.importSource.sanitizedName,
-        targetNamespace: localState.defaultTargetNamespace,
+        targetNamespace: null,
       });
     });
 
-- 
GitLab


From c5754ec9a05f3e44cad867289a179ff2d24a69da Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Wed, 21 May 2025 21:15:12 -0400
Subject: [PATCH 10/12] Updates component and test for no default, improves
 method names

---
 .../components/provider_repo_table_row.vue     | 18 +++++++-----------
 .../components/provider_repo_table_row_spec.js | 10 ++++++----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
index 3c3464e566cd56..447bed7f9d0300 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue
@@ -76,14 +76,10 @@ export default {
     showMembershipsWarning() {
       const usersNamespaceIsSelected = this.importTarget.targetNamespace === this.userNamespace;
 
-      if (this.repo.importSource.target) {
-        return this.isPendingImport && usersNamespaceIsSelected;
-      }
-
-      return this.isPendingImport && usersNamespaceIsSelected && this.userHasSelectedNamespace;
+      return this.isNotImporting && usersNamespaceIsSelected;
     },
 
-    isPendingImport() {
+    isNotImporting() {
       return this.isImportNotStarted || this.isSelectedForReimport;
     },
 
@@ -139,13 +135,13 @@ export default {
         this.updateImportTarget({ newName: value });
       },
     },
-    isNamespaceSelectionNeeded() {
-      if (this.isSelectedForReimport && this.importTarget.targetNamespace) {
+    shouldBlockImportForNamespace() {
+      if (this.importTarget.targetNamespace) {
         return false;
       }
 
       return (
-        !this.repo.importSource.target && this.isPendingImport && !this.userHasSelectedNamespace
+        !this.repo.importSource.target && this.isNotImporting && !this.userHasSelectedNamespace
       );
     },
   },
@@ -176,7 +172,7 @@ export default {
     },
 
     onImportClick() {
-      if (this.isNamespaceSelectionNeeded) {
+      if (this.shouldBlockImportForNamespace) {
         this.showNamespaceRequiredError = true;
       } else if (this.showMembershipsWarning) {
         this.showMembershipsModal = true;
@@ -232,7 +228,7 @@ export default {
         <template v-else-if="isImportNotStarted || isSelectedForReimport">
           <div class="gl-flex gl-w-full gl-items-stretch">
             <import-target-dropdown
-              :selected="!userHasSelectedNamespace ? null : importTarget.targetNamespace"
+              :selected="importTarget.targetNamespace"
               :toggle-text="s__('ImportProjects|Select namespace')"
               :user-namespace="userNamespace"
               @select="onSelect"
diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
index f9d11d005bd599..ffe3953a405226 100644
--- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js
@@ -15,7 +15,7 @@ describe('ProviderRepoTableRow', () => {
   const cancelImport = jest.fn();
   const setImportTarget = jest.fn();
   const groupImportTarget = {
-    targetNamespace: 'target',
+    targetNamespace: null,
     newName: 'newName',
   };
 
@@ -99,6 +99,7 @@ describe('ProviderRepoTableRow', () => {
     });
 
     it('renders the dropdown without a default selected', () => {
+      expect(findImportTargetDropdown().props('selected')).toBe(null);
       expect(findImportTargetDropdown().props().toggleText).toBe('Select namespace');
     });
 
@@ -107,7 +108,7 @@ describe('ProviderRepoTableRow', () => {
         findImportButton().vm.$emit('click');
         await nextTick();
 
-        expect(findNamespaceRequiredWarning().text()).toContain('Select a destination namespace.');
+        expect(findNamespaceRequiredWarning().text()).toBe('Select a destination namespace.');
       });
 
       it('does not trigger import when clicking import button', async () => {
@@ -296,8 +297,6 @@ describe('ProviderRepoTableRow', () => {
 
     beforeEach(() => {
       mountComponent({ repo });
-      // to reimport, a namespace must have been previously selected
-      wrapper.vm.namespaceNotSelectedYet = false;
     });
 
     it('renders project information', () => {
@@ -336,6 +335,9 @@ describe('ProviderRepoTableRow', () => {
 
       await nextTick();
 
+      findImportTargetDropdown().vm.$emit('select', 'some-namespace');
+      await nextTick();
+
       findReimportButton().vm.$emit('click');
       await nextTick();
       expect(findNamespaceRequiredWarning().exists()).toBe(false);
-- 
GitLab


From e0feacab79f6d467173938bf201c75d23260379e Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Thu, 22 May 2025 17:18:35 -0400
Subject: [PATCH 11/12] Delete 'continue import' expectation in manifest import
 spec

---
 spec/features/import/manifest_import_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/features/import/manifest_import_spec.rb b/spec/features/import/manifest_import_spec.rb
index 175ae2fee8c00b..35c25966e878b3 100644
--- a/spec/features/import/manifest_import_spec.rb
+++ b/spec/features/import/manifest_import_spec.rb
@@ -34,7 +34,6 @@
     page.within(second_row) do
       click_on 'Import'
     end
-    click_on 'Continue import'
 
     wait_for_requests
 
-- 
GitLab


From b442ea8ac5e7e15bf9a4521ce692128a84a45427 Mon Sep 17 00:00:00 2001
From: Oiza <oizabaiye@gmail.com>
Date: Thu, 22 May 2025 21:39:16 -0400
Subject: [PATCH 12/12] No longer set user as default target namespace

---
 app/views/import/_githubish_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml
index ad68a0587f2fb2..b6d4dc6b9c915b 100644
--- a/app/views/import/_githubish_status.html.haml
+++ b/app/views/import/_githubish_status.html.haml
@@ -3,7 +3,7 @@
 - extra_data = local_assigns.fetch(:extra_data, {})
 - filterable = local_assigns.fetch(:filterable, true)
 - paginatable = local_assigns.fetch(:paginatable, false)
-- default_namespace_path = (local_assigns[:default_namespace] || current_user.namespace).full_path
+- default_namespace_path = local_assigns[:default_namespace]&.full_path
 - cancel_path = local_assigns.fetch(:cancel_path, nil)
 - details_path = local_assigns.fetch(:details_path, nil)
 - provider_title = Gitlab::ImportSources.title(local_assigns.fetch(:provider))
-- 
GitLab