Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 15 deletions

diff --git a/app/assets/javascripts/clusters/agents/components/create_token_modal.vue b/app/assets/javascripts/clusters/agents/components/create_token_modal.vue
index 451e1ee1d67..d2e5e484502 100644
--- a/app/assets/javascripts/clusters/agents/components/create_token_modal.vue
+++ b/app/assets/javascripts/clusters/agents/components/create_token_modal.vue
@@ -9,7 +9,6 @@ import {
   EVENT_ACTIONS_OPEN,
   EVENT_ACTIONS_CLICK,
   TOKEN_NAME_LIMIT,
-  TOKEN_STATUS_ACTIVE,
 } from '../constants';
 import createNewAgentToken from '../graphql/mutations/create_new_agent_token.mutation.graphql';
 import getClusterAgentQuery from '../graphql/queries/get_cluster_agent.query.graphql';
@@ -66,7 +65,6 @@ export default {
       variables: {
         agentName: this.agentName,
         projectPath: this.projectPath,
-        tokenStatus: TOKEN_STATUS_ACTIVE,
         ...this.cursor,
       },
     };
diff --git a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
index 697162b50ae..c2c7beffae7 100644
--- a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
+++ b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
@@ -9,7 +9,7 @@ import {
   GlSprintf,
 } from '@gitlab/ui';
 import { s__, __, sprintf } from '~/locale';
-import { REVOKE_TOKEN_MODAL_ID, TOKEN_STATUS_ACTIVE } from '../constants';
+import { REVOKE_TOKEN_MODAL_ID } from '../constants';
 import revokeAgentToken from '../graphql/mutations/revoke_token.mutation.graphql';
 import getClusterAgentQuery from '../graphql/queries/get_cluster_agent.query.graphql';
 import { removeTokenFromStore } from '../graphql/cache_update';
@@ -61,7 +61,6 @@ export default {
       variables: {
         agentName: this.agentName,
         projectPath: this.projectPath,
-        tokenStatus: TOKEN_STATUS_ACTIVE,
         ...this.cursor,
       },
     };
diff --git a/app/assets/javascripts/clusters/agents/components/show.vue b/app/assets/javascripts/clusters/agents/components/show.vue
index f1bd36b4a63..d740d1c8865 100644
--- a/app/assets/javascripts/clusters/agents/components/show.vue
+++ b/app/assets/javascripts/clusters/agents/components/show.vue
@@ -10,7 +10,7 @@ import {
 } from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import { MAX_LIST_COUNT, TOKEN_STATUS_ACTIVE } from '../constants';
+import { MAX_LIST_COUNT } from '../constants';
 import getClusterAgentQuery from '../graphql/queries/get_cluster_agent.query.graphql';
 import TokenTable from './token_table.vue';
 import ActivityEvents from './activity_events_list.vue';
@@ -31,7 +31,6 @@ export default {
         return {
           agentName: this.agentName,
           projectPath: this.projectPath,
-          tokenStatus: TOKEN_STATUS_ACTIVE,
           ...this.cursor,
         };
       },
diff --git a/app/assets/javascripts/clusters/agents/constants.js b/app/assets/javascripts/clusters/agents/constants.js
index e97d6500260..8eff9a152b2 100644
--- a/app/assets/javascripts/clusters/agents/constants.js
+++ b/app/assets/javascripts/clusters/agents/constants.js
@@ -37,7 +37,6 @@ export const EVENT_DETAILS = {
 };
 
 export const DEFAULT_ICON = 'token';
-export const TOKEN_STATUS_ACTIVE = 'ACTIVE';
 
 export const CREATE_TOKEN_MODAL = 'create-token';
 export const EVENT_LABEL_MODAL = 'agent_token_creation_modal';
diff --git a/app/assets/javascripts/clusters/agents/graphql/queries/get_cluster_agent.query.graphql b/app/assets/javascripts/clusters/agents/graphql/queries/get_cluster_agent.query.graphql
index d7a8e447071..7be524f92c4 100644
--- a/app/assets/javascripts/clusters/agents/graphql/queries/get_cluster_agent.query.graphql
+++ b/app/assets/javascripts/clusters/agents/graphql/queries/get_cluster_agent.query.graphql
@@ -4,7 +4,6 @@
 query getClusterAgent(
   $projectPath: ID!
   $agentName: String!
-  $tokenStatus: AgentTokenStatus!
   $first: Int
   $last: Int
   $afterToken: String
@@ -21,13 +20,7 @@ query getClusterAgent(
         name
       }
 
-      tokens(
-        status: $tokenStatus
-        first: $first
-        last: $last
-        before: $beforeToken
-        after: $afterToken
-      ) {
+      tokens(first: $first, last: $last, before: $beforeToken, after: $afterToken) {
         count
 
         nodes {