diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 15:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 15:08:54 +0300 |
commit | 766b24b86ba1c5405d6a300f35062c33108941d4 (patch) | |
tree | ee9a661db63c6257ebce580882fe539bfce3c492 /app/assets/javascripts/groups | |
parent | 1385b54a3e44a90a463d4975bd639089be056778 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/components/invite_members_banner.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/groups/init_invite_members_banner.js | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/groups/components/invite_members_banner.vue b/app/assets/javascripts/groups/components/invite_members_banner.vue index 83a23134279..a2d18229c8b 100644 --- a/app/assets/javascripts/groups/components/invite_members_banner.vue +++ b/app/assets/javascripts/groups/components/invite_members_banner.vue @@ -1,20 +1,22 @@ <script> import { GlBanner } from '@gitlab/ui'; import { s__ } from '~/locale'; +import { parseBoolean, setCookie, getCookie } from '~/lib/utils/common_utils'; export default { components: { GlBanner, }, - inject: ['svgPath', 'inviteMembersPath'], + inject: ['svgPath', 'inviteMembersPath', 'isDismissedKey'], data() { return { - visible: true, + isDismissed: parseBoolean(getCookie(this.isDismissedKey)), }; }, methods: { handleClose() { - this.visible = false; + setCookie(this.isDismissedKey, true); + this.isDismissed = true; }, }, i18n: { @@ -29,7 +31,7 @@ export default { <template> <gl-banner - v-if="visible" + v-if="!isDismissed" ref="banner" :title="$options.i18n.title" :button-text="$options.i18n.button_text" diff --git a/app/assets/javascripts/groups/init_invite_members_banner.js b/app/assets/javascripts/groups/init_invite_members_banner.js index dbc3ed65a4f..9117337895f 100644 --- a/app/assets/javascripts/groups/init_invite_members_banner.js +++ b/app/assets/javascripts/groups/init_invite_members_banner.js @@ -8,13 +8,14 @@ export default function initInviteMembersBanner() { return false; } - const { svgPath, inviteMembersPath } = el.dataset; + const { svgPath, inviteMembersPath, isDismissedKey } = el.dataset; return new Vue({ el, provide: { svgPath, inviteMembersPath, + isDismissedKey, }, render: createElement => createElement(InviteMembersBanner), }); |