diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-21 03:08:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-21 03:08:00 +0300 |
commit | 0fd09fff507a22e2059bcfe11cfc4e657590c72c (patch) | |
tree | 2468ba28f97c59a9a4729bc7734cfdc5600f27b8 /app/assets/javascripts/security_configuration | |
parent | 22fe7d7df6b91040d6cecbfd78f24c563afed463 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/security_configuration')
4 files changed, 14 insertions, 41 deletions
diff --git a/app/assets/javascripts/security_configuration/components/app.vue b/app/assets/javascripts/security_configuration/components/app.vue index d0c4ad3646c..c168d686053 100644 --- a/app/assets/javascripts/security_configuration/components/app.vue +++ b/app/assets/javascripts/security_configuration/components/app.vue @@ -4,10 +4,9 @@ import { __, s__ } from '~/locale'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue'; import SectionLayout from '~/vue_shared/security_configuration/components/section_layout.vue'; -import currentLicenseQuery from '~/security_configuration/graphql/current_license.query.graphql'; import AutoDevOpsAlert from './auto_dev_ops_alert.vue'; import AutoDevOpsEnabledAlert from './auto_dev_ops_enabled_alert.vue'; -import { AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY, LICENSE_ULTIMATE } from './constants'; +import { AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY } from './constants'; import FeatureCard from './feature_card.vue'; import TrainingProviderList from './training_provider_list.vue'; import UpgradeBanner from './upgrade_banner.vue'; @@ -51,17 +50,6 @@ export default { TrainingProviderList, }, inject: ['projectFullPath', 'vulnerabilityTrainingDocsPath'], - apollo: { - currentLicensePlan: { - query: currentLicenseQuery, - update({ currentLicense }) { - return currentLicense?.plan; - }, - error() { - this.hasCurrentLicenseFetchError = true; - }, - }, - }, props: { augmentedSecurityFeatures: { type: Array, @@ -96,13 +84,15 @@ export default { required: false, default: '', }, + securityTrainingEnabled: { + type: Boolean, + required: true, + }, }, data() { return { autoDevopsEnabledAlertDismissedProjects: [], errorMessage: '', - currentLicensePlan: '', - hasCurrentLicenseFetchError: false, }; }, computed: { @@ -123,12 +113,6 @@ export default { !this.autoDevopsEnabledAlertDismissedProjects.includes(this.projectFullPath) ); }, - shouldShowVulnerabilityManagementTab() { - // if the query fails (if the plan is `null` also means an error has occurred) we still want to show the feature - const hasQueryError = this.hasCurrentLicenseFetchError || this.currentLicensePlan === null; - - return hasQueryError || this.currentLicensePlan === LICENSE_ULTIMATE; - }, }, methods: { dismissAutoDevopsEnabledAlert() { @@ -253,9 +237,9 @@ export default { {{ $options.i18n.description }} </p> <p v-if="canViewCiHistory"> - <gl-link data-testid="compliance-view-history-link" :href="gitlabCiHistoryPath">{{ - $options.i18n.configurationHistory - }}</gl-link> + <gl-link data-testid="compliance-view-history-link" :href="gitlabCiHistoryPath"> + {{ $options.i18n.configurationHistory }} + </gl-link> </p> </template> <template #features> @@ -270,20 +254,18 @@ export default { </section-layout> </gl-tab> <gl-tab - v-if="shouldShowVulnerabilityManagementTab" + v-if="securityTrainingEnabled" data-testid="vulnerability-management-tab" :title="$options.i18n.vulnerabilityManagement" query-param-value="vulnerability-management" > <section-layout :heading="$options.i18n.securityTraining"> <template #description> + <p>{{ $options.i18n.securityTrainingDescription }}</p> <p> - {{ $options.i18n.securityTrainingDescription }} - </p> - <p> - <gl-link :href="vulnerabilityTrainingDocsPath">{{ - $options.i18n.securityTrainingDoc - }}</gl-link> + <gl-link :href="vulnerabilityTrainingDocsPath"> + {{ $options.i18n.securityTrainingDoc }} + </gl-link> </p> </template> <template #features> diff --git a/app/assets/javascripts/security_configuration/components/constants.js b/app/assets/javascripts/security_configuration/components/constants.js index 5b04ad6f9ba..e4d2bd08f50 100644 --- a/app/assets/javascripts/security_configuration/components/constants.js +++ b/app/assets/javascripts/security_configuration/components/constants.js @@ -310,7 +310,3 @@ export const TEMP_PROVIDER_URLS = { Kontra: 'https://application.security/', [__('Secure Code Warrior')]: 'https://www.securecodewarrior.com/', }; - -export const LICENSE_ULTIMATE = 'ultimate'; -export const LICENSE_FREE = 'free'; -export const LICENSE_PREMIUM = 'premium'; diff --git a/app/assets/javascripts/security_configuration/graphql/current_license.query.graphql b/app/assets/javascripts/security_configuration/graphql/current_license.query.graphql deleted file mode 100644 index 9ab4f4d4347..00000000000 --- a/app/assets/javascripts/security_configuration/graphql/current_license.query.graphql +++ /dev/null @@ -1,6 +0,0 @@ -query getCurrentLicensePlan { - currentLicense { - id - plan - } -} diff --git a/app/assets/javascripts/security_configuration/index.js b/app/assets/javascripts/security_configuration/index.js index dcc41a38067..637d510e684 100644 --- a/app/assets/javascripts/security_configuration/index.js +++ b/app/assets/javascripts/security_configuration/index.js @@ -56,6 +56,7 @@ export const initSecurityConfiguration = (el) => { 'gitlabCiPresent', 'autoDevopsEnabled', 'canEnableAutoDevops', + 'securityTrainingEnabled', ]), }, }); |