feat: add buildimage boolean to allopenshift/k8s query

uselagoon · Nov 8, 2023 · 0b0715f · 0b0715f
1 parent e09177d
commit 0b0715f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/services/api/src/resources/openshift/resolvers.ts b/services/api/src/resources/openshift/resolvers.ts
@@ -111,15 +111,21 @@ export const deleteOpenshift: ResolverFn = async (
 
 export const getAllOpenshifts: ResolverFn = async (
   root,
-  { disabled },
+  { disabled, buildImage },
   { sqlClientPool, hasPermission }
 ) => {
   await hasPermission('openshift', 'viewAll');
 
+  let queryBuilder = knex('openshift');
+  if (buildImage) {
+    queryBuilder = queryBuilder.and.whereNot('build_image', '');
+  }
+
   if (disabled != null) {
-    return query(sqlClientPool, knex('openshift').where('disabled', disabled).toString());
+    queryBuilder = queryBuilder.where('disabled', disabled);
   }
-  return query(sqlClientPool, knex('openshift').toString());
+
+  return query(sqlClientPool, queryBuilder.toString());
 };
 
 export const getOpenshiftByProjectId: ResolverFn = async (

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -1339,11 +1339,11 @@ const typeDefs = gql`
     """
     Returns all OpenShift Objects
     """
-    allOpenshifts(disabled: Boolean): [Openshift]
+    allOpenshifts(disabled: Boolean, buildImage: Boolean): [Openshift]
     """
     Returns all Kubernetes Objects
     """
-    allKubernetes(disabled: Boolean): [Kubernetes]
+    allKubernetes(disabled: Boolean, buildImage: Boolean): [Kubernetes]
     """
     Returns all Environments matching given filter (all if no filter defined)
     """