Add latest changes from gitlab-org/gitlab@master

5 files changed, 8 insertions, 18 deletions

diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index 4e8b75536a4..8de0e0266c5 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -4,9 +4,9 @@ import { debounce } from 'lodash';
 import { s__, __, sprintf } from '~/locale';
 import { updateHistory, setUrlParams, queryToObject } from '~/lib/utils/url_utility';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
+import pageInfoQuery from '~/graphql_shared/client/page_info.query.graphql';
 import environmentAppQuery from '../graphql/queries/environment_app.query.graphql';
 import pollIntervalQuery from '../graphql/queries/poll_interval.query.graphql';
-import pageInfoQuery from '../graphql/queries/page_info.query.graphql';
 import environmentToDeleteQuery from '../graphql/queries/environment_to_delete.query.graphql';
 import environmentToRollbackQuery from '../graphql/queries/environment_to_rollback.query.graphql';
 import environmentToStopQuery from '../graphql/queries/environment_to_stop.query.graphql';
@@ -56,6 +56,9 @@ export default {
     },
     pageInfo: {
       query: pageInfoQuery,
+      variables() {
+        return { page: this.page };
+      },
     },
     environmentToDelete: {
       query: environmentToDeleteQuery,
diff --git a/app/assets/javascripts/environments/graphql/client.js b/app/assets/javascripts/environments/graphql/client.js
index 8f57069d89d..0eb12427914 100644
--- a/app/assets/javascripts/environments/graphql/client.js
+++ b/app/assets/javascripts/environments/graphql/client.js
@@ -1,7 +1,7 @@
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
+import pageInfoQuery from '~/graphql_shared/client/page_info.query.graphql';
 import environmentApp from './queries/environment_app.query.graphql';
-import pageInfoQuery from './queries/page_info.query.graphql';
 import environmentToDeleteQuery from './queries/environment_to_delete.query.graphql';
 import environmentToRollbackQuery from './queries/environment_to_rollback.query.graphql';
 import environmentToStopQuery from './queries/environment_to_stop.query.graphql';
diff --git a/app/assets/javascripts/environments/graphql/queries/page_info.query.graphql b/app/assets/javascripts/environments/graphql/queries/page_info.query.graphql
deleted file mode 100644
index d77ca05d46f..00000000000
--- a/app/assets/javascripts/environments/graphql/queries/page_info.query.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query getPageInfo {
-  pageInfo @client {
-    total
-    perPage
-    nextPage
-    previousPage
-  }
-}
diff --git a/app/assets/javascripts/environments/graphql/resolvers/base.js b/app/assets/javascripts/environments/graphql/resolvers/base.js
index c9f9a2da13a..7d2a0689da2 100644
--- a/app/assets/javascripts/environments/graphql/resolvers/base.js
+++ b/app/assets/javascripts/environments/graphql/resolvers/base.js
@@ -6,13 +6,13 @@ import {
   normalizeHeaders,
 } from '~/lib/utils/common_utils';
 
+import pageInfoQuery from '~/graphql_shared/client/page_info.query.graphql';
 import pollIntervalQuery from '../queries/poll_interval.query.graphql';
 import environmentToRollbackQuery from '../queries/environment_to_rollback.query.graphql';
 import environmentToStopQuery from '../queries/environment_to_stop.query.graphql';
 import environmentToDeleteQuery from '../queries/environment_to_delete.query.graphql';
 import environmentToChangeCanaryQuery from '../queries/environment_to_change_canary.query.graphql';
 import isEnvironmentStoppingQuery from '../queries/is_environment_stopping.query.graphql';
-import pageInfoQuery from '../queries/page_info.query.graphql';
 
 const buildErrors = (errors = []) => ({
   errors,
diff --git a/app/assets/javascripts/environments/graphql/typedefs.graphql b/app/assets/javascripts/environments/graphql/typedefs.graphql
index 24898c2cadb..a235e387930 100644
--- a/app/assets/javascripts/environments/graphql/typedefs.graphql
+++ b/app/assets/javascripts/environments/graphql/typedefs.graphql
@@ -1,3 +1,5 @@
+#import "~/graphql_shared/client/page_info.typedefs.graphql"
+
 type LocalEnvironment {
   id: Int!
   globalId: ID!
@@ -55,13 +57,6 @@ type LocalErrors {
   errors: [String!]!
 }
 
-type LocalPageInfo {
-  total: Int!
-  perPage: Int!
-  nextPage: Int!
-  previousPage: Int!
-}
-
 type k8sPodStatus {
   phase: String
 }