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

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

@@ -8803,6 +8803,7 @@ const useListWatch = ({
 }) => {
   const resId = `${query.apiGroup ?? ""}|${query.apiVersion}|${query.plural}|${query.namespace ?? ""}|${query.fieldSelector ?? ""}|${query.labelSelector ?? ""}`;
   const resIdRef = useRef(resId);
+  const [debugTick, bumpTick] = useReducer((x) => x + 1, 0);
   const [state, dispatch] = useReducer(reducer$1, { order: [], byKey: {} });
   const [contToken, setContToken] = useState();
   const [hasMore, setHasMore] = useState(false);
@@ -9050,6 +9051,7 @@ const useListWatch = ({
       }
       if (frame.type === "INITIAL") {
         dispatch({ type: "RESET", items: frame.items });
+        bumpTick();
         setContToken(frame.continue);
         setHasMore(Boolean(frame.continue));
         setErrorSafe(void 0);
@@ -9065,6 +9067,7 @@ const useListWatch = ({
       }
       if (frame.type === "PAGE") {
         dispatch({ type: "APPEND_PAGE", items: frame.items });
+        bumpTick();
         setContToken(frame.continue);
         setHasMore(Boolean(frame.continue));
         fetchingRef.current = false;
@@ -9087,9 +9090,11 @@ const useListWatch = ({
       }
       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) });
         }
       }
@@ -9230,7 +9235,8 @@ const useListWatch = ({
     drainAll,
     reconnect,
     setUrl,
-    setQuery
+    setQuery,
+    debugTick
   };
 };
 
@@ -9321,7 +9327,7 @@ const useK8sSmartResourceWithoutKinds = ({
   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,
@@ -9353,7 +9359,7 @@ const useK8sSmartResourceWithoutKinds = ({
   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) => {
@@ -9440,22 +9446,98 @@ const useManyK8sSmartResource = (paramsList) => {
   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] = useSearchParams();
-  return useMemo(() => {
+  const rawEntries = 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 = 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 = 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 = ({
@@ -34100,7 +34182,6 @@ const normalizeCoreUnit = (u) => {
   const key = String(u).trim().toLowerCase();
   const canon = CORE_ALIASES[key];
   if (!canon) {
-    console.error(`Unknown core unit: "${u}"`);
     return "core";
   }
   return canon;
@@ -47072,9 +47153,9 @@ const getEnrichedColumns = ({
   }
   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;
@@ -47088,36 +47169,25 @@ const getEnrichedColumns = ({
       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;
     };
@@ -47149,7 +47219,7 @@ const getEnrichedColumns = ({
         };
       },
       filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => {
-        if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+        if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
           return null;
         }
         return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -47164,13 +47234,13 @@ const getEnrichedColumns = ({
         );
       },
       filterIcon: (filtered) => {
-        if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+        if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
           return null;
         }
         return /* @__PURE__ */ jsxRuntimeExports.jsx(SearchOutlined, { style: { color: filtered ? "#1677ff" : void 0 } });
       },
       onFilter: (value, record) => {
-        if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+        if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
           return false;
         }
         if (useFactorySearch) {
@@ -47197,22 +47267,22 @@ const getEnrichedColumns = ({
         }
         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];
@@ -54722,39 +54792,6 @@ const getSwagger = async ({ cluster }) => {
   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 useQuery({
     queryKey: ["useClusterList"],
@@ -55010,5 +55047,26 @@ const useInfiniteSentinel = (sentinelRef, hasMore, onNeedMore) => {
   }, [sentinelRef, hasMore, onNeedMore]);
 };
 
-export { BackToDefaultIcon, BlackholeForm, BlackholeFormProvider, ContentCard$1 as ContentCard, CursorDefaultDiv, CursorPointerTag, CursorPointerTagMinContent, CustomSelect$4 as CustomSelect, DeleteIcon, DeleteModal, DeleteModalMany, DownIcon, DynamicComponents, DynamicRenderer, DynamicRendererWithProviders, EarthIcon, EditIcon, EnrichedTable, EnrichedTableProvider, Events, FlexGrow, LockedIcon, LookingGlassIcon, ManageableBreadcrumbs, ManageableBreadcrumbsProvider, ManageableSidebar, ManageableSidebarProvider, MarketPlace, MarketplaceCard, MinusIcon, NodeTerminal, PaddingContainer, PauseCircleIcon, PlusIcon, PodLogs, PodLogsMonaco, PodTerminal, ProjectInfoCard, ResourceLink, ResumeCircleIcon, Search, Spacer$1 as Spacer, SuccessIcon, TreeWithSearch, UncontrolledSelect, UnlockedIcon, UpIcon, YamlEditorSingleton$1 as YamlEditorSingleton, checkIfApiInstanceNamespaceScoped, checkIfBuiltInInstanceNamespaceScoped, checkPermission, convertBytes, convertCompute, convertCores, convertStorage, createContextFactory, createNewEntry, deepMerge, deleteEntry, feedbackIcons, filterIfApiInstanceNamespaceScoped, filterIfBuiltInInstanceNamespaceScoped, filterSelectOptions, floorToDecimal, formatBytesAuto, formatCoresAuto, getAllPathsFromObj, getApiResourceSingle, getApiResourceTypes, getApiResourceTypesByApiGroup, getApiResources, getBuiltinResourceSingle, getBuiltinResourceTypes, getBuiltinResources, getBuiltinTreeData, getClusterList, getCrdData, getCrdResourceSingle, getCrdResources, getDirectUnknownResource, getEnrichedColumns, getEnrichedColumnsWithControls, getGroupsByCategory, getKinds, getLinkToApiForm, getLinkToBuiltinForm, getLinkToForm, getNamespaceLink, getObjectFormItemsDraft, getPrefixSubarrays, getResourceLink, getSortedKinds, getSortedKindsAll, getStringByName, getSwagger, getUppercase, groupsToTreeData, hslFromString, includesArray, isFlatObject, isMultilineFromYaml, isMultilineString, kindByGvr, namespacedByGvr, normalizeValuesForQuotasToNumber, parseCoresWithUnit, parseQuotaValue, parseQuotaValueCpu, parseQuotaValueMemoryAndStorage, parseValueWithUnit, pluralByKind, prepareDataForManageableBreadcrumbs, prepareDataForManageableSidebar, prepareTemplate, prepareUrlsToFetchForDynamicRenderer, toBytes, toCores, updateEntry, useApiResourceSingle, useApiResourceTypesByGroup, useApiResources, useApisResourceTypes, useBuiltinResourceSingle, useBuiltinResourceTypes, useBuiltinResources, useClusterList, useCrdData, useCrdResourceSingle, useCrdResources, useDirectUnknownResource, useInfiniteSentinel, useK8sSmartResource, useK8sVerbs, useListWatch, useManyK8sSmartResource, usePermissions, useSmartResourceParams };
+const useResourceScope = ({ plural, cluster, apiGroup, apiVersion }) => {
+  const computedResourceType = apiGroup ? "api" : "builtin";
+  const enabled = Boolean(cluster) && Boolean(plural) && (computedResourceType === "builtin" || Boolean(apiVersion));
+  return 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
+  });
+};
+
+export { BackToDefaultIcon, BlackholeForm, BlackholeFormProvider, ContentCard$1 as ContentCard, CursorDefaultDiv, CursorPointerTag, CursorPointerTagMinContent, CustomSelect$4 as CustomSelect, DeleteIcon, DeleteModal, DeleteModalMany, DownIcon, DynamicComponents, DynamicRenderer, DynamicRendererWithProviders, EarthIcon, EditIcon, EnrichedTable, EnrichedTableProvider, Events, FlexGrow, LockedIcon, LookingGlassIcon, ManageableBreadcrumbs, ManageableBreadcrumbsProvider, ManageableSidebar, ManageableSidebarProvider, MarketPlace, MarketplaceCard, MinusIcon, NodeTerminal, PaddingContainer, PauseCircleIcon, PlusIcon, PodLogs, PodLogsMonaco, PodTerminal, ProjectInfoCard, ResourceLink, ResumeCircleIcon, Search, Spacer$1 as Spacer, SuccessIcon, TreeWithSearch, UncontrolledSelect, UnlockedIcon, UpIcon, YamlEditorSingleton$1 as YamlEditorSingleton, checkIfApiInstanceNamespaceScoped, checkIfBuiltInInstanceNamespaceScoped, checkPermission, convertBytes, convertCompute, convertCores, convertStorage, createContextFactory, createNewEntry, deepMerge, deleteEntry, feedbackIcons, filterIfApiInstanceNamespaceScoped, filterIfBuiltInInstanceNamespaceScoped, filterSelectOptions, floorToDecimal, formatBytesAuto, formatCoresAuto, getAllPathsFromObj, getApiResourceSingle, getApiResourceTypes, getApiResourceTypesByApiGroup, getApiResources, getBuiltinResourceSingle, getBuiltinResourceTypes, getBuiltinResources, getBuiltinTreeData, getClusterList, getCrdData, getCrdResourceSingle, getCrdResources, getDirectUnknownResource, getEnrichedColumns, getEnrichedColumnsWithControls, getGroupsByCategory, getKinds, getLinkToApiForm, getLinkToBuiltinForm, getLinkToForm, getNamespaceLink, getObjectFormItemsDraft, getPrefixSubarrays, getResourceLink, getSortedKinds, getSortedKindsAll, getStringByName, getSwagger, getUppercase, groupsToTreeData, hslFromString, includesArray, isFlatObject, isMultilineFromYaml, isMultilineString, kindByGvr, namespacedByGvr, normalizeValuesForQuotasToNumber, parseCoresWithUnit, parseQuotaValue, parseQuotaValueCpu, parseQuotaValueMemoryAndStorage, parseValueWithUnit, pluralByKind, prepareDataForManageableBreadcrumbs, prepareDataForManageableSidebar, prepareTemplate, prepareUrlsToFetchForDynamicRenderer, toBytes, toCores, updateEntry, useApiResourceSingle, useApiResourceTypesByGroup, useApiResources, useApisResourceTypes, useBuiltinResourceSingle, useBuiltinResourceTypes, useBuiltinResources, useClusterList, useCrdData, useCrdResourceSingle, useCrdResources, useDirectUnknownResource, useInfiniteSentinel, useK8sSmartResource, useK8sVerbs, useListWatch, useManyK8sSmartResource, usePermissions, useResourceScope, useSmartResourceParams };
 //# sourceMappingURL=openapi-k8s-toolkit.es.js.map