Merge pull request #300 from red-hat-data-services/main

Last min sync for 1.34

frontend/src/k8sTypes.ts

@@ -758,3 +758,14 @@ export type AcceleratorKind = K8sResourceCommon & {
     tolerations?: PodToleration[];
   };
 };
+
+// In the SDK TResource extends from K8sResourceCommon, but both kind and apiVersion are mandatory
+export type K8sResourceListResult<TResource extends Partial<K8sResourceCommon>> = {
+  apiVersion: string;
+  kind: string;
+  items: TResource[];
+  metadata: {
+    resourceVersion: string;
+    continue: string;
+  };
+};

frontend/src/pages/modelServing/customServingRuntimes/CustomServingRuntimeTableRow.tsx

@@ -35,7 +35,7 @@ const CustomServingRuntimeTableRow: React.FC<CustomServingRuntimeTableRowProps>
         }}
       />
       <Td dataLabel="Name" width={70} className="pf-u-text-break-word">
-        <ResourceNameTooltip resource={template.objects[0]}>
+        <ResourceNameTooltip resource={template}>
           {getServingRuntimeDisplayNameFromTemplate(template)}
         </ResourceNameTooltip>
         {templateOOTB && <Label>Pre-installed</Label>}

frontend/src/services/templateService.ts

@@ -3,14 +3,15 @@ import axios from 'axios';
 import YAML from 'yaml';
 import { assembleServingRuntimeTemplate } from '~/api';
 import { ServingRuntimeKind, TemplateKind } from '~/k8sTypes';
+import { addTypesToK8sListedResources } from '~/utilities/addTypesToK8sListedResources';
 
 export const listTemplatesBackend = async (
   namespace?: string,
   labelSelector?: string,
 ): Promise<TemplateKind[]> =>
   axios
     .get(`/api/templates/${namespace}`, { params: { labelSelector } })
-    .then((response) => response.data.items)
+    .then((response) => addTypesToK8sListedResources<TemplateKind>(response.data, 'Template').items)
     .catch((e) => Promise.reject(e));
 
 const dryRunServingRuntimeForTemplateCreationBackend = (

frontend/src/types.ts

@@ -289,7 +289,7 @@ type K8sMetadata = {
 /**
  * @deprecated -- use the SDK version -- see k8sTypes.ts
  * All references that use this are un-vetted data against existing types, should be converted over
- * to the new K8sResourceCommon from the SDK to keep everythung unified on one front.
+ * to the new K8sResourceCommon from the SDK to keep everything unified on one front.
  */
 export type K8sResourceCommon = {
   apiVersion?: string;

frontend/src/utilities/__tests__/addTypesToK8sListedResources.spec.ts

@@ -0,0 +1,36 @@
+import { K8sResourceCommon } from '@openshift/dynamic-plugin-sdk-utils';
+import { addTypesToK8sListedResources } from '~/utilities/addTypesToK8sListedResources';
+
+const servingRuntimeTemplate = {
+  apiVersion: 'template.openshift.io/v1',
+  kind: 'TemplateList',
+  items: [
+    {
+      metadata: {
+        name: 'test-model',
+        annotations: {
+          'openshift.io/display-name': 'New OVMS Server',
+        },
+        labels: {
+          'opendatahub.io/dashboard': 'true',
+        },
+      },
+    },
+  ],
+  metadata: {
+    resourceVersion: '24348645',
+    continue: '',
+  },
+};
+
+describe('addTypesToK8sListedResources', () => {
+  it('should have apiVersion and kind as Template', () => {
+    const list = addTypesToK8sListedResources(servingRuntimeTemplate, 'Template');
+    expect(list).not.toBe(servingRuntimeTemplate);
+    expect(list.items).toHaveLength(servingRuntimeTemplate.items.length);
+    list.items.forEach((i: Partial<K8sResourceCommon>) => {
+      expect(i.apiVersion).toBe('template.openshift.io/v1');
+      expect(i.kind).toBe('Template');
+    });
+  });
+});

frontend/src/utilities/addTypesToK8sListedResources.ts

@@ -0,0 +1,14 @@
+import { K8sResourceCommon } from '@openshift/dynamic-plugin-sdk-utils';
+import { K8sResourceListResult } from '~/k8sTypes';
+
+export const addTypesToK8sListedResources = <TResource extends Partial<K8sResourceCommon>>(
+  response: K8sResourceListResult<TResource>,
+  kind: string,
+): K8sResourceListResult<TResource> => ({
+  ...response,
+  items: response.items.map((i) => ({
+    ...i,
+    apiVersion: response.apiVersion,
+    kind,
+  })),
+});