@prorobotech/openapi-k8s-toolkit 1.2.0-alpha.7 → 1.2.0-alpha.9

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

@@ -8802,6 +8802,7 @@
   }) => {
     const resId = `${query.apiGroup ?? ""}|${query.apiVersion}|${query.plural}|${query.namespace ?? ""}|${query.fieldSelector ?? ""}|${query.labelSelector ?? ""}`;
     const resIdRef = K.useRef(resId);
+    const [debugTick, bumpTick] = K.useReducer((x) => x + 1, 0);
     const [state, dispatch] = K.useReducer(reducer$1, { order: [], byKey: {} });
     const [contToken, setContToken] = K.useState();
     const [hasMore, setHasMore] = K.useState(false);
@@ -9049,6 +9050,7 @@
         }
         if (frame.type === "INITIAL") {
           dispatch({ type: "RESET", items: frame.items });
+          bumpTick();
           setContToken(frame.continue);
           setHasMore(Boolean(frame.continue));
           setErrorSafe(void 0);
@@ -9064,6 +9066,7 @@
         }
         if (frame.type === "PAGE") {
           dispatch({ type: "APPEND_PAGE", items: frame.items });
+          bumpTick();
           setContToken(frame.continue);
           setHasMore(Boolean(frame.continue));
           fetchingRef.current = false;
@@ -9086,9 +9089,11 @@
         }
         if (!pausedRef.current) {
           if (frame.type === "ADDED" || frame.type === "MODIFIED") {
+            bumpTick();
             dispatch({ type: "UPSERT", item: frame.item });
           }
           if (!ignoreRemoveRef.current && frame.type === "DELETED") {
+            bumpTick();
             dispatch({ type: "REMOVE", key: eventKey$1(frame.item) });
           }
         }
@@ -9229,7 +9234,8 @@
       drainAll,
       reconnect,
       setUrl,
-      setQuery
+      setQuery,
+      debugTick
     };
   };
 
@@ -9320,7 +9326,7 @@
     const watchEnabled = Boolean(
       cluster && cluster.length > 0 && isEnabled && canList && canWatch && !verbsLoading && !verbsIsError
     );
-    const { state, status, hasInitial, lastError } = useListWatch({
+    const { state, status, hasInitial, lastError, debugTick } = useListWatch({
       wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
       paused: false,
       ignoreRemove: false,
@@ -9352,7 +9358,7 @@
     else if (used === "list" && restIsError) error = restError;
     const isError = Boolean(error);
     const data = used === "watch" ? watchData : used === "list" ? restData : void 0;
-    return { data, isLoading, isError, error, _meta: { used } };
+    return { data, isLoading, isError, error, _meta: { used }, debugTick };
   };
 
   const hasItemsArray = (value) => {
@@ -9439,22 +9445,98 @@
     return results;
   };
 
+  const checkIfApiInstanceNamespaceScoped = async ({
+    plural,
+    apiGroup,
+    apiVersion,
+    cluster
+  }) => {
+    const payload = {
+      plural,
+      apiGroup,
+      apiVersion,
+      cluster
+    };
+    const { data } = await axios.post(
+      `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfApiNamespaceScoped`,
+      payload
+    );
+    return data;
+  };
+  const checkIfBuiltInInstanceNamespaceScoped = async ({
+    plural,
+    cluster
+  }) => {
+    const payload = {
+      plural,
+      cluster
+    };
+    const { data } = await axios.post(
+      `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfBuiltInNamespaceScoped`,
+      payload
+    );
+    return data;
+  };
+
   const useSmartResourceParams = ({ cluster, namespace }) => {
     const [searchParams] = reactRouterDom.useSearchParams();
-    return K.useMemo(() => {
+    const rawEntries = K.useMemo(() => {
       const raw = searchParams.get("resources");
       if (!raw) return [];
       return raw.split(",").map((entry) => {
-        const [apiGroup = "", apiVersion = "", plural] = entry.split("/");
+        const [apiGroup = "", apiVersion = "", plural = ""] = entry.split("/");
+        const normalizedGroup = apiGroup === "builtin" || apiGroup === "" ? void 0 : apiGroup;
         return {
           cluster,
-          namespace,
-          apiGroup: apiGroup === "builtin" ? void 0 : apiGroup,
-          apiVersion,
-          plural
+          plural,
+          apiGroup: normalizedGroup,
+          apiVersion
+        };
+      }).filter((e) => Boolean(e.plural));
+    }, [searchParams, cluster]);
+    const scopeQueries = reactQuery.useQueries({
+      queries: rawEntries.map((e) => {
+        const isApi = Boolean(e.apiGroup);
+        return {
+          queryKey: ["resource-scope", e.cluster, isApi ? e.apiGroup : "builtin", e.apiVersion ?? "", e.plural],
+          enabled: Boolean(e.cluster && e.plural && (!isApi || e.apiVersion)),
+          queryFn: () => {
+            if (isApi) {
+              return checkIfApiInstanceNamespaceScoped({
+                plural: e.plural,
+                apiGroup: e.apiGroup,
+                apiVersion: e.apiVersion || "",
+                cluster: e.cluster
+              });
+            }
+            return checkIfBuiltInInstanceNamespaceScoped({
+              plural: e.plural,
+              cluster: e.cluster
+            });
+          },
+          staleTime: 5 * 60 * 1e3
+        };
+      })
+    });
+    const scopesLoading = scopeQueries.some((q) => q.isLoading);
+    const scopesError = scopeQueries.find((q) => q.error)?.error;
+    const paramsList = K.useMemo(() => {
+      return rawEntries.map((e, i) => {
+        const isClusterWide = scopeQueries[i]?.data?.isNamespaceScoped === false;
+        return {
+          cluster: e.cluster,
+          plural: e.plural,
+          apiGroup: e.apiGroup,
+          apiVersion: e.apiVersion || "",
+          namespace: isClusterWide ? void 0 : namespace
         };
       });
-    }, [searchParams, cluster, namespace]);
+    }, [rawEntries, scopeQueries, namespace]);
+    return {
+      paramsList,
+      scopesLoading,
+      scopesError
+    };
   };
 
   const prepareTemplate = ({
@@ -34099,7 +34181,6 @@
     const key = String(u).trim().toLowerCase();
     const canon = CORE_ALIASES[key];
     if (!canon) {
-      console.error(`Unknown core unit: "${u}"`);
       return "core";
     }
     return canon;
@@ -47071,9 +47152,9 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }
     return columns.map((el, colIndex) => {
       const possibleAdditionalPrinterColumnsCustomSortersAndFiltersType = additionalPrinterColumnsCustomSortersAndFilters?.find(({ key }) => key === el.key)?.type;
-      const isSortersAndFitlersDisabled = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "disabled";
-      const isSortersAndFitlersCPU = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "cpu";
-      const isSortersAndFitlersMemory = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "memory";
+      const isSortersAndFiltersDisabled = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "disabled";
+      const isSortersAndFiltersCPU = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "cpu";
+      const isSortersAndFiltersMemory = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "memory";
       const possibleUndefinedValue = additionalPrinterColumnsUndefinedValues?.find(({ key }) => key === el.key)?.value;
       const possibleTrimLength = additionalPrinterColumnsTrimLengths?.find(({ key }) => key === el.key)?.value;
       const possibleColWidth = additionalPrinterColumnsColWidths?.find(({ key }) => key === el.key)?.value;
@@ -47087,36 +47168,25 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         if (!cell) return "";
         return (cell.innerText || cell.textContent || "").trim().toLowerCase();
       };
-      const getEntry = (record) => {
-        const { dataIndex } = el;
-        return Array.isArray(dataIndex) ? lodashExports.get(record, dataIndex) : record[dataIndex];
-      };
-      const getTextForNumericUnitSort = (record) => {
-        if (useFactorySearch) {
-          const textFromDom = getCellTextFromDOM(record);
-          if (textFromDom) return textFromDom;
-        }
-        const raw = getEntry(record);
-        if (raw == null) return null;
-        return String(raw);
-      };
       const getMemoryInBytes = (record) => {
-        const text = getTextForNumericUnitSort(record);
-        if (!text) return NaN;
+        const text = getCellTextFromDOM(record);
+        if (!text) return 0;
         const parsed = parseValueWithUnit(text);
-        if (!parsed) return NaN;
+        if (!parsed) return 0;
         if (parsed.unit) {
-          return toBytes(parsed.value, parsed.unit);
+          const bytes = toBytes(parsed.value, parsed.unit);
+          return bytes >= 0 ? bytes : 0;
         }
         return parsed.value;
       };
       const getCpuInCores = (record) => {
-        const text = getTextForNumericUnitSort(record);
-        if (!text) return NaN;
+        const text = getCellTextFromDOM(record);
+        if (!text) return 0;
         const parsed = parseCoresWithUnit(text);
-        if (!parsed) return NaN;
+        if (!parsed) return 0;
         if (parsed.unit) {
-          return toCores(parsed.value, parsed.unit);
+          const cores = toCores(parsed.value, parsed.unit);
+          return cores >= 0 ? cores : 0;
         }
         return parsed.value;
       };
@@ -47148,7 +47218,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           };
         },
         filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return null;
           }
           return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -47163,13 +47233,13 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           );
         },
         filterIcon: (filtered) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return null;
           }
           return /* @__PURE__ */ jsxRuntimeExports.jsx(icons.SearchOutlined, { style: { color: filtered ? "#1677ff" : void 0 } });
         },
         onFilter: (value, record) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return false;
           }
           if (useFactorySearch) {
@@ -47196,22 +47266,22 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           }
           return false;
         },
-        sorter: isSortersAndFitlersDisabled ? false : (a, b) => {
-          if (useFactorySearch) {
-            const aText = getCellTextFromDOM(a);
-            const bText = getCellTextFromDOM(b);
-            return aText.localeCompare(bText);
-          }
-          if (isSortersAndFitlersMemory) {
+        sorter: isSortersAndFiltersDisabled ? false : (a, b) => {
+          if (isSortersAndFiltersMemory) {
             const aBytes = getMemoryInBytes(a);
             const bBytes = getMemoryInBytes(b);
             return safeNumericCompare(aBytes, bBytes);
           }
-          if (isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersCPU) {
             const aCores = getCpuInCores(a);
             const bCores = getCpuInCores(b);
             return safeNumericCompare(aCores, bCores);
           }
+          if (useFactorySearch) {
+            const aText = getCellTextFromDOM(a);
+            const bText = getCellTextFromDOM(b);
+            return aText.localeCompare(bText);
+          }
           const { dataIndex } = el;
           const aEntry = Array.isArray(dataIndex) ? lodashExports.get(a, dataIndex) : a[dataIndex];
           const bEntry = Array.isArray(dataIndex) ? lodashExports.get(b, dataIndex) : b[dataIndex];
@@ -54721,39 +54791,6 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     return axios.get(`/api/clusters/${cluster}/openapi-bff/swagger/swagger/${cluster}`);
   };
 
-  const checkIfApiInstanceNamespaceScoped = async ({
-    plural,
-    apiGroup,
-    apiVersion,
-    cluster
-  }) => {
-    const payload = {
-      plural,
-      apiGroup,
-      apiVersion,
-      cluster
-    };
-    const { data } = await axios.post(
-      `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfApiNamespaceScoped`,
-      payload
-    );
-    return data;
-  };
-  const checkIfBuiltInInstanceNamespaceScoped = async ({
-    plural,
-    cluster
-  }) => {
-    const payload = {
-      plural,
-      cluster
-    };
-    const { data } = await axios.post(
-      `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfBuiltInNamespaceScoped`,
-      payload
-    );
-    return data;
-  };
-
   const useClusterList = ({ refetchInterval }) => {
     return reactQuery.useQuery({
       queryKey: ["useClusterList"],
@@ -55009,6 +55046,27 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }, [sentinelRef, hasMore, onNeedMore]);
   };
 
+  const useResourceScope = ({ plural, cluster, apiGroup, apiVersion }) => {
+    const computedResourceType = apiGroup ? "api" : "builtin";
+    const enabled = Boolean(cluster) && Boolean(plural) && (computedResourceType === "builtin" || Boolean(apiVersion));
+    return reactQuery.useQuery({
+      queryKey: ["resource-scope", computedResourceType, cluster, plural, apiGroup, apiVersion],
+      enabled,
+      queryFn: async () => {
+        if (computedResourceType === "builtin") {
+          return checkIfBuiltInInstanceNamespaceScoped({ plural, cluster });
+        }
+        return checkIfApiInstanceNamespaceScoped({
+          plural,
+          apiGroup: apiGroup || "",
+          apiVersion: apiVersion || "",
+          cluster
+        });
+      },
+      staleTime: 5 * 60 * 1e3
+    });
+  };
+
   exports.BackToDefaultIcon = BackToDefaultIcon;
   exports.BlackholeForm = BlackholeForm;
   exports.BlackholeFormProvider = BlackholeFormProvider;
@@ -55145,6 +55203,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   exports.useListWatch = useListWatch;
   exports.useManyK8sSmartResource = useManyK8sSmartResource;
   exports.usePermissions = usePermissions;
+  exports.useResourceScope = useResourceScope;
   exports.useSmartResourceParams = useSmartResourceParams;
 
   Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });