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

typescreep · web-flow · commit e97459386f30 · 2025-11-01T19:03:53.000+03:00
new field selector/rename props in tables and events
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prorobotech/openapi-k8s-toolkit",
-  "version": "0.0.1-alpha.153",
+  "version": "0.0.1-alpha.154",
   "description": "ProRobotech OpenAPI k8s tools",
   "main": "dist/openapi-k8s-toolkit.cjs.js",
   "module": "dist/openapi-k8s-toolkit.es.js",
diff --git a/src/components/organisms/DynamicComponents/molecules/EnrichedTable/EnrichedTable.tsx b/src/components/organisms/DynamicComponents/molecules/EnrichedTable/EnrichedTable.tsx
@@ -17,7 +17,7 @@ import { useMultiQuery } from '../../../DynamicRendererWithProviders/multiQueryP
 import { usePartsOfUrl } from '../../../DynamicRendererWithProviders/partsOfUrlContext'
 import { useTheme } from '../../../DynamicRendererWithProviders/themeContext'
 import { parseAll } from '../utils'
-import { serializeLabels } from './utils'
+import { serializeLabelsWithNoEncoding } from './utils'
 
 export const EnrichedTable: FC<{ data: TDynamicComponentsAppTypeMap['EnrichedTable']; children?: any }> = ({
   data,
@@ -43,8 +43,8 @@ export const EnrichedTable: FC<{ data: TDynamicComponentsAppTypeMap['EnrichedTab
     fetchUrl,
     pathToItems,
     clusterNamePartOfUrl,
-    labelsSelector,
-    labelsSelectorFull,
+    labelSelector,
+    labelSelectorFull,
     fieldSelector,
     namespace,
     k8sResource,
@@ -108,48 +108,52 @@ export const EnrichedTable: FC<{ data: TDynamicComponentsAppTypeMap['EnrichedTab
 
   const fetchUrlPrepared = parseAll({ text: fetchUrl, replaceValues, multiQueryData })
 
-  let labelsSuffix: string | undefined
-  if (labelsSelector) {
+  const sParams = new URLSearchParams()
+
+  if (labelSelector && Object.keys(labelSelector).length > 0) {
     const parsedObject: Record<string, string> = Object.fromEntries(
-      Object.entries(labelsSelector).map(
-        ([key, value]) => [key, parseAll({ text: value, replaceValues, multiQueryData })] as [string, string],
+      Object.entries(labelSelector).map(
+        ([k, v]) => [k, parseAll({ text: v, replaceValues, multiQueryData })] as [string, string],
       ),
     )
-    const serializedLabels = serializeLabels(parsedObject)
-    labelsSuffix = serializeLabels.length > 0 ? `?labelSelector=${serializedLabels}` : undefined
+    const serializedLabels = serializeLabelsWithNoEncoding(parsedObject)
+    if (serializedLabels.length > 0) sParams.set('labelSelector', serializedLabels)
   }
 
-  if (labelsSelectorFull) {
-    const value = Array.isArray(labelsSelectorFull.pathToLabels)
-      ? _.get(multiQueryData[`req${labelsSelectorFull.reqIndex}`], labelsSelectorFull.pathToLabels)
-      : jp.query(multiQueryData[`req${labelsSelectorFull.reqIndex}`], `$${labelsSelectorFull.pathToLabels}`)[0]
-    const serializedLabels = serializeLabels(value)
-    labelsSuffix = serializeLabels.length > 0 ? `?labelSelector=${serializedLabels}` : undefined
+  if (labelSelectorFull) {
+    const root = multiQueryData[`req${labelSelectorFull.reqIndex}`]
+    const value = Array.isArray(labelSelectorFull.pathToLabels)
+      ? _.get(root, labelSelectorFull.pathToLabels)
+      : jp.query(root, `$${labelSelectorFull.pathToLabels}`)[0]
+
+    const serializedLabels = serializeLabelsWithNoEncoding(value)
+    if (serializedLabels.length > 0) sParams.set('labelSelector', serializedLabels)
   }
 
-  let fieldSelectorSuffix: string | undefined
   if (fieldSelector) {
-    const preparedFieldSelectorValueText = parseAll({ text: fieldSelector?.parsedText, replaceValues, multiQueryData })
-
-    const preparedFieldSelectorValueTextWithPartsOfUrl = prepareTemplate({
-      template: preparedFieldSelectorValueText,
-      replaceValues,
-    })
-
-    const preparedSelector = encodeURIComponent(
-      `${fieldSelector.fieldName}=${preparedFieldSelectorValueTextWithPartsOfUrl}`,
+    const parsedObject: Record<string, string> = Object.fromEntries(
+      Object.entries(fieldSelector).map(
+        ([k, v]) =>
+          [
+            parseAll({ text: k, replaceValues, multiQueryData }),
+            parseAll({ text: v, replaceValues, multiQueryData }),
+          ] as [string, string],
+      ),
     )
-    const prefix = labelsSelector ? '&fieldSelector=' : '?fieldSelector='
-    fieldSelectorSuffix = `${prefix}${preparedSelector}`
+    const serializedFields = serializeLabelsWithNoEncoding(parsedObject)
+
+    if (serializedFields.length > 0) sParams.set('fieldSelector', serializedFields)
   }
 
+  const searchParams = sParams.toString()
+
   const {
     data: fetchedData,
     isLoading: isFetchedDataLoading,
     error: fetchedDataError,
   } = useDirectUnknownResource<unknown>({
-    uri: `${fetchUrlPrepared}${labelsSuffix || ''}${fieldSelectorSuffix || ''}`,
-    queryKey: [`${fetchUrlPrepared}${labelsSuffix || ''}${fieldSelectorSuffix || ''}`],
+    uri: `${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ''}`,
+    queryKey: [`${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ''}`],
     isEnabled: !isMultiqueryLoading,
   })
 
diff --git a/src/components/organisms/DynamicComponents/molecules/EnrichedTable/utils.ts b/src/components/organisms/DynamicComponents/molecules/EnrichedTable/utils.ts
@@ -19,3 +19,25 @@ export const serializeLabels = (input: unknown): string => {
   // 3+4. Build "k=v" pairs, join with commas, then URL‑encode
   return encodeURIComponent(entries.map(([k, v]) => `${k}=${v}`).join(','))
 }
+
+export const serializeLabelsWithNoEncoding = (input: unknown): string => {
+  // 1. Must be a non-null plain object
+  if (
+    typeof input !== 'object' ||
+    input === null ||
+    Array.isArray(input) ||
+    Object.getPrototypeOf(input) !== Object.prototype
+  ) {
+    return 'Expected a plain object'
+  }
+
+  const entries = Object.entries(input)
+
+  // 2. Validate all values are string|number
+  if (!entries.map(([, v]) => v).every(v => typeof v === 'string' || typeof v === 'number')) {
+    return 'All values must be string or number'
+  }
+
+  // 3+4. Build "k=v" pairs, join with commas
+  return entries.map(([k, v]) => `${k}=${v}`).join(',')
+}
diff --git a/src/components/organisms/DynamicComponents/molecules/Events/Events.tsx b/src/components/organisms/DynamicComponents/molecules/Events/Events.tsx
@@ -27,8 +27,8 @@ export const Events: FC<{ data: TDynamicComponentsAppTypeMap['Events']; children
     pageSize,
     substractHeight,
     limit,
-    labelsSelector,
-    labelsSelectorFull,
+    labelSelector,
+    labelSelectorFull,
     fieldSelector,
     baseFactoryNamespacedAPIKey,
     baseFactoryClusterSceopedAPIKey,
@@ -59,35 +59,39 @@ export const Events: FC<{ data: TDynamicComponentsAppTypeMap['Events']; children
     params.set('limit', limit.toString())
   }
 
-  if (labelsSelector && Object.keys(labelsSelector).length > 0) {
+  if (labelSelector && Object.keys(labelSelector).length > 0) {
     const parsedObject: Record<string, string> = Object.fromEntries(
-      Object.entries(labelsSelector).map(
+      Object.entries(labelSelector).map(
         ([k, v]) => [k, parseAll({ text: v, replaceValues, multiQueryData })] as [string, string],
       ),
     )
     const serializedLabels = serializeLabelsWithNoEncoding(parsedObject)
     if (serializedLabels.length > 0) params.set('labelSelector', serializedLabels)
   }
 
-  if (labelsSelectorFull) {
-    const root = multiQueryData[`req${labelsSelectorFull.reqIndex}`]
-    const value = Array.isArray(labelsSelectorFull.pathToLabels)
-      ? _.get(root, labelsSelectorFull.pathToLabels)
-      : jp.query(root, `$${labelsSelectorFull.pathToLabels}`)[0]
+  if (labelSelectorFull) {
+    const root = multiQueryData[`req${labelSelectorFull.reqIndex}`]
+    const value = Array.isArray(labelSelectorFull.pathToLabels)
+      ? _.get(root, labelSelectorFull.pathToLabels)
+      : jp.query(root, `$${labelSelectorFull.pathToLabels}`)[0]
 
     const serializedLabels = serializeLabelsWithNoEncoding(value)
     if (serializedLabels.length > 0) params.set('labelSelector', serializedLabels)
   }
 
   if (fieldSelector) {
-    const preparedFieldSelectorValueText = parseAll({ text: fieldSelector?.parsedText, replaceValues, multiQueryData })
-
-    const preparedFieldSelectorValueTextWithPartsOfUrl = prepareTemplate({
-      template: preparedFieldSelectorValueText,
-      replaceValues,
-    })
+    const parsedObject: Record<string, string> = Object.fromEntries(
+      Object.entries(fieldSelector).map(
+        ([k, v]) =>
+          [
+            parseAll({ text: k, replaceValues, multiQueryData }),
+            parseAll({ text: v, replaceValues, multiQueryData }),
+          ] as [string, string],
+      ),
+    )
+    const serializedFields = serializeLabelsWithNoEncoding(parsedObject)
 
-    params.set('fieldSelector', `${fieldSelector.fieldName}=${preparedFieldSelectorValueTextWithPartsOfUrl}`)
+    if (serializedFields.length > 0) params.set('fieldSelector', serializedFields)
   }
 
   const searchParams = params.toString()
diff --git a/src/components/organisms/DynamicComponents/types.ts b/src/components/organisms/DynamicComponents/types.ts
@@ -72,15 +72,12 @@ export type TDynamicComponentsAppTypeMap = {
     fetchUrl: string
     pathToItems: string | string[] // jsonpath or keys as string[]
     clusterNamePartOfUrl: string
-    labelsSelector?: Record<string, string>
-    labelsSelectorFull?: {
+    labelSelector?: Record<string, string>
+    labelSelectorFull?: {
       reqIndex: number
       pathToLabels: string | string[] // jsonpath or keys as string[]
     }
-    fieldSelector?: {
-      fieldName: string
-      parsedText: string
-    }
+    fieldSelector?: Record<string, string>
   } & Omit<
     TEnrichedTableProviderProps,
     | 'tableMappingsReplaceValues'
@@ -288,15 +285,12 @@ export type TDynamicComponentsAppTypeMap = {
     pageSize?: number
     substractHeight?: number
     limit?: number
-    labelsSelector?: Record<string, string>
-    labelsSelectorFull?: {
+    labelSelector?: Record<string, string>
+    labelSelectorFull?: {
       reqIndex: number
       pathToLabels: string | string[] // jsonpath or keys as string[]
     }
-    fieldSelector?: {
-      fieldName: string
-      parsedText: string
-    }
+    fieldSelector?: Record<string, string>
     baseFactoryNamespacedAPIKey: string
     baseFactoryClusterSceopedAPIKey: string
     baseFactoryNamespacedBuiltinKey: string

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prorobotech/openapi-k8s-toolkit",`
`3`		`- "version": "0.0.1-alpha.153",`
	`3`	`+ "version": "0.0.1-alpha.154",`
`4`	`4`	`"description": "ProRobotech OpenAPI k8s tools",`
`5`	`5`	`"main": "dist/openapi-k8s-toolkit.cjs.js",`
`6`	`6`	`"module": "dist/openapi-k8s-toolkit.es.js",`