Merge branch '12155-update-pipelines-minutes-expiry-banner-to-an-alert-component-type-ce' into 'master'

CE - Update pipelines minutes expiry banner to an alert component type

See merge request gitlab-org/gitlab-ce!31654

6 files changed, 29 insertions, 14 deletions

diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index ad1072366f3..c7d4d7c4b9b 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -83,6 +83,11 @@ export default {
       type: String,
       required: true,
     },
+    subscriptionsMoreMinutesUrl: {
+      type: String,
+      required: false,
+      default: null,
+    },
   },
   computed: {
     ...mapState([
@@ -265,6 +270,7 @@ export default {
           :quota-limit="job.runners.quota.limit"
           :runners-path="runnerHelpUrl"
           :project-path="projectPath"
+          :subscriptions-more-minutes-url="subscriptionsMoreMinutesUrl"
         />
 
         <environments-block
diff --git a/app/assets/javascripts/jobs/index.js b/app/assets/javascripts/jobs/index.js
index add7f9b710a..9c35534523e 100644
--- a/app/assets/javascripts/jobs/index.js
+++ b/app/assets/javascripts/jobs/index.js
@@ -15,6 +15,7 @@ export default () => {
         runnerHelpUrl,
         runnerSettingsUrl,
         variablesSettingsUrl,
+        subscriptionsMoreMinutesUrl,
         endpoint,
         pagePath,
         logState,
@@ -28,6 +29,7 @@ export default () => {
           runnerHelpUrl,
           runnerSettingsUrl,
           variablesSettingsUrl,
+          subscriptionsMoreMinutesUrl,
           endpoint,
           pagePath,
           logState,
diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js
index 332b6811af6..33e9a8e9d56 100644
--- a/app/assets/javascripts/pages/projects/project.js
+++ b/app/assets/javascripts/pages/projects/project.js
@@ -73,13 +73,6 @@ export default class Project {
         .remove();
       return e.preventDefault();
     });
-    $('.hide-shared-runner-limit-message').on('click', function(e) {
-      var $alert = $(this).parents('.shared-runner-quota-message');
-      var scope = $alert.data('scope');
-      Cookies.set('hide_shared_runner_quota_message', 'false', { path: scope });
-      $alert.remove();
-      e.preventDefault();
-    });
     $('.hide-auto-devops-implicitly-enabled-banner').on('click', function(e) {
       const projectId = $(this).data('project-id');
       const cookieKey = `hide_auto_devops_implicitly_enabled_banner_${projectId}`;
diff --git a/app/helpers/jobs_helper.rb b/app/helpers/jobs_helper.rb
new file mode 100644
index 00000000000..46edba261dd
--- /dev/null
+++ b/app/helpers/jobs_helper.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module JobsHelper
+  def jobs_data
+    {
+      "endpoint" => project_job_path(@project, @build, format: :json),
+      "project_path" => @project.full_path,
+      "deployment_help_url" => help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'),
+      "runner_help_url" => help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
+      "runner_settings_url" => project_runners_path(@build.project, anchor: 'js-runners-settings'),
+      "variables_settings_url" => project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
+      "page_path" => project_job_path(@project, @build),
+      "build_status" => @build.status,
+      "build_stage" => @build.stage,
+      "log_state" => '',
+      "build_options" => javascript_build_options
+    }
+  end
+end
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index 6bb27a65142..2e322c7db23 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -5,10 +5,4 @@
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag 'page_bundles/xterm'
 
-#js-job-vue-app{ data: { endpoint: project_job_path(@project, @build, format: :json), project_path: @project.full_path,
-  deployment_help_url: help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'),
-  runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
-  runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings'),
-  variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
-  page_path: project_job_path(@project, @build), build_status: @build.status, build_stage: @build.stage, log_state: '',
-  build_options: javascript_build_options } }
+#js-job-vue-app{ data: jobs_data }
diff --git a/spec/javascripts/jobs/components/job_app_spec.js b/spec/javascripts/jobs/components/job_app_spec.js
index d3c1cf831bb..57ab1aa73f7 100644
--- a/spec/javascripts/jobs/components/job_app_spec.js
+++ b/spec/javascripts/jobs/components/job_app_spec.js
@@ -25,6 +25,7 @@ describe('Job App ', () => {
     terminalPath: 'jobs/123/terminal',
     pagePath: `${gl.TEST_HOST}jobs/123`,
     projectPath: 'user-name/project-name',
+    subscriptionsMoreMinutesUrl: 'https://customers.gitlab.com/buy_pipeline_minutes',
     logState:
       'eyJvZmZzZXQiOjE3NDUxLCJuX29wZW5fdGFncyI6MCwiZmdfY29sb3IiOm51bGwsImJnX2NvbG9yIjpudWxsLCJzdHlsZV9tYXNrIjowfQ%3D%3D',
   };