Merge pull request #192 from PRO-Robotech/feature/dev

table prepare wip

Author: typescreep

src/components/molecules/EnrichedTable/organisms/EnrichedTableProvider/EnrichedTableProvider.tsx

@@ -18,8 +18,13 @@ export type TEnrichedTableProviderProps = {
   dataItems: TJSON[]
   resourceSchema?: TJSON
 
-  isNamespaced?: boolean
-  isNamespacedLoading?: boolean
+  k8sResource?: {
+    resource: string
+    apiGroup?: string
+    apiVersion: string
+  }
+  // isNamespaced?: boolean
+  // isNamespacedLoading?: boolean
 
   dataForControls?: {
     cluster: string
@@ -61,8 +66,9 @@ export const EnrichedTableProvider: FC<TEnrichedTableProviderProps> = ({
   baseprefix,
   dataItems,
   resourceSchema,
-  isNamespaced,
-  isNamespacedLoading,
+  k8sResource,
+  // isNamespaced,
+  // isNamespacedLoading,
   dataForControls,
   dataForControlsInternal,
   customizationId,
@@ -103,7 +109,9 @@ export const EnrichedTableProvider: FC<TEnrichedTableProviderProps> = ({
       customizationId,
       tableMappingsReplaceValues,
       forceDefaultAdditionalPrinterColumns,
-      namespaceScopedWithoutNamespace: isNamespaced && !namespace,
+      namespace,
+      k8sResource,
+      // namespaceScopedWithoutNamespace: isNamespaced && !namespace,
     }
     axios
       .post<TPrepareTableRes>(`/api/clusters/${cluster}/openapi-bff/tables/tablePrepare/prepareTableProps`, payload)
@@ -122,17 +130,18 @@ export const EnrichedTableProvider: FC<TEnrichedTableProviderProps> = ({
     customizationId,
     tableMappingsReplaceValues,
     forceDefaultAdditionalPrinterColumns,
-    isNamespaced,
     namespace,
+    k8sResource,
+    // isNamespaced,
   ])
 
-  if (isNamespacedLoading) {
-    return (
-      <Flex justify="center">
-        <Spin />
-      </Flex>
-    )
-  }
+  // if (isNamespacedLoading) {
+  //   return (
+  //     <Flex justify="center">
+  //       <Spin />
+  //     </Flex>
+  //   )
+  // }
 
   if (!preparedProps && isLoading) {
     return (

src/localTypes/bff/table.ts

@@ -10,7 +10,13 @@ export type TPrepareTableReq = {
   customizationId?: string
   tableMappingsReplaceValues?: Record<string, string | undefined>
   forceDefaultAdditionalPrinterColumns?: TAdditionalPrinterColumns
-  namespaceScopedWithoutNamespace?: boolean
+  namespace?: string
+  k8sResource?: {
+    resource: string
+    apiGroup?: string
+    apiVersion: string
+  }
+  // namespaceScopedWithoutNamespace?: boolean
 }
 
 export type TPrepareTableRes = {