diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:50 +0300 |
commit | de2fb5b82c92c90f90ed67ced45143c04e934fb8 (patch) | |
tree | ff8e5e642580de7bb596d90dd0e7f739f44ca540 /app/assets/javascripts/jira_import | |
parent | c6a33b298229f9e04933be43d6176c476ef03012 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_import')
-rw-r--r-- | app/assets/javascripts/jira_import/components/jira_import_app.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jira_import/components/jira_import_form.vue | 94 |
2 files changed, 97 insertions, 1 deletions
diff --git a/app/assets/javascripts/jira_import/components/jira_import_app.vue b/app/assets/javascripts/jira_import/components/jira_import_app.vue index 6efac949979..437239ce0be 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_app.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_app.vue @@ -1,10 +1,12 @@ <script> import getJiraProjects from '../queries/getJiraProjects.query.graphql'; +import JiraImportForm from './jira_import_form.vue'; import JiraImportSetup from './jira_import_setup.vue'; export default { name: 'JiraImportApp', components: { + JiraImportForm, JiraImportSetup, }, props: { @@ -41,6 +43,6 @@ export default { <template> <div> <jira-import-setup v-if="!isJiraConfigured" :illustration="setupIllustration" /> - <div v-else></div> + <jira-import-form v-else /> </div> </template> diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue new file mode 100644 index 00000000000..4de04efe1b0 --- /dev/null +++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue @@ -0,0 +1,94 @@ +<script> +import { GlAvatar, GlNewButton, GlFormGroup, GlFormSelect, GlLabel } from '@gitlab/ui'; + +export default { + name: 'JiraImportForm', + components: { + GlAvatar, + GlNewButton, + GlFormGroup, + GlFormSelect, + GlLabel, + }, + currentUserAvatarUrl: gon.current_user_avatar_url, + currentUsername: gon.current_username, +}; +</script> + +<template> + <div> + <h3 class="page-title">{{ __('New Jira import') }}</h3> + <hr /> + <form> + <gl-form-group + class="row align-items-center" + :label="__('Import from')" + label-cols-sm="2" + label-for="jira-project-select" + > + <gl-form-select id="jira-project-select" class="mb-2" /> + </gl-form-group> + + <gl-form-group + class="row align-items-center" + :label="__('Issue label')" + label-cols-sm="2" + label-for="jira-project-label" + > + <gl-label + id="jira-project-label" + class="mb-2" + background-color="#428BCA" + title="jira-import::KEY-1" + scoped + /> + </gl-form-group> + + <hr /> + + <p class="offset-md-1"> + {{ + __( + "For each Jira issue successfully imported, we'll create a new GitLab issue with the following data:", + ) + }} + </p> + + <gl-form-group + class="row align-items-center mb-1" + :label="__('Title')" + label-cols-sm="2" + label-for="jira-project-title" + > + <p id="jira-project-title" class="mb-2">{{ __('jira.issue.summary') }}</p> + </gl-form-group> + <gl-form-group + class="row align-items-center mb-1" + :label="__('Reporter')" + label-cols-sm="2" + label-for="jira-project-reporter" + > + <gl-avatar + id="jira-project-reporter" + class="mb-2" + :src="$options.currentUserAvatarUrl" + :size="24" + :aria-label="$options.currentUsername" + /> + </gl-form-group> + <gl-form-group + class="row align-items-center mb-1" + :label="__('Description')" + label-cols-sm="2" + label-for="jira-project-description" + > + <p id="jira-project-description" class="mb-2">{{ __('jira.issue.description.content') }}</p> + </gl-form-group> + + <div class="footer-block row-content-block d-flex justify-content-between"> + <gl-new-button category="primary" variant="success">{{ __('Next') }}</gl-new-button> + <gl-new-button>{{ __('Cancel') }}</gl-new-button> + </div> + </form> + </div> +</template> |