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

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

@@ -8357,9 +8357,9 @@ const useK8sVerbs = ({
   }).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");
@@ -8373,11 +8373,7 @@ const useK8sVerbs = ({
   };
 };
 
-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;
@@ -8632,19 +8628,6 @@ const useListWatch = ({
     wsRef.current = null;
     connect();
   }, [closeWS, connect, setStatusSafe]);
-  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 = useCallback(
     (next) => {
       const changed = next !== urlRef.current;
@@ -8698,6 +8681,12 @@ const useListWatch = ({
         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);
@@ -8768,6 +8757,19 @@ const useListWatch = ({
   useEffect(() => {
     if (wsUrl !== urlRef.current) setUrl(wsUrl);
   }, [wsUrl, setUrl]);
+  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]);
   useEffect(() => {
     if (resIdRef.current !== resId) {
       clearErrorSafe();
@@ -8917,7 +8919,7 @@ const useK8sSmartResource = ({
     group,
     version,
     plural,
-    isEnabled
+    isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
   });
   const listUri = buildListUri({
     cluster,
@@ -8929,7 +8931,9 @@ const useK8sSmartResource = ({
     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,
@@ -8950,7 +8954,9 @@ const useK8sSmartResource = ({
     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,
@@ -34275,6 +34281,7 @@ const EnrichedTable$1 = ({
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     id,
     fetchUrl,
+    k8sResourceToFetch,
     pathToItems,
     clusterNamePartOfUrl,
     labelSelector,
@@ -34318,7 +34325,13 @@ const EnrichedTable$1 = ({
     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(
@@ -34355,21 +34368,48 @@ const EnrichedTable$1 = ({
   } = 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(Flex, { justify: "center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Spin, {}) });
+  }
+  if (k8sResourceToFetchPrepared && isFetchedDataSocketLoading) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Flex, { justify: "center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(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 ",
@@ -34504,15 +34544,18 @@ const PodTerminal$1 = ({
   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" });
   }
@@ -34620,15 +34663,18 @@ const PodLogs$1 = ({
   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" });
   }
@@ -50960,7 +51006,7 @@ const ProjectInfoCard = ({
     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] = useState(false);
   const updatePermission = usePermissions({
     group: baseProjectApiGroup,