@prorobotech/openapi-k8s-toolkit 0.0.1-alpha.153 → 0.0.1-alpha.154

package/dist/openapi-k8s-toolkit.es.js

@@ -33550,7 +33550,7 @@ const useTheme = () => {
   return useContext(ThemeContext);
 };
 
-const serializeLabels = (input) => {
+const serializeLabelsWithNoEncoding$1 = (input) => {
   if (typeof input !== "object" || input === null || Array.isArray(input) || Object.getPrototypeOf(input) !== Object.prototype) {
     return "Expected a plain object";
   }
@@ -33558,7 +33558,7 @@ const serializeLabels = (input) => {
   if (!entries.map(([, v]) => v).every((v) => typeof v === "string" || typeof v === "number")) {
     return "All values must be string or number";
   }
-  return encodeURIComponent(entries.map(([k, v]) => `${k}=${v}`).join(","));
+  return entries.map(([k, v]) => `${k}=${v}`).join(",");
 };
 
 const EnrichedTable$1 = ({
@@ -33582,8 +33582,8 @@ const EnrichedTable$1 = ({
     fetchUrl,
     pathToItems,
     clusterNamePartOfUrl,
-    labelsSelector,
-    labelsSelectorFull,
+    labelSelector,
+    labelSelectorFull,
     fieldSelector,
     namespace,
     k8sResource,
@@ -33624,41 +33624,42 @@ const EnrichedTable$1 = ({
     refetchInterval: false
   });
   const fetchUrlPrepared = parseAll({ text: fetchUrl, replaceValues, multiQueryData });
-  let labelsSuffix;
-  if (labelsSelector) {
+  const sParams = new URLSearchParams();
+  if (labelSelector && Object.keys(labelSelector).length > 0) {
     const parsedObject = Object.fromEntries(
-      Object.entries(labelsSelector).map(
-        ([key, value]) => [key, parseAll({ text: value, replaceValues, multiQueryData })]
+      Object.entries(labelSelector).map(
+        ([k, v]) => [k, parseAll({ text: v, replaceValues, multiQueryData })]
       )
     );
-    const serializedLabels = serializeLabels(parsedObject);
-    labelsSuffix = serializeLabels.length > 0 ? `?labelSelector=${serializedLabels}` : void 0;
+    const serializedLabels = serializeLabelsWithNoEncoding$1(parsedObject);
+    if (serializedLabels.length > 0) sParams.set("labelSelector", serializedLabels);
   }
-  if (labelsSelectorFull) {
-    const value = Array.isArray(labelsSelectorFull.pathToLabels) ? _$1.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}` : void 0;
+  if (labelSelectorFull) {
+    const root = multiQueryData[`req${labelSelectorFull.reqIndex}`];
+    const value = Array.isArray(labelSelectorFull.pathToLabels) ? _$1.get(root, labelSelectorFull.pathToLabels) : jp.query(root, `$${labelSelectorFull.pathToLabels}`)[0];
+    const serializedLabels = serializeLabelsWithNoEncoding$1(value);
+    if (serializedLabels.length > 0) sParams.set("labelSelector", serializedLabels);
   }
-  let fieldSelectorSuffix;
   if (fieldSelector) {
-    const preparedFieldSelectorValueText = parseAll({ text: fieldSelector?.parsedText, replaceValues, multiQueryData });
-    const preparedFieldSelectorValueTextWithPartsOfUrl = prepareTemplate({
-      template: preparedFieldSelectorValueText,
-      replaceValues
-    });
-    const preparedSelector = encodeURIComponent(
-      `${fieldSelector.fieldName}=${preparedFieldSelectorValueTextWithPartsOfUrl}`
+    const parsedObject = Object.fromEntries(
+      Object.entries(fieldSelector).map(
+        ([k, v]) => [
+          parseAll({ text: k, replaceValues, multiQueryData }),
+          parseAll({ text: v, replaceValues, multiQueryData })
+        ]
+      )
     );
-    const prefix = labelsSelector ? "&fieldSelector=" : "?fieldSelector=";
-    fieldSelectorSuffix = `${prefix}${preparedSelector}`;
+    const serializedFields = serializeLabelsWithNoEncoding$1(parsedObject);
+    if (serializedFields.length > 0) sParams.set("fieldSelector", serializedFields);
   }
+  const searchParams = sParams.toString();
   const {
     data: fetchedData,
     isLoading: isFetchedDataLoading,
     error: fetchedDataError
   } = useDirectUnknownResource({
-    uri: `${fetchUrlPrepared}${labelsSuffix || ""}${fieldSelectorSuffix || ""}`,
-    queryKey: [`${fetchUrlPrepared}${labelsSuffix || ""}${fieldSelectorSuffix || ""}`],
+    uri: `${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ""}`,
+    queryKey: [`${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ""}`],
     isEnabled: !isMultiqueryLoading
   });
   if (isMultiqueryLoading) {
@@ -37039,8 +37040,8 @@ const Events$1 = ({
     pageSize,
     substractHeight,
     limit,
-    labelsSelector,
-    labelsSelectorFull,
+    labelSelector,
+    labelSelectorFull,
     fieldSelector,
     baseFactoryNamespacedAPIKey,
     baseFactoryClusterSceopedAPIKey,
@@ -37064,28 +37065,32 @@ const Events$1 = ({
   if (limit) {
     params.set("limit", limit.toString());
   }
-  if (labelsSelector && Object.keys(labelsSelector).length > 0) {
+  if (labelSelector && Object.keys(labelSelector).length > 0) {
     const parsedObject = Object.fromEntries(
-      Object.entries(labelsSelector).map(
+      Object.entries(labelSelector).map(
         ([k, v]) => [k, parseAll({ text: v, replaceValues, multiQueryData })]
       )
     );
     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) ? _$1.get(root, labelsSelectorFull.pathToLabels) : jp.query(root, `$${labelsSelectorFull.pathToLabels}`)[0];
+  if (labelSelectorFull) {
+    const root = multiQueryData[`req${labelSelectorFull.reqIndex}`];
+    const value = Array.isArray(labelSelectorFull.pathToLabels) ? _$1.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
-    });
-    params.set("fieldSelector", `${fieldSelector.fieldName}=${preparedFieldSelectorValueTextWithPartsOfUrl}`);
+    const parsedObject = Object.fromEntries(
+      Object.entries(fieldSelector).map(
+        ([k, v]) => [
+          parseAll({ text: k, replaceValues, multiQueryData }),
+          parseAll({ text: v, replaceValues, multiQueryData })
+        ]
+      )
+    );
+    const serializedFields = serializeLabelsWithNoEncoding(parsedObject);
+    if (serializedFields.length > 0) params.set("fieldSelector", serializedFields);
   }
   const searchParams = params.toString();
   const wsUrlWithParams = `${wsUrlPrepared}${searchParams ? `?${searchParams}` : ""}`;