Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

3 files changed, 9 insertions, 26 deletions

diff --git a/app/assets/javascripts/jobs/components/table/constants.js b/app/assets/javascripts/jobs/components/table/constants.js
index 853834ed51d..f73241aed6b 100644
--- a/app/assets/javascripts/jobs/components/table/constants.js
+++ b/app/assets/javascripts/jobs/components/table/constants.js
@@ -1,5 +1,4 @@
 import { s__, __ } from '~/locale';
-import { DEFAULT_TH_CLASSES } from '~/lib/utils/constants';
 
 /* Error constants */
 export const POST_FAILURE = 'post_failure';
@@ -29,62 +28,46 @@ export const PLAY_JOB_CONFIRMATION_MESSAGE = s__(
 export const RUN_JOB_NOW_HEADER_TITLE = s__('DelayedJobs|Run the delayed job now?');
 
 /* Table constants */
-
-const defaultTableClasses = {
-  tdClass: 'gl-p-5!',
-  thClass: DEFAULT_TH_CLASSES,
-};
-// eslint-disable-next-line @gitlab/require-i18n-strings
-const coverageTdClasses = `${defaultTableClasses.tdClass} gl-display-none! gl-lg-display-table-cell!`;
-
 export const DEFAULT_FIELDS = [
   {
     key: 'status',
     label: __('Status'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-10p',
   },
   {
     key: 'job',
     label: __('Job'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-20p',
   },
   {
     key: 'pipeline',
     label: __('Pipeline'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-10p',
   },
   {
     key: 'stage',
     label: __('Stage'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-10p',
   },
   {
     key: 'name',
     label: __('Name'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-15p',
   },
   {
     key: 'duration',
     label: __('Duration'),
-    ...defaultTableClasses,
     columnClass: 'gl-w-15p',
   },
   {
     key: 'coverage',
     label: __('Coverage'),
-    tdClass: coverageTdClasses,
-    thClass: defaultTableClasses.thClass,
+    tdClass: 'gl-display-none! gl-lg-display-table-cell!',
     columnClass: 'gl-w-10p',
   },
   {
     key: 'actions',
     label: '',
-    ...defaultTableClasses,
     columnClass: 'gl-w-10p',
   },
 ];
diff --git a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
index 0a4757d11a8..3209fc4b90d 100644
--- a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
+++ b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlAlert, GlSkeletonLoader, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
-import createFlash from '~/flash';
+import { createAlert } from '~/flash';
 import { setUrlParams, updateHistory, queryToObject } from '~/lib/utils/url_utility';
 import JobsFilteredSearch from '../filtered_search/jobs_filtered_search.vue';
 import { validateQueryString } from '../filtered_search/utils';
@@ -134,7 +134,7 @@ export default {
         // when a user enters raw text we alert them that it is
         // not supported and we do not make an additional API call
         if (!filter.type) {
-          createFlash({
+          createAlert({
             message: RAW_TEXT_WARNING,
             type: 'warning',
           });
diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js
index 927ba7c7e1e..272181f830c 100644
--- a/app/assets/javascripts/jobs/store/actions.js
+++ b/app/assets/javascripts/jobs/store/actions.js
@@ -1,5 +1,5 @@
 import Visibility from 'visibilityjs';
-import createFlash from '~/flash';
+import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { setFaviconOverlay, resetFavicon } from '~/lib/utils/favicon';
 import httpStatusCodes from '~/lib/utils/http_status';
@@ -100,7 +100,7 @@ export const receiveJobSuccess = ({ commit }, data = {}) => {
 };
 export const receiveJobError = ({ commit }) => {
   commit(types.RECEIVE_JOB_ERROR);
-  createFlash({
+  createAlert({
     message: __('An error occurred while fetching the job.'),
   });
   resetFavicon();
@@ -205,14 +205,14 @@ export const receiveJobLogSuccess = ({ commit }, log) => commit(types.RECEIVE_JO
 
 export const receiveJobLogError = ({ dispatch }) => {
   dispatch('stopPollingJobLog');
-  createFlash({
+  createAlert({
     message: __('An error occurred while fetching the job log.'),
   });
 };
 
 export const receiveJobLogUnauthorizedError = ({ dispatch }) => {
   dispatch('stopPollingJobLog');
-  createFlash({
+  createAlert({
     message: __('The current user is not authorized to access the job log.'),
   });
 };
@@ -254,7 +254,7 @@ export const receiveJobsForStageSuccess = ({ commit }, data) =>
 
 export const receiveJobsForStageError = ({ commit }) => {
   commit(types.RECEIVE_JOBS_FOR_STAGE_ERROR);
-  createFlash({
+  createAlert({
     message: __('An error occurred while fetching the jobs.'),
   });
 };
@@ -271,7 +271,7 @@ export const triggerManualJob = ({ state }, variables) => {
       job_variables_attributes: parsedVariables,
     })
     .catch(() =>
-      createFlash({
+      createAlert({
         message: __('An error occurred while triggering the job.'),
       }),
     );