diff options
Diffstat (limited to 'app/assets/javascripts/import_entities/import_projects')
2 files changed, 6 insertions, 10 deletions
diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue index 0cd3519bcec..b9f0b5012ac 100644 --- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue +++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue @@ -46,10 +46,6 @@ export default { return `${this.filter}-${this.repositories.length}-${this.pageInfo.page}`; }, - availableNamespaces() { - return this.namespaces.map(({ fullPath }) => fullPath); - }, - importAllButtonText() { if (this.isImportingAnyRepo) { return n__('Importing %d repository', 'Importing %d repositories', this.importingRepoCount); @@ -167,7 +163,7 @@ export default { <provider-repo-table-row :key="repo.importSource.providerLink" :repo="repo" - :available-namespaces="availableNamespaces" + :available-namespaces="namespaces" :user-namespace="defaultTargetNamespace" /> </template> 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 a97af5367fb..c3d0ca4ed8c 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 @@ -128,17 +128,17 @@ export default { <gl-dropdown-section-header>{{ __('Groups') }}</gl-dropdown-section-header> <gl-dropdown-item v-for="ns in namespaces" - :key="ns" + :key="ns.fullPath" data-qa-selector="target_group_dropdown_item" - :data-qa-group-name="ns" - @click="updateImportTarget({ targetNamespace: ns })" + :data-qa-group-name="ns.fullPath" + @click="updateImportTarget({ targetNamespace: ns.fullPath })" > - {{ ns }} + {{ ns.fullPath }} </gl-dropdown-item> <gl-dropdown-divider /> </template> <gl-dropdown-section-header>{{ __('Users') }}</gl-dropdown-section-header> - <gl-dropdown-item @click="updateImportTarget({ targetNamespace: ns })">{{ + <gl-dropdown-item @click="updateImportTarget({ targetNamespace: userNamespace })">{{ userNamespace }}</gl-dropdown-item> </import-group-dropdown> |