Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

1 files changed, 56 insertions, 0 deletions

diff --git a/app/assets/javascripts/kubernetes_dashboard/graphql/helpers/resolver_helpers.js b/app/assets/javascripts/kubernetes_dashboard/graphql/helpers/resolver_helpers.js
index 47c2f543357..b9c195d83d0 100644
--- a/app/assets/javascripts/kubernetes_dashboard/graphql/helpers/resolver_helpers.js
+++ b/app/assets/javascripts/kubernetes_dashboard/graphql/helpers/resolver_helpers.js
@@ -43,6 +43,62 @@ export const mapSetItem = (item) => {
   return { status, metadata, spec };
 };
 
+export const mapJobItem = (item) => {
+  const metadata = {
+    ...item.metadata,
+    annotations: item.metadata?.annotations || {},
+    labels: item.metadata?.labels || {},
+  };
+
+  const status = {
+    failed: item.status?.failed || 0,
+    succeeded: item.status?.succeeded || 0,
+  };
+
+  return {
+    status,
+    metadata,
+    spec: item.spec,
+  };
+};
+
+export const mapServicesItems = (item) => {
+  const { type, clusterIP, externalIP, ports } = item.spec;
+
+  return {
+    metadata: {
+      ...item.metadata,
+      annotations: item.metadata?.annotations || {},
+      labels: item.metadata?.labels || {},
+    },
+    spec: {
+      type,
+      clusterIP: clusterIP || '-',
+      externalIP: externalIP || '-',
+      ports,
+    },
+  };
+};
+
+export const mapCronJobItem = (item) => {
+  const metadata = {
+    ...item.metadata,
+    annotations: item.metadata?.annotations || {},
+    labels: item.metadata?.labels || {},
+  };
+
+  const status = {
+    active: item.status?.active || 0,
+    lastScheduleTime: item.status?.lastScheduleTime || null,
+  };
+
+  return {
+    status,
+    metadata,
+    spec: item.spec,
+  };
+};
+
 export const watchWorkloadItems = ({
   client,
   query,