diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue index 369cb2fa0f3688ae08129bd7f5d0be993ca71dd5..aaad0009ef39612311274e4dccd4f6321a497293 100644 --- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue +++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue @@ -54,15 +54,17 @@ export default { required: false, }, }, - data: () => ({ - currentServerSideSettings: { - host: null, - port: null, - protocol: null, - wafLogEnabled: null, - ciliumLogEnabled: null, - }, - }), + data() { + return { + currentServerSideSettings: { + host: null, + port: null, + protocol: null, + wafLogEnabled: null, + ciliumLogEnabled: null, + }, + }; + }, computed: { isSaving() { return [UPDATING].includes(this.status); diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue index 26767c322759e1ca80ca7eb958a471894e23827a..277d2c33b736e1ce47ccade7e26353c76d246ea4 100644 --- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue +++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue @@ -53,11 +53,13 @@ export default { }), }, }, - data: () => ({ - modSecurityLogo, - initialValue: null, - initialMode: null, - }), + data() { + return { + modSecurityLogo, + initialValue: null, + initialMode: null, + }; + }, computed: { modSecurityEnabled: { get() { diff --git a/app/assets/javascripts/security_configuration/components/configuration_table.vue b/app/assets/javascripts/security_configuration/components/configuration_table.vue index 168d158a7863f026595f9ac6b0c90c40b3dc075b..4a3f988296cbd241b6125a2021d47a633d259318 100644 --- a/app/assets/javascripts/security_configuration/components/configuration_table.vue +++ b/app/assets/javascripts/security_configuration/components/configuration_table.vue @@ -24,9 +24,11 @@ export default { GlTable, GlAlert, }, - data: () => ({ - errorMessage: '', - }), + data() { + return { + errorMessage: '', + }; + }, methods: { getFeatureDocumentationLinkLabel(item) { return sprintf(s__('SecurityConfiguration|Feature documentation for %{featureName}'), { diff --git a/app/assets/javascripts/security_configuration/components/manage_sast.vue b/app/assets/javascripts/security_configuration/components/manage_sast.vue index 5169096d563e9db69d461218f515f574c37530e7..a2528edd9145bb0c4d278f923568afd2bf1710b4 100644 --- a/app/assets/javascripts/security_configuration/components/manage_sast.vue +++ b/app/assets/javascripts/security_configuration/components/manage_sast.vue @@ -14,9 +14,11 @@ export default { default: '', }, }, - data: () => ({ - isLoading: false, - }), + data() { + return { + isLoading: false, + }; + }, methods: { async mutate() { this.isLoading = true; diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue index d6f99e9a0496176351a6eb2ed6d16610036984a2..b3edd05b0ee92abf1bb53a26266dd1dcf23f970a 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue @@ -37,9 +37,11 @@ export default { required: true, }, }, - data: () => ({ - state: STATE_IDLING, - }), + data() { + return { + state: STATE_IDLING, + }; + }, computed: { shortSha() { return truncateSha(this.diffFile.content_sha); diff --git a/ee/app/assets/javascripts/contextual_sidebar/components/trial_status_popover.vue b/ee/app/assets/javascripts/contextual_sidebar/components/trial_status_popover.vue index aa1c3cf8bb5b8f59442b19d5350e21db7b711bc3..86e40c262192d68f4b2498785c0129eaa48133d3 100644 --- a/ee/app/assets/javascripts/contextual_sidebar/components/trial_status_popover.vue +++ b/ee/app/assets/javascripts/contextual_sidebar/components/trial_status_popover.vue @@ -45,9 +45,11 @@ export default { required: true, }, }, - data: () => ({ - disabled: false, - }), + data() { + return { + disabled: false, + }; + }, i18n: { compareAllButtonTitle: s__('Trials|Compare all plans'), popoverTitle: s__('Trials|Hey there'), diff --git a/ee/app/assets/javascripts/reports/components/modal_open_name.vue b/ee/app/assets/javascripts/reports/components/modal_open_name.vue index 88e985dcd84d4e1c8c500963560fd46cf61b9c59..a8a60cc287eaabad008f3aa651e7237c9240bda4 100644 --- a/ee/app/assets/javascripts/reports/components/modal_open_name.vue +++ b/ee/app/assets/javascripts/reports/components/modal_open_name.vue @@ -20,9 +20,11 @@ export default { required: true, }, }, - data: () => ({ - tooltipTitle: '', - }), + data() { + return { + tooltipTitle: '', + }; + }, mounted() { this.updateTooltipTitle(); }, diff --git a/ee/app/assets/javascripts/security_configuration/components/app.vue b/ee/app/assets/javascripts/security_configuration/components/app.vue index d410b29f933ee203f0398b7fce1009f65ade5d77..439fdc862d25d5539e997b7b01643da2377f65b4 100644 --- a/ee/app/assets/javascripts/security_configuration/components/app.vue +++ b/ee/app/assets/javascripts/security_configuration/components/app.vue @@ -62,9 +62,11 @@ export default { default: false, }, }, - data: () => ({ - autoDevopsAlertDismissed: 'false', - }), + data() { + return { + autoDevopsAlertDismissed: 'false', + }; + }, computed: { devopsMessage() { return this.autoDevopsEnabled diff --git a/ee/app/assets/javascripts/security_configuration/components/expandable_section.vue b/ee/app/assets/javascripts/security_configuration/components/expandable_section.vue index c090d57a5a0c6cf1920e33a37bad1dfb21f2e881..5fc49dd764f491e9ac7ee2f2b11c3f3d9e1c0373 100644 --- a/ee/app/assets/javascripts/security_configuration/components/expandable_section.vue +++ b/ee/app/assets/javascripts/security_configuration/components/expandable_section.vue @@ -18,10 +18,12 @@ export default { default: 'h3', }, }, - data: () => ({ - collapseId: uniqueId('expandable-section-'), - visible: false, - }), + data() { + return { + collapseId: uniqueId('expandable-section-'), + visible: false, + }; + }, computed: { toggleText() { return this.visible ? __('Collapse') : __('Expand'); diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue index e440a5c469e9ff1d3e4e5a7b27fbf6321d632834..b634bfab38d4f4ec13c370c26e70f09cefb755e8 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue @@ -29,11 +29,13 @@ export default { default: () => [], }, }, - data: () => ({ - isRunningScan: null, - hasRunScanError: false, - runScanErrors: [], - }), + data() { + return { + isRunningScan: null, + hasRunScanError: false, + runScanErrors: [], + }; + }, computed: { error() { if (this.hasRunScanError) { diff --git a/ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue b/ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue index 5caf59d4e299e56e75d3b486f70dd92b21fade41..a642b5918d9b5072144ff2de1fa20b707a28cfc6 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue @@ -25,10 +25,12 @@ export default { required: true, }, }, - data: () => ({ - isPreparingCsvExport: false, - showPopover: localStorage.getItem(STORAGE_KEY) !== 'true', - }), + data() { + return { + isPreparingCsvExport: false, + showPopover: localStorage.getItem(STORAGE_KEY) !== 'true', + }; + }, computed: { buttonProps() { const { isPreparingCsvExport } = this; diff --git a/ee/app/assets/javascripts/security_dashboard/components/filters.vue b/ee/app/assets/javascripts/security_dashboard/components/filters.vue index 54abbe8fe52468b86512538bb7972426324fa565..7fd6127013afe26c0b9826ed1fa27642857a331c 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/filters.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/filters.vue @@ -10,9 +10,11 @@ export default { StandardFilter, GlToggle, }, - data: () => ({ - filterConfigs: [severityFilter, scannerFilter], - }), + data() { + return { + filterConfigs: [severityFilter, scannerFilter], + }; + }, computed: { ...mapState('filters', ['filters']), hideDismissed: { diff --git a/ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_filters.vue b/ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_filters.vue index cb9429e52f67dcdfbba662fbb16b730ae4b9fea7..24a5dbd344365ee9bf9146c58a44b436c624f4ec 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_filters.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_filters.vue @@ -17,9 +17,11 @@ export default { props: { projects: { type: Array, required: false, default: undefined }, }, - data: () => ({ - filterQuery: {}, - }), + data() { + return { + filterQuery: {}, + }; + }, computed: { filters() { const filters = [stateFilter, severityFilter, scannerFilter, activityFilter]; diff --git a/ee/app/assets/javascripts/security_dashboard/components/selection_summary_vuex.vue b/ee/app/assets/javascripts/security_dashboard/components/selection_summary_vuex.vue index c7aa45a6f40f0c49ee946048733bcc7f9f0876b9..85d5cbe26d6d052cde78bbb33bb8675f70b67532 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/selection_summary_vuex.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/selection_summary_vuex.vue @@ -13,9 +13,11 @@ export default { GlButton, GlFormSelect, }, - data: () => ({ - dismissalReason: null, - }), + data() { + return { + dismissalReason: null, + }; + }, computed: { ...mapGetters('vulnerabilities', ['selectedVulnerabilitiesCount']), canDismissVulnerability() { diff --git a/ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list.vue b/ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list.vue index 575f5fada39d23e5059e3c75cef47a97ec82d7e1..b048b53036b203a6186bfc9259ea62e5f2073561 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list.vue @@ -24,10 +24,12 @@ export default { default: () => ({}), }, }, - data: () => ({ - queryError: false, - vulnerabilitiesCount: {}, - }), + data() { + return { + queryError: false, + vulnerabilitiesCount: {}, + }; + }, computed: { isLoading() { return this.$apollo.queries.vulnerabilitiesCount.loading; diff --git a/ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue b/ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue index d613f6162c014379079ef1504593e4913834047c..14830144c85762d97d6eae540ae943af847ff1eb 100644 --- a/ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue +++ b/ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue @@ -52,14 +52,16 @@ export default { default: '', }, }, - data: () => ({ - slide: 0, - carouselImages: [ - securityDependencyImageUrl, - securityScanningImageUrl, - securityDashboardImageUrl, - ], - }), + data() { + return { + slide: 0, + carouselImages: [ + securityDependencyImageUrl, + securityScanningImageUrl, + securityDashboardImageUrl, + ], + }; + }, computed: { discoverButtonProps() { return { diff --git a/ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue b/ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue index 658ed57c2026448fe8e5b2a8be12dc0819f97316..9e9b7e15484738b3207415c5cdc4d36e268b780a 100644 --- a/ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue +++ b/ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue @@ -57,10 +57,12 @@ export default { required: true, }, }, - data: () => ({ - localDismissalComment: '', - dismissalCommentErrorMessage: '', - }), + data() { + return { + localDismissalComment: '', + dismissalCommentErrorMessage: '', + }; + }, computed: { canCreateIssueForThisVulnerability() { return Boolean(!this.isResolved && !this.vulnerability.hasIssue && this.canCreateIssue); diff --git a/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue b/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue index 55a13fff352cb9d76ebd172c9eb4afcfc15649a6..9ede8566097e8caade0c35168ab4b97b9c3f2293 100644 --- a/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue +++ b/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue @@ -18,9 +18,11 @@ export default { default: false, }, }, - data: () => ({ - selectedButton: {}, - }), + data() { + return { + selectedButton: {}, + }; + }, created() { this.setButton(this.buttons[0]); }, diff --git a/ee/app/assets/javascripts/vulnerabilities/components/footer.vue b/ee/app/assets/javascripts/vulnerabilities/components/footer.vue index 403214905c784cd633c7a3612e41229d32dafd66..98bc7cef84a9cb844d5320c046fe78f4a3531438 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/footer.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/footer.vue @@ -40,12 +40,12 @@ export default { required: true, }, }, - - data: () => ({ - discussionsDictionary: {}, - lastFetchedAt: null, - }), - + data() { + return { + discussionsDictionary: {}, + lastFetchedAt: null, + }; + }, computed: { discussions() { return Object.values(this.discussionsDictionary); @@ -92,21 +92,17 @@ export default { }; }, }, - created() { this.fetchDiscussions(); }, - updated() { this.$nextTick(() => { initUserPopovers(this.$el.querySelectorAll('.js-user-link')); }); }, - beforeDestroy() { if (this.poll) this.poll.stop(); }, - methods: { dateToSeconds(date) { return Date.parse(date) / 1000; @@ -199,7 +195,6 @@ export default { } } }); - // Emit an event that tells the header to refresh the vulnerability. if (isVulnerabilityStateChanged) { this.$emit('vulnerability-state-change'); @@ -211,7 +206,6 @@ export default { <template> <div data-qa-selector="vulnerability_footer"> <solution-card v-if="hasSolution" v-bind="solutionInfo" /> - <div v-if="vulnerability.mergeRequestFeedback" class="card gl-mt-5"> <merge-request-note :feedback="vulnerability.mergeRequestFeedback" @@ -219,7 +213,6 @@ export default { class="card-body" /> </div> - <related-jira-issues v-if="glFeatures.jiraForVulnerabilities && createJiraIssueUrl" class="gl-mt-6" @@ -231,7 +224,6 @@ export default { :project-path="project.url" :help-path="vulnerability.relatedIssuesHelpPath" /> - <div class="notes" data-testid="detection-note"> <div class="system-note gl-display-flex gl-align-items-center gl-p-0! gl-mt-6!"> <div class="timeline-icon gl-m-0!"> @@ -244,9 +236,7 @@ export default { /> </div> </div> - <hr /> - <ul v-if="discussions.length" ref="historyList" class="notes discussion-body"> <history-entry v-for="discussion in discussions"