Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 35 insertions, 53 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
index 68347ac269e..394f8979a53 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
@@ -1,54 +1,33 @@
-import { n__, s__, sprintf } from '~/locale';
 import axios from '~/lib/utils/axios_utils';
 import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants';
-import { SEVERITY_ICONS_EXTENSION } from '~/reports/codequality_report/constants';
-import { parseCodeclimateMetrics } from '~/reports/codequality_report/store/utils/codequality_parser';
+import { SEVERITY_ICONS_MR_WIDGET } from '~/ci/reports/codequality_report/constants';
+import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status';
+import { parseCodeclimateMetrics } from '~/ci/reports/codequality_report/store/utils/codequality_parser';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
+import { i18n } from './constants';
 
 export default {
   name: 'WidgetCodeQuality',
+  enablePolling: true,
   props: ['codeQuality', 'blobPath'],
-  i18n: {
-    label: s__('ciReport|Code Quality'),
-    loading: s__('ciReport|Code Quality test metrics results are being parsed'),
-    error: s__('ciReport|Code Quality failed loading results'),
-  },
+  i18n,
   computed: {
-    summary() {
-      const { newErrors, resolvedErrors, errorSummary } = this.collapsedData;
-      if (errorSummary.errored >= 1 && errorSummary.resolved >= 1) {
-        const improvements = sprintf(
-          n__(
-            '%{strong_start}%{errors}%{strong_end} point',
-            '%{strong_start}%{errors}%{strong_end} points',
-            resolvedErrors.length,
-          ),
-          {
-            errors: resolvedErrors.length,
-          },
-          false,
-        );
+    summary(data) {
+      const { newErrors, resolvedErrors, errorSummary, parsingInProgress } = data;
 
-        const degradations = sprintf(
-          n__(
-            '%{strong_start}%{errors}%{strong_end} point',
-            '%{strong_start}%{errors}%{strong_end} points',
-            newErrors.length,
-          ),
-          { errors: newErrors.length },
-          false,
-        );
-        return sprintf(
-          s__(`ciReport|Code Quality improved on ${improvements} and degraded on ${degradations}.`),
+      if (parsingInProgress) {
+        return i18n.loading;
+      } else if (errorSummary.errored >= 1 && errorSummary.resolved >= 1) {
+        return i18n.improvementAndDegradationCopy(
+          i18n.pluralReport(resolvedErrors),
+          i18n.pluralReport(newErrors),
         );
       } else if (errorSummary.resolved >= 1) {
-        const improvements = n__('%d point', '%d points', resolvedErrors.length);
-        return sprintf(s__(`ciReport|Code Quality improved on ${improvements}.`));
+        return i18n.improvedCopy(i18n.singularReport(resolvedErrors));
       } else if (errorSummary.errored >= 1) {
-        const degradations = n__('%d point', '%d points', newErrors.length);
-        return sprintf(s__(`ciReport|Code Quality degraded on ${degradations}.`));
+        return i18n.degradedCopy(i18n.singularReport(newErrors));
       }
-      return s__(`ciReport|No changes to Code Quality.`);
+      return i18n.noChanges;
     },
     statusIcon() {
       if (this.collapsedData.errorSummary?.errored >= 1) {
@@ -59,18 +38,17 @@ export default {
   },
   methods: {
     fetchCollapsedData() {
-      return Promise.all([this.fetchReport(this.codeQuality)]).then((values) => {
+      return axios.get(this.codeQuality).then((response) => {
+        const { data = {}, status } = response;
         return {
-          resolvedErrors: parseCodeclimateMetrics(
-            values[0].resolved_errors,
-            this.blobPath.head_path,
-          ),
-          newErrors: parseCodeclimateMetrics(values[0].new_errors, this.blobPath.head_path),
-          existingErrors: parseCodeclimateMetrics(
-            values[0].existing_errors,
-            this.blobPath.head_path,
-          ),
-          errorSummary: values[0].summary,
+          ...response,
+          data: {
+            parsingInProgress: status === HTTP_STATUS_NO_CONTENT,
+            resolvedErrors: parseCodeclimateMetrics(data.resolved_errors, this.blobPath.head_path),
+            newErrors: parseCodeclimateMetrics(data.new_errors, this.blobPath.head_path),
+            existingErrors: parseCodeclimateMetrics(data.existing_errors, this.blobPath.head_path),
+            errorSummary: data.summary,
+          },
         };
       });
     },
@@ -81,12 +59,12 @@ export default {
         return fullData.push({
           text: `${capitalizeFirstCharacter(e.severity)} - ${e.description}`,
           subtext: {
-            prependText: s__(`ciReport|in`),
+            prependText: i18n.prependText,
             text: `${e.file_path}:${e.line}`,
             href: e.urlPath,
           },
           icon: {
-            name: SEVERITY_ICONS_EXTENSION[e.severity],
+            name: SEVERITY_ICONS_MR_WIDGET[e.severity],
           },
         });
       });
@@ -95,12 +73,16 @@ export default {
         return fullData.push({
           text: `${capitalizeFirstCharacter(e.severity)} - ${e.description}`,
           subtext: {
-            prependText: s__(`ciReport|in`),
+            prependText: i18n.prependText,
             text: `${e.file_path}:${e.line}`,
             href: e.urlPath,
           },
           icon: {
-            name: SEVERITY_ICONS_EXTENSION[e.severity],
+            name: SEVERITY_ICONS_MR_WIDGET[e.severity],
+          },
+          badge: {
+            variant: 'neutral',
+            text: i18n.fixed,
           },
         });
       });