diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-16 15:07:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-16 15:07:42 +0300 |
commit | 6d4ce68742e8decbfca5a1b382ce260790e8c396 (patch) | |
tree | 148d261da58065998137fd140a6a55f62f4798df /app/assets/javascripts/jira_connect | |
parent | 9c149f7026664e988e69dae31121e6ccc810c6e8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_connect')
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/app.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/compatibility_alert.vue | 73 |
2 files changed, 1 insertions, 78 deletions
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue index 22a6c0751f4..44575455a34 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue @@ -10,7 +10,6 @@ import { SET_ALERT } from '../store/mutation_types'; import SignInPage from '../pages/sign_in/sign_in_page.vue'; import SubscriptionsPage from '../pages/subscriptions_page.vue'; import UserLink from './user_link.vue'; -import CompatibilityAlert from './compatibility_alert.vue'; import BrowserSupportAlert from './browser_support_alert.vue'; export default { @@ -19,11 +18,10 @@ export default { GlAlert, GlLink, GlSprintf, - UserLink, - CompatibilityAlert, BrowserSupportAlert, SignInPage, SubscriptionsPage, + UserLink, }, mixins: [glFeatureFlagMixin()], inject: { @@ -123,8 +121,6 @@ export default { <main class="jira-connect-app gl-px-5 gl-pt-7 gl-mx-auto"> <browser-support-alert v-if="!isBrowserSupported" class="gl-mb-7" /> <div v-else data-testid="jira-connect-app"> - <compatibility-alert class="gl-mb-7" /> - <gl-alert v-if="shouldShowAlert" :variant="alert.variant" diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/compatibility_alert.vue b/app/assets/javascripts/jira_connect/subscriptions/components/compatibility_alert.vue deleted file mode 100644 index 9b50681515e..00000000000 --- a/app/assets/javascripts/jira_connect/subscriptions/components/compatibility_alert.vue +++ /dev/null @@ -1,73 +0,0 @@ -<script> -import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; -import { s__ } from '~/locale'; -import { helpPagePath } from '~/helpers/help_page_helper'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; - -const COMPATIBILITY_ALERT_STATE_KEY = 'compatibility_alert_dismissed'; - -export default { - name: 'CompatibilityAlert', - components: { - GlAlert, - GlSprintf, - GlLink, - LocalStorageSync, - }, - mixins: [glFeatureFlagMixin()], - data() { - return { - alertDismissed: false, - }; - }, - computed: { - shouldShowAlert() { - return !this.alertDismissed; - }, - isOauthSelfManagedEnabled() { - return this.glFeatures.jiraConnectOauth && this.glFeatures.jiraConnectOauthSelfManaged; - }, - alertBody() { - return this.isOauthSelfManagedEnabled - ? this.$options.i18n.body - : this.$options.i18n.bodyDotCom; - }, - }, - methods: { - dismissAlert() { - this.alertDismissed = true; - }, - }, - i18n: { - title: s__('Integrations|Known limitations'), - body: s__( - 'Integrations|Adding a namespace only works in browsers that allow cross-site cookies. %{linkStart}Learn more%{linkEnd}.', - ), - bodyDotCom: s__( - 'Integrations|This integration only works with GitLab.com. Adding a namespace only works in browsers that allow cross-site cookies. %{linkStart}Learn more%{linkEnd}.', - ), - }, - DOCS_LINK_URL: helpPagePath('integration/jira/connect-app'), - COMPATIBILITY_ALERT_STATE_KEY, -}; -</script> -<template> - <local-storage-sync - v-model="alertDismissed" - :storage-key="$options.COMPATIBILITY_ALERT_STATE_KEY" - > - <gl-alert - v-if="shouldShowAlert" - variant="info" - :title="$options.i18n.title" - @dismiss="dismissAlert" - > - <gl-sprintf :message="alertBody"> - <template #link="{ content }"> - <gl-link :href="$options.DOCS_LINK_URL" target="_blank">{{ content }}</gl-link> - </template> - </gl-sprintf> - </gl-alert> - </local-storage-sync> -</template> |