diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/environments/components/environments_app.vue | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/environments/components/environments_app.vue')
-rw-r--r-- | app/assets/javascripts/environments/components/environments_app.vue | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index 105315dcf51..acc16ecd874 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -1,9 +1,7 @@ <script> -import { GlBadge, GlButton, GlModalDirective, GlTab, GlTabs, GlAlert } from '@gitlab/ui'; +import { GlBadge, GlButton, GlModalDirective, GlTab, GlTabs } from '@gitlab/ui'; import createFlash from '~/flash'; -import { setCookie, getCookie, parseBoolean } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; -import { ENVIRONMENTS_SURVEY_DISMISSED_COOKIE_NAME } from '../constants'; import eventHub from '../event_hub'; import environmentsMixin from '../mixins/environments_mixin'; import EnvironmentsPaginationApiMixin from '../mixins/environments_pagination_api_mixin'; @@ -17,12 +15,6 @@ export default { i18n: { newEnvironmentButtonLabel: s__('Environments|New environment'), reviewAppButtonLabel: s__('Environments|Enable review app'), - surveyAlertTitle: s__('Environments|Help us improve environments'), - surveyAlertText: s__( - 'Environments|Your feedback helps GitLab make environments better for you and other users. Participate and enter a sweepstake to win a USD 30 gift card.', - ), - surveyAlertButtonLabel: s__('Environments|Take the survey'), - surveyDismissButtonLabel: s__('Environments|Dismiss'), }, modal: { id: 'enable-review-app-info', @@ -33,7 +25,6 @@ export default { EnableReviewAppModal, GlBadge, GlButton, - GlAlert, GlTab, GlTabs, StopEnvironmentModal, @@ -52,10 +43,6 @@ export default { type: Boolean, required: true, }, - canReadEnvironment: { - type: Boolean, - required: true, - }, newEnvironmentPath: { type: String, required: true, @@ -65,13 +52,6 @@ export default { required: true, }, }, - data() { - return { - environmentsSurveyAlertDismissed: parseBoolean( - getCookie(ENVIRONMENTS_SURVEY_DISMISSED_COOKIE_NAME), - ), - }; - }, created() { eventHub.$on('toggleFolder', this.toggleFolder); @@ -121,11 +101,6 @@ export default { openFolders.forEach((folder) => this.fetchChildEnvironments(folder)); } }, - - onSurveyAlertDismiss() { - setCookie(ENVIRONMENTS_SURVEY_DISMISSED_COOKIE_NAME, 'true'); - this.environmentsSurveyAlertDismissed = true; - }, }, }; </script> @@ -156,19 +131,6 @@ export default { >{{ $options.i18n.newEnvironmentButtonLabel }}</gl-button > </div> - <gl-alert - v-if="!environmentsSurveyAlertDismissed" - class="gl-my-4" - :title="$options.i18n.surveyAlertTitle" - :primary-button-text="$options.i18n.surveyAlertButtonLabel" - variant="info" - dismissible - :dismiss-label="$options.i18n.surveyDismissButtonLabel" - primary-button-link="https://gitlab.fra1.qualtrics.com/jfe/form/SV_a2xyFsAA4D0w0Jg" - @dismiss="onSurveyAlertDismiss" - > - {{ $options.i18n.surveyAlertText }} - </gl-alert> <gl-tabs :value="activeTab" content-class="gl-display-none"> <gl-tab v-for="(tab, idx) in tabs" @@ -210,7 +172,6 @@ export default { :is-loading="isLoading" :environments="state.environments" :pagination="state.paginationInformation" - :can-read-environment="canReadEnvironment" @onChangePage="onChangePage" > <template v-if="!isLoading && state.environments.length === 0" #empty-state> |