Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 32 deletions

diff --git a/app/assets/javascripts/runner/group_runner_show/group_runner_show_app.vue b/app/assets/javascripts/runner/group_runner_show/group_runner_show_app.vue
index c336e091fdf..ce5033d23f3 100644
--- a/app/assets/javascripts/runner/group_runner_show/group_runner_show_app.vue
+++ b/app/assets/javascripts/runner/group_runner_show/group_runner_show_app.vue
@@ -1,16 +1,13 @@
 <script>
-import { GlBadge, GlTab, GlTooltipDirective } from '@gitlab/ui';
 import { createAlert, VARIANT_SUCCESS } from '~/flash';
 import { TYPE_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { redirectTo } from '~/lib/utils/url_utility';
-import { formatJobCount } from '../utils';
 import RunnerDeleteButton from '../components/runner_delete_button.vue';
 import RunnerEditButton from '../components/runner_edit_button.vue';
 import RunnerPauseButton from '../components/runner_pause_button.vue';
 import RunnerHeader from '../components/runner_header.vue';
 import RunnerDetails from '../components/runner_details.vue';
-import RunnerJobs from '../components/runner_jobs.vue';
 import { I18N_FETCH_ERROR } from '../constants';
 import runnerQuery from '../graphql/show/runner.query.graphql';
 import { captureException } from '../sentry_utils';
@@ -19,17 +16,11 @@ import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_lo
 export default {
   name: 'GroupRunnerShowApp',
   components: {
-    GlBadge,
-    GlTab,
     RunnerDeleteButton,
     RunnerEditButton,
     RunnerPauseButton,
     RunnerHeader,
     RunnerDetails,
-    RunnerJobs,
-  },
-  directives: {
-    GlTooltip: GlTooltipDirective,
   },
   props: {
     runnerId: {
@@ -40,6 +31,11 @@ export default {
       type: String,
       required: true,
     },
+    editGroupRunnerPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
   },
   data() {
     return {
@@ -68,9 +64,6 @@ export default {
     canDelete() {
       return this.runner.userPermissions?.deleteRunner;
     },
-    jobCount() {
-      return formatJobCount(this.runner?.jobCount);
-    },
   },
   errorCaptured(error) {
     this.reportToSentry(error);
@@ -90,25 +83,12 @@ export default {
   <div>
     <runner-header v-if="runner" :runner="runner">
       <template #actions>
-        <runner-edit-button v-if="canUpdate && runner.editAdminUrl" :href="runner.editAdminUrl" />
+        <runner-edit-button v-if="canUpdate && editGroupRunnerPath" :href="editGroupRunnerPath" />
         <runner-pause-button v-if="canUpdate" :runner="runner" />
         <runner-delete-button v-if="canDelete" :runner="runner" @deleted="onDeleted" />
       </template>
     </runner-header>
 
-    <runner-details :runner="runner">
-      <template #jobs-tab>
-        <gl-tab>
-          <template #title>
-            {{ s__('Runners|Jobs') }}
-            <gl-badge v-if="jobCount" data-testid="job-count-badge" class="gl-ml-1" size="sm">
-              {{ jobCount }}
-            </gl-badge>
-          </template>
-
-          <runner-jobs v-if="runner" :runner="runner" />
-        </gl-tab>
-      </template>
-    </runner-details>
+    <runner-details :runner="runner" />
   </div>
 </template>
diff --git a/app/assets/javascripts/runner/group_runner_show/index.js b/app/assets/javascripts/runner/group_runner_show/index.js
index d1b87c8e427..62a0dab9211 100644
--- a/app/assets/javascripts/runner/group_runner_show/index.js
+++ b/app/assets/javascripts/runner/group_runner_show/index.js
@@ -1,21 +1,18 @@
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
-import { showAlertFromLocalStorage } from '../local_storage_alert/show_alert_from_local_storage';
 import GroupRunnerShowApp from './group_runner_show_app.vue';
 
 Vue.use(VueApollo);
 
-export const initAdminRunnerShow = (selector = '#js-group-runner-show') => {
-  showAlertFromLocalStorage();
-
+export const initGroupRunnerShow = (selector = '#js-group-runner-show') => {
   const el = document.querySelector(selector);
 
   if (!el) {
     return null;
   }
 
-  const { runnerId, runnersPath } = el.dataset;
+  const { runnerId, runnersPath, editGroupRunnerPath } = el.dataset;
 
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(),
@@ -29,6 +26,7 @@ export const initAdminRunnerShow = (selector = '#js-group-runner-show') => {
         props: {
           runnerId,
           runnersPath,
+          editGroupRunnerPath,
         },
       });
     },