@prorobotech/openapi-k8s-toolkit 1.1.0-alpha.5 → 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");
@@ -8628,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;
@@ -8694,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);
@@ -8764,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();
@@ -8913,7 +8919,7 @@ const useK8sSmartResource = ({
     group,
     version,
     plural,
-    isEnabled
+    isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
   });
   const listUri = buildListUri({
     cluster,
@@ -8925,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,
@@ -8946,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,
@@ -50996,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,