diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/security_configuration/components/app.vue | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/security_configuration/components/app.vue')
-rw-r--r-- | app/assets/javascripts/security_configuration/components/app.vue | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/app/assets/javascripts/security_configuration/components/app.vue b/app/assets/javascripts/security_configuration/components/app.vue index 6c70a8c33db..bc13150c99c 100644 --- a/app/assets/javascripts/security_configuration/components/app.vue +++ b/app/assets/javascripts/security_configuration/components/app.vue @@ -1,5 +1,5 @@ <script> -import { GlTab, GlTabs, GlSprintf, GlLink } from '@gitlab/ui'; +import { GlTab, GlTabs, GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; import { __, s__ } from '~/locale'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue'; @@ -31,6 +31,7 @@ export default { AutoDevOpsAlert, AutoDevOpsEnabledAlert, FeatureCard, + GlAlert, GlLink, GlSprintf, GlTab, @@ -79,6 +80,7 @@ export default { data() { return { autoDevopsEnabledAlertDismissedProjects: [], + errorMessage: '', }; }, computed: { @@ -106,6 +108,12 @@ export default { dismissedProjects.add(this.projectPath); this.autoDevopsEnabledAlertDismissedProjects = Array.from(dismissedProjects); }, + onError(message) { + this.errorMessage = message; + }, + dismissAlert() { + this.errorMessage = ''; + }, }, autoDevopsEnabledAlertStorageKey: AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY, }; @@ -113,6 +121,16 @@ export default { <template> <article> + <gl-alert + v-if="errorMessage" + sticky + class="gl-top-8 gl-z-index-1" + data-testid="manage-via-mr-error-alert" + variant="danger" + @dismiss="dismissAlert" + > + {{ errorMessage }} + </gl-alert> <local-storage-sync v-model="autoDevopsEnabledAlertDismissedProjects" :storage-key="$options.autoDevopsEnabledAlertStorageKey" @@ -174,6 +192,7 @@ export default { data-testid="security-testing-card" :feature="feature" class="gl-mb-6" + @error="onError" /> </template> </section-layout> @@ -207,6 +226,7 @@ export default { :key="feature.type" :feature="feature" class="gl-mb-6" + @error="onError" /> </template> </section-layout> |