Add latest changes from gitlab-org/gitlab@master

2 files changed, 107 insertions, 108 deletions

diff --git a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
index accc9926a57..c2bb635e056 100644
--- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
+++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
@@ -38,7 +38,7 @@ import {
 } from '../runner_search_utils';
 import { captureException } from '../sentry_utils';
 
-const runnersCountSmartQuery = {
+const countSmartQuery = () => ({
   query: runnersAdminCountQuery,
   fetchPolicy: fetchPolicies.NETWORK_ONLY,
   update(data) {
@@ -47,6 +47,39 @@ const runnersCountSmartQuery = {
   error(error) {
     this.reportToSentry(error);
   },
+});
+
+const tabCountSmartQuery = ({ type }) => {
+  return {
+    ...countSmartQuery(),
+    variables() {
+      return {
+        ...this.countVariables,
+        type,
+      };
+    },
+  };
+};
+
+const statusCountSmartQuery = ({ status, name }) => {
+  return {
+    ...countSmartQuery(),
+    skip() {
+      // skip if filtering by status and not using _this_ status as filter
+      if (this.countVariables.status && this.countVariables.status !== status) {
+        // reset count for given status
+        this[name] = null;
+        return true;
+      }
+      return false;
+    },
+    variables() {
+      return {
+        ...this.countVariables,
+        status,
+      };
+    },
+  };
 };
 
 export default {
@@ -101,65 +134,30 @@ export default {
         this.reportToSentry(error);
       },
     },
+
+    // Tabs counts
     allRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: null,
-        };
-      },
+      ...tabCountSmartQuery({ type: null }),
     },
     instanceRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: INSTANCE_TYPE,
-        };
-      },
+      ...tabCountSmartQuery({ type: INSTANCE_TYPE }),
     },
     groupRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: GROUP_TYPE,
-        };
-      },
+      ...tabCountSmartQuery({ type: GROUP_TYPE }),
     },
     projectRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: PROJECT_TYPE,
-        };
-      },
+      ...tabCountSmartQuery({ type: PROJECT_TYPE }),
     },
+
+    // Runner stats
     onlineRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          status: STATUS_ONLINE,
-        };
-      },
+      ...statusCountSmartQuery({ status: STATUS_ONLINE, name: 'onlineRunnersTotal' }),
     },
     offlineRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          status: STATUS_OFFLINE,
-        };
-      },
+      ...statusCountSmartQuery({ status: STATUS_OFFLINE, name: 'offlineRunnersTotal' }),
     },
     staleRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          status: STATUS_STALE,
-        };
-      },
+      ...statusCountSmartQuery({ status: STATUS_STALE, name: 'staleRunnersTotal' }),
     },
   },
   computed: {
@@ -263,12 +261,6 @@ export default {
 </script>
 <template>
   <div>
-    <runner-stats
-      :online-runners-count="onlineRunnersTotal"
-      :offline-runners-count="offlineRunnersTotal"
-      :stale-runners-count="staleRunnersTotal"
-    />
-
     <div
       class="gl-display-flex gl-align-items-center gl-flex-direction-column-reverse gl-md-flex-direction-row gl-mt-3 gl-md-mt-0"
     >
@@ -300,6 +292,12 @@ export default {
       :namespace="$options.filteredSearchNamespace"
     />
 
+    <runner-stats
+      :online-runners-count="onlineRunnersTotal"
+      :offline-runners-count="offlineRunnersTotal"
+      :stale-runners-count="staleRunnersTotal"
+    />
+
     <div v-if="noRunnersFound" class="gl-text-center gl-p-5">
       {{ __('No runners found') }}
     </div>
diff --git a/app/assets/javascripts/runner/group_runners/group_runners_app.vue b/app/assets/javascripts/runner/group_runners/group_runners_app.vue
index b299d7c40fe..b5bd4b111fd 100644
--- a/app/assets/javascripts/runner/group_runners/group_runners_app.vue
+++ b/app/assets/javascripts/runner/group_runners/group_runners_app.vue
@@ -34,7 +34,7 @@ import {
 } from '../runner_search_utils';
 import { captureException } from '../sentry_utils';
 
-const runnersCountSmartQuery = {
+const countSmartQuery = () => ({
   query: groupRunnersCountQuery,
   fetchPolicy: fetchPolicies.NETWORK_ONLY,
   update(data) {
@@ -43,6 +43,39 @@ const runnersCountSmartQuery = {
   error(error) {
     this.reportToSentry(error);
   },
+});
+
+const tabCountSmartQuery = ({ type }) => {
+  return {
+    ...countSmartQuery(),
+    variables() {
+      return {
+        ...this.countVariables,
+        type,
+      };
+    },
+  };
+};
+
+const statusCountSmartQuery = ({ status, name }) => {
+  return {
+    ...countSmartQuery(),
+    skip() {
+      // skip if filtering by status and not using _this_ status as filter
+      if (this.countVariables.status && this.countVariables.status !== status) {
+        // reset count for given status
+        this[name] = null;
+        return true;
+      }
+      return false;
+    },
+    variables() {
+      return {
+        ...this.countVariables,
+        status,
+      };
+    },
+  };
 };
 
 export default {
@@ -116,59 +149,27 @@ export default {
         this.reportToSentry(error);
       },
     },
-    onlineRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          groupFullPath: this.groupFullPath,
-          status: STATUS_ONLINE,
-        };
-      },
-    },
-    offlineRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          groupFullPath: this.groupFullPath,
-          status: STATUS_OFFLINE,
-        };
-      },
-    },
-    staleRunnersTotal: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          groupFullPath: this.groupFullPath,
-          status: STATUS_STALE,
-        };
-      },
-    },
+
+    // Tabs counts
     allRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: null,
-        };
-      },
+      ...tabCountSmartQuery({ type: null }),
     },
     groupRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: GROUP_TYPE,
-        };
-      },
+      ...tabCountSmartQuery({ type: GROUP_TYPE }),
     },
     projectRunnersCount: {
-      ...runnersCountSmartQuery,
-      variables() {
-        return {
-          ...this.countVariables,
-          type: PROJECT_TYPE,
-        };
-      },
+      ...tabCountSmartQuery({ type: PROJECT_TYPE }),
+    },
+
+    // Runner status summary
+    onlineRunnersTotal: {
+      ...statusCountSmartQuery({ status: STATUS_ONLINE, name: 'onlineRunnersTotal' }),
+    },
+    offlineRunnersTotal: {
+      ...statusCountSmartQuery({ status: STATUS_OFFLINE, name: 'offlineRunnersTotal' }),
+    },
+    staleRunnersTotal: {
+      ...statusCountSmartQuery({ status: STATUS_STALE, name: 'staleRunnersTotal' }),
     },
   },
   computed: {
@@ -263,12 +264,6 @@ export default {
 
 <template>
   <div>
-    <runner-stats
-      :online-runners-count="onlineRunnersTotal"
-      :offline-runners-count="offlineRunnersTotal"
-      :stale-runners-count="staleRunnersTotal"
-    />
-
     <div class="gl-display-flex gl-align-items-center">
       <runner-type-tabs
         v-model="search"
@@ -298,6 +293,12 @@ export default {
       :namespace="filteredSearchNamespace"
     />
 
+    <runner-stats
+      :online-runners-count="onlineRunnersTotal"
+      :offline-runners-count="offlineRunnersTotal"
+      :stale-runners-count="staleRunnersTotal"
+    />
+
     <div v-if="noRunnersFound" class="gl-text-center gl-p-5">
       {{ __('No runners found') }}
     </div>