@prorobotech/openapi-k8s-toolkit 1.1.0-alpha.4 → 1.1.0-alpha.6

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

@@ -8356,9 +8356,9 @@
   }).toString()}`;
     const { data, isError, isLoading, error } = useDirectUnknownResource({
       uri,
-      queryKey: ["k8s-verbs", group || "", version, plural],
+      queryKey: ["k8s-verbs", cluster, group || "", version, plural],
       refetchInterval: false,
-      isEnabled
+      isEnabled: Boolean(isEnabled && cluster && version && plural)
     });
     const verbs = data?.verbs || [];
     const canList = verbs.includes("list");
@@ -8372,11 +8372,7 @@
     };
   };
 
-  const eventKey$1 = (e) => {
-    const n = e.metadata?.name ?? "";
-    const ns = e.metadata?.namespace ?? "";
-    return `${ns}/${n}`;
-  };
+  const eventKey$1 = (e) => e.metadata?.uid ?? `${e.metadata?.namespace ?? ""}/${e.metadata?.name ?? ""}`;
   const compareRV$1 = (a, b) => {
     if (a.length !== b.length) return a.length > b.length ? 1 : -1;
     return a > b ? 1 : a < b ? -1 : 0;
@@ -8631,19 +8627,6 @@
       wsRef.current = null;
       connect();
     }, [closeWS, connect, setStatusSafe]);
-    K.useEffect(() => {
-      if (!mountedRef.current) return;
-      if (isEnabled) {
-        connect();
-      } else {
-        if (reconnectTimerRef.current) {
-          window.clearTimeout(reconnectTimerRef.current);
-          reconnectTimerRef.current = null;
-        }
-        closeWS();
-        setStatusSafe("closed");
-      }
-    }, [isEnabled, closeWS, connect, setStatusSafe]);
     const setUrl = K.useCallback(
       (next) => {
         const changed = next !== urlRef.current;
@@ -8697,6 +8680,12 @@
           return;
         }
         if (!frame) return;
+        if (frame.type === "SERVER_LOG") {
+          const level = frame.level || "info";
+          const msg = frame.message;
+          (console[level] || console.log).call(console, "[useListWatch][server]", msg);
+          return;
+        }
         if (frame.type === "INITIAL") {
           dispatch({ type: "RESET", items: frame.items });
           setContToken(frame.continue);
@@ -8767,6 +8756,19 @@
     K.useEffect(() => {
       if (wsUrl !== urlRef.current) setUrl(wsUrl);
     }, [wsUrl, setUrl]);
+    K.useEffect(() => {
+      if (!mountedRef.current) return;
+      if (isEnabled) {
+        connect();
+      } else {
+        if (reconnectTimerRef.current) {
+          window.clearTimeout(reconnectTimerRef.current);
+          reconnectTimerRef.current = null;
+        }
+        closeWS();
+        setStatusSafe("closed");
+      }
+    }, [isEnabled, closeWS, connect, setStatusSafe]);
     K.useEffect(() => {
       if (resIdRef.current !== resId) {
         clearErrorSafe();
@@ -8916,7 +8918,7 @@
       group,
       version,
       plural,
-      isEnabled
+      isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
     });
     const listUri = buildListUri({
       cluster,
@@ -8928,7 +8930,9 @@
       labelSelector,
       limit
     });
-    const restEnabled = Boolean(isEnabled && canList && !canWatch && !verbsLoading && !verbsIsError);
+    const restEnabled = Boolean(
+      cluster && cluster.length > 0 && isEnabled && canList && !canWatch && !verbsLoading && !verbsIsError
+    );
     const {
       data: restData,
       isLoading: restLoading,
@@ -8949,7 +8953,9 @@
       refetchInterval: listRefetchInterval,
       isEnabled: restEnabled
     });
-    const watchEnabled = Boolean(isEnabled && canList && canWatch && !verbsLoading && !verbsIsError);
+    const watchEnabled = Boolean(
+      cluster && cluster.length > 0 && isEnabled && canList && canWatch && !verbsLoading && !verbsIsError
+    );
     const { state, status, lastError } = useListWatch({
       wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
       paused: false,
@@ -34274,6 +34280,7 @@
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       id,
       fetchUrl,
+      k8sResourceToFetch,
       pathToItems,
       clusterNamePartOfUrl,
       labelSelector,
@@ -34317,7 +34324,13 @@
       verb: "create",
       refetchInterval: false
     });
-    const fetchUrlPrepared = parseAll({ text: fetchUrl, replaceValues, multiQueryData });
+    const fetchUrlPrepared = fetchUrl ? parseAll({ text: fetchUrl, replaceValues, multiQueryData }) : void 0;
+    const k8sResourceToFetchPrepared = k8sResourceToFetch ? {
+      group: k8sResourceToFetch.group ? parseAll({ text: k8sResourceToFetch.group, replaceValues, multiQueryData }) : void 0,
+      version: parseAll({ text: k8sResourceToFetch.version, replaceValues, multiQueryData }),
+      plural: parseAll({ text: k8sResourceToFetch.plural, replaceValues, multiQueryData }),
+      namespace: k8sResourceToFetch.namespace ? parseAll({ text: k8sResourceToFetch.namespace, replaceValues, multiQueryData }) : void 0
+    } : void 0;
     const sParams = new URLSearchParams();
     if (labelSelector && Object.keys(labelSelector).length > 0) {
       const parsedObject = Object.fromEntries(
@@ -34354,21 +34367,48 @@
     } = useDirectUnknownResource({
       uri: `${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ""}`,
       queryKey: [`${fetchUrlPrepared}${searchParams ? `?${searchParams}` : ""}`],
-      isEnabled: !isMultiqueryLoading
+      isEnabled: Boolean(!isMultiqueryLoading && fetchUrlPrepared)
     });
-    if (isMultiqueryLoading) {
+    const {
+      data: fetchedDataSocket,
+      isLoading: isFetchedDataSocketLoading,
+      error: fetchedDataSocketError
+    } = useK8sSmartResource({
+      cluster: clusterName || "",
+      namespace: k8sResourceToFetchPrepared?.namespace,
+      group: k8sResourceToFetchPrepared?.group,
+      version: k8sResourceToFetchPrepared?.version || "",
+      plural: k8sResourceToFetchPrepared?.plural || "",
+      fieldSelector: sParams.get("fieldSelector") || void 0,
+      labelSelector: sParams.get("labelSelector") || void 0,
+      isEnabled: Boolean(!isMultiqueryLoading && k8sResourceToFetchPrepared)
+    });
+    if (fetchUrlPrepared && isMultiqueryLoading) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
+    }
+    if (k8sResourceToFetchPrepared && isMultiqueryLoading) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
     }
-    if (isFetchedDataLoading) {
+    if (fetchUrlPrepared && isFetchedDataLoading) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Flex, { justify: "center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Spin, {}) });
+    }
+    if (k8sResourceToFetchPrepared && isFetchedDataSocketLoading) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Flex, { justify: "center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Spin, {}) });
     }
-    if (fetchedDataError) {
+    if (fetchUrlPrepared && fetchedDataError) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+        "Error: ",
+        JSON.stringify(fetchedDataError)
+      ] });
+    }
+    if (k8sResourceToFetchPrepared && fetchedDataSocketError) {
       return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
         "Error: ",
         JSON.stringify(fetchedDataError)
       ] });
     }
-    const items = Array.isArray(pathToItems) ? _$1.get(fetchedData, pathToItems) : jp.query(fetchedData, `$${pathToItems}`)[0];
+    const dataFromOneOfHooks = fetchedData || fetchedDataSocket?.items;
+    const items = Array.isArray(pathToItems) ? _$1.get(dataFromOneOfHooks, pathToItems) : jp.query(dataFromOneOfHooks, `$${pathToItems}`)[0];
     if (!items) {
       return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
         "No data on this path ",
@@ -34503,15 +34543,18 @@
     const namespacePrepared = parseAll({ text: namespace, replaceValues, multiQueryData });
     const podNamePrepared = parseAll({ text: podName, replaceValues, multiQueryData });
     const {
-      data: podInfo,
+      data: podInfoList,
       isError: isPodInfoError,
       isLoading: isLoadingPodInfo
-    } = useDirectUnknownResource({
-      uri: `/api/clusters/${clusterPrepared}/k8s/api/v1/namespaces/${namespacePrepared}/pods/${podNamePrepared}`,
-      refetchInterval: 5e3,
-      queryKey: [clusterPrepared || "no-cluster", "pods", podNamePrepared],
+    } = useK8sSmartResource({
+      cluster: clusterPrepared,
+      namespace: namespacePrepared,
+      version: "v1",
+      plural: "pods",
+      fieldSelector: `metadata.name=${podNamePrepared}`,
       isEnabled: clusterPrepared !== void 0 && namespacePrepared !== void 0 && podNamePrepared !== void 0
     });
+    const podInfo = podInfoList?.items && podInfoList.items.length > 0 ? podInfoList.items[0] : void 0;
     if (isMultiqueryLoading) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
     }
@@ -34619,15 +34662,18 @@
     const namespacePrepared = parseAll({ text: namespace, replaceValues, multiQueryData });
     const podNamePrepared = parseAll({ text: podName, replaceValues, multiQueryData });
     const {
-      data: podInfo,
+      data: podInfoList,
       isError: isPodInfoError,
       isLoading: isLoadingPodInfo
-    } = useDirectUnknownResource({
-      uri: `/api/clusters/${clusterPrepared}/k8s/api/v1/namespaces/${namespacePrepared}/pods/${podNamePrepared}`,
-      refetchInterval: 5e3,
-      queryKey: [clusterPrepared || "no-cluster", "pods", podNamePrepared],
+    } = useK8sSmartResource({
+      cluster: clusterPrepared,
+      namespace: namespacePrepared,
+      version: "v1",
+      plural: "pods",
+      fieldSelector: `metadata.name=${podNamePrepared}`,
       isEnabled: clusterPrepared !== void 0 && namespacePrepared !== void 0 && podNamePrepared !== void 0
     });
+    const podInfo = podInfoList?.items && podInfoList.items.length > 0 ? podInfoList.items[0] : void 0;
     if (isMultiqueryLoading) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
     }
@@ -50959,7 +51005,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       fieldSelector: `metadata.name=${namespace}`,
       isEnabled: Boolean(clusterName !== void 0)
     });
-    const project = projectArr && projectArr.length > 0 ? projectArr[0] : void 0;
+    const project = projectArr && projectArr.items && projectArr.items.length > 0 ? projectArr.items[0] : void 0;
     const [isDeleteModalOpen, setIsDeleteModalOpen] = K.useState(false);
     const updatePermission = usePermissions({
       group: baseProjectApiGroup,