diff --git a/app/assets/javascripts/projects/new_v2/components/app.vue b/app/assets/javascripts/projects/new_v2/components/app.vue index 8176c11c4e9b4d425de112260d1e290e78b87155..f851a37f1dcfb709705570fc02fd69899e2f614f 100644 --- a/app/assets/javascripts/projects/new_v2/components/app.vue +++ b/app/assets/javascripts/projects/new_v2/components/app.vue @@ -11,6 +11,7 @@ import { OPTIONS } from '../constants'; import NewProjectDestinationSelect from './project_destination_select.vue'; import Breadcrumb from './form_breadcrumb.vue'; import CommandLine from './command_line.vue'; +import ImportByUrlForm from './import_by_url_form.vue'; export default { OPTIONS, @@ -26,79 +27,49 @@ export default { NewProjectDestinationSelect, Breadcrumb, CommandLine, + ImportByUrlForm, }, directives: { SafeHtml, }, - inject: ['userNamespaceId', 'canCreateProject'], - props: { + inject: { rootPath: { - type: String, - required: false, default: '/', }, projectsUrl: { - type: String, - required: false, default: null, }, - parentGroupUrl: { - type: String, - required: false, + userNamespaceId: { default: null, }, - parentGroupName: { - type: String, - required: false, - default: null, - }, - hasErrors: { - type: Boolean, - required: false, + isCiCdAvailable: { default: false, }, - isCiCdAvailable: { - type: Boolean, - required: false, + canCreateProject: { default: false, }, canImportProjects: { - type: Boolean, - required: false, default: false, }, importSourcesEnabled: { - type: Boolean, - required: false, default: false, }, canSelectNamespace: { - type: Boolean, - required: false, default: false, }, namespaceFullPath: { - type: String, - required: false, default: null, }, namespaceId: { - type: String, - required: false, default: null, }, trackLabel: { - type: String, - required: false, default: null, }, userProjectLimit: { - type: Number, - required: true, + default: 0, }, newProjectGuidelines: { - type: String, - required: false, default: null, }, }, @@ -280,8 +251,12 @@ export default { v-if="currentStep === 2" :key="selectedProjectOption.key" :option="selectedProjectOption" + :namespace-id="selectedNamespace" data-testid="new-project-step2" @back="onBack" + @next="onNext" /> + + diff --git a/app/assets/javascripts/projects/new_v2/components/import_by_url_form.vue b/app/assets/javascripts/projects/new_v2/components/import_by_url_form.vue new file mode 100644 index 0000000000000000000000000000000000000000..b0cd6b9e9018b7c297439dd92e92cbd0cbcad23d --- /dev/null +++ b/app/assets/javascripts/projects/new_v2/components/import_by_url_form.vue @@ -0,0 +1,39 @@ + + + diff --git a/app/assets/javascripts/projects/new_v2/components/import_project_form.vue b/app/assets/javascripts/projects/new_v2/components/import_project_form.vue index 340e91a10718b1615bb8c8908b447a8efd1e1b8c..3824ab085f47c80d92d09dc9fcaef0731a9e81c7 100644 --- a/app/assets/javascripts/projects/new_v2/components/import_project_form.vue +++ b/app/assets/javascripts/projects/new_v2/components/import_project_form.vue @@ -1,11 +1,71 @@