diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:34 +0000 |
commit | 141902c04943d5fb43c014b8cf42af60a3bc0cdf (patch) | |
tree | 7e5a31fe9b0434fa0071cb5d09273669c3a8acab /app/assets/javascripts | |
parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) | |
download | gitlab-ce-141902c04943d5fb43c014b8cf42af60a3bc0cdf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
5 files changed, 53 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 4b19c4d1b17..6efac949979 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_app.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_app.vue @@ -1,13 +1,25 @@ <script> import getJiraProjects from '../queries/getJiraProjects.query.graphql'; +import JiraImportSetup from './jira_import_setup.vue'; export default { name: 'JiraImportApp', + components: { + JiraImportSetup, + }, props: { + isJiraConfigured: { + type: Boolean, + required: true, + }, projectPath: { type: String, required: true, }, + setupIllustration: { + type: String, + required: true, + }, }, apollo: { getJiraImports: { @@ -18,11 +30,17 @@ export default { }; }, update: data => data.project.jiraImports, + skip() { + return !this.isJiraConfigured; + }, }, }, }; </script> <template> - <div></div> + <div> + <jira-import-setup v-if="!isJiraConfigured" :illustration="setupIllustration" /> + <div v-else></div> + </div> </template> diff --git a/app/assets/javascripts/jira_import/components/jira_import_setup.vue b/app/assets/javascripts/jira_import/components/jira_import_setup.vue new file mode 100644 index 00000000000..917930397f4 --- /dev/null +++ b/app/assets/javascripts/jira_import/components/jira_import_setup.vue @@ -0,0 +1,25 @@ +<script> +export default { + name: 'JiraImportSetup', + props: { + illustration: { + type: String, + required: true, + }, + }, +}; +</script> + +<template> + <div class="empty-state"> + <div class="svg-content"> + <img :src="illustration" :alt="__('Set up Jira Integration illustration')" /> + </div> + <div class="text-content d-flex flex-column align-items-center"> + <p>{{ __('You will first need to set up Jira Integration to use this feature.') }}</p> + <a class="btn btn-success" href="../services/jira/edit"> + {{ __('Set up Jira Integration') }} + </a> + </div> + </div> +</template> diff --git a/app/assets/javascripts/jira_import/index.js b/app/assets/javascripts/jira_import/index.js index a17313fd774..13b16b81c49 100644 --- a/app/assets/javascripts/jira_import/index.js +++ b/app/assets/javascripts/jira_import/index.js @@ -1,6 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; +import { parseBoolean } from '~/lib/utils/common_utils'; import App from './components/jira_import_app.vue'; Vue.use(VueApollo); @@ -23,7 +24,9 @@ export default function mountJiraImportApp() { render(createComponent) { return createComponent(App, { props: { + isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured), projectPath: el.dataset.projectPath, + setupIllustration: el.dataset.setupIllustration, }, }); }, diff --git a/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js b/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js new file mode 100644 index 00000000000..2fd047675b9 --- /dev/null +++ b/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js @@ -0,0 +1,3 @@ +import customMetrics from '~/custom_metrics'; + +document.addEventListener('DOMContentLoaded', customMetrics); diff --git a/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js b/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js new file mode 100644 index 00000000000..2fd047675b9 --- /dev/null +++ b/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js @@ -0,0 +1,3 @@ +import customMetrics from '~/custom_metrics'; + +document.addEventListener('DOMContentLoaded', customMetrics); |