Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/environments/graphql/resolvers.js b/app/assets/javascripts/environments/graphql/resolvers.js
index 722bb78bcf9..afd56d0cf0d 100644
--- a/app/assets/javascripts/environments/graphql/resolvers.js
+++ b/app/assets/javascripts/environments/graphql/resolvers.js
@@ -30,8 +30,8 @@ const mapEnvironment = (env) => ({
 
 export const resolvers = (endpoint) => ({
   Query: {
-    environmentApp(_context, { page, scope }, { cache }) {
-      return axios.get(endpoint, { params: { nested: true, page, scope } }).then((res) => {
+    environmentApp(_context, { page, scope, search }, { cache }) {
+      return axios.get(endpoint, { params: { nested: true, page, scope, search } }).then((res) => {
         const headers = normalizeHeaders(res.headers);
         const interval = headers['POLL-INTERVAL'];
         const pageInfo = { ...parseIntPagination(headers), __typename: 'LocalPageInfo' };
@@ -59,8 +59,8 @@ export const resolvers = (endpoint) => ({
         };
       });
     },
-    folder(_, { environment: { folderPath }, scope }) {
-      return axios.get(folderPath, { params: { scope, per_page: 3 } }).then((res) => ({
+    folder(_, { environment: { folderPath }, scope, search }) {
+      return axios.get(folderPath, { params: { scope, search, per_page: 3 } }).then((res) => ({
         availableCount: res.data.available_count,
         environments: res.data.environments.map(mapEnvironment),
         stoppedCount: res.data.stopped_count,