@prorobotech/openapi-k8s-toolkit 1.1.0-alpha.5 → 1.1.0-alpha.7

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");
@@ -8457,6 +8457,7 @@ const useListWatch = ({
   const [lastError, setLastError] = useState(void 0);
   const [isPaused, setIsPaused] = useState(paused);
   const [isRemoveIgnored, setIsRemoveIgnored] = useState(ignoreRemove);
+  const [hasInitial, setHasInitial] = useState(false);
   const queryRef = useRef(query);
   const wsRef = useRef(null);
   const connectingRef = useRef(false);
@@ -8628,19 +8629,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;
@@ -8654,6 +8642,7 @@ const useListWatch = ({
           setHasMore(false);
           anchorRVRef.current = void 0;
           haveAnchorRef.current = false;
+          setHasInitial(false);
         }
         if (enabledRef.current) reconnect();
       }
@@ -8672,6 +8661,7 @@ const useListWatch = ({
         dispatch({ type: "RESET", items: [] });
         setContToken(void 0);
         setHasMore(false);
+        setHasInitial(false);
       }
       if (prevId !== nextId) {
         anchorRVRef.current = void 0;
@@ -8694,6 +8684,17 @@ 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_ERROR") {
+        const msg = frame.message;
+        setErrorSafe(msg);
+        return;
+      }
       if (frame.type === "INITIAL") {
         dispatch({ type: "RESET", items: frame.items });
         setContToken(frame.continue);
@@ -8706,6 +8707,7 @@ const useListWatch = ({
           anchorRVRef.current = snapshotRV;
           haveAnchorRef.current = true;
         }
+        setHasInitial(true);
         return;
       }
       if (frame.type === "PAGE") {
@@ -8764,12 +8766,26 @@ 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();
       suppressErrorsRef.current = true;
       anchorRVRef.current = void 0;
       haveAnchorRef.current = false;
+      setHasInitial(false);
       resIdRef.current = resId;
       queryRef.current = query;
       if (enabledRef.current) reconnect();
@@ -8854,6 +8870,7 @@ const useListWatch = ({
     continueToken,
     status,
     lastError,
+    hasInitial,
     setPaused: setIsPaused,
     setIgnoreRemove: setIsRemoveIgnored,
     sendScroll,
@@ -8913,7 +8930,7 @@ const useK8sSmartResource = ({
     group,
     version,
     plural,
-    isEnabled
+    isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
   });
   const listUri = buildListUri({
     cluster,
@@ -8925,7 +8942,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,8 +8965,10 @@ const useK8sSmartResource = ({
     refetchInterval: listRefetchInterval,
     isEnabled: restEnabled
   });
-  const watchEnabled = Boolean(isEnabled && canList && canWatch && !verbsLoading && !verbsIsError);
-  const { state, status, lastError } = useListWatch({
+  const watchEnabled = Boolean(
+    cluster && cluster.length > 0 && isEnabled && canList && canWatch && !verbsLoading && !verbsIsError
+  );
+  const { state, status, hasInitial, lastError } = useListWatch({
     wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
     paused: false,
     ignoreRemove: false,
@@ -8972,7 +8993,7 @@ const useK8sSmartResource = ({
     [watchEnabled, state, mapListWatchState]
   );
   const used = !isEnabled ? "disabled" : verbsLoading ? "verbs-loading" : verbsIsError ? "verbs-error" : watchEnabled ? "watch" : restEnabled ? "list" : "disabled";
-  const isLoading = isEnabled && verbsLoading || used === "watch" && status === "connecting" || used === "list" && restLoading;
+  const isLoading = isEnabled && verbsLoading || used === "watch" && status === "connecting" || used === "watch" && status === "open" && !hasInitial || used === "list" && restLoading;
   let error;
   if (verbsIsError) error = verbsErrorObj;
   else if (used === "watch" && status === "closed" && lastError) error = lastError;
@@ -34398,7 +34419,7 @@ const EnrichedTable$1 = ({
       JSON.stringify(fetchedDataError)
     ] });
   }
-  const dataFromOneOfHooks = fetchedData || fetchedDataSocket?.items;
+  const dataFromOneOfHooks = fetchedData || fetchedDataSocket;
   const items = Array.isArray(pathToItems) ? _$1.get(dataFromOneOfHooks, pathToItems) : jp.query(dataFromOneOfHooks, `$${pathToItems}`)[0];
   if (!items) {
     return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
@@ -34700,6 +34721,37 @@ const PodLogs$1 = ({
   ] });
 };
 
+const getDataByPath = ({
+  prefillValuesRaw,
+  pathToData
+}) => {
+  return Array.isArray(pathToData) ? _$1.get(prefillValuesRaw, pathToData) : jp.query(prefillValuesRaw, `$${pathToData}`)[0];
+};
+const getPrefillValuesWithForces = ({
+  prefillValues,
+  forcedKind,
+  apiGroup,
+  apiVersion
+}) => {
+  if (!forcedKind) {
+    return prefillValues;
+  }
+  const newValues = { ...prefillValues };
+  if (typeof newValues === "object" && newValues !== null) {
+    if ("kind" in newValues) {
+      delete newValues.kind;
+    }
+    if ("apiVersion" in newValues) {
+      delete newValues.apiVersion;
+    }
+  }
+  return {
+    kind: forcedKind,
+    apiVersion: `${apiGroup ? `${apiGroup}/` : ""}${apiVersion}`,
+    ...newValues
+  };
+};
+
 const YamlEditorSingleton$1 = ({
   data,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -34715,7 +34767,9 @@ const YamlEditorSingleton$1 = ({
     apiGroup,
     apiVersion,
     typeName,
+    forcedKind,
     prefillValuesRequestIndex,
+    pathToData,
     substractHeight,
     ...props
   } = data;
@@ -34741,7 +34795,9 @@ const YamlEditorSingleton$1 = ({
   const apiGroupPrepared = apiGroup ? parseAll({ text: apiGroup, replaceValues, multiQueryData }) : "no-api-group";
   const apiVersionPrepared = apiVersion ? parseAll({ text: apiVersion, replaceValues, multiQueryData }) : "no-api-version";
   const typeNamePrepared = parseAll({ text: typeName, replaceValues, multiQueryData });
-  const prefillValues = multiQueryData[`req${prefillValuesRequestIndex}`];
+  const prefillValuesRaw = multiQueryData[`req${prefillValuesRequestIndex}`];
+  const prefillValues = pathToData ? getDataByPath({ prefillValuesRaw, pathToData }) : prefillValuesRaw;
+  const prefillValuesWithForces = getPrefillValuesWithForces({ prefillValues, forcedKind, apiGroup, apiVersion });
   if (isMultiqueryLoading) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
   }
@@ -34751,7 +34807,7 @@ const YamlEditorSingleton$1 = ({
       {
         cluster: clusterPrepared,
         theme,
-        prefillValuesSchema: prefillValues,
+        prefillValuesSchema: prefillValuesWithForces,
         isNameSpaced,
         isCreate: false,
         type,
@@ -36147,10 +36203,15 @@ const EditModal$1 = ({
                   ...restField,
                   name: [name, "operator"],
                   rules: [
-                    { required: true, message: "Operator is required." },
-                    {
-                      validator: (_, v) => v && operatorOptions.includes(v) ? Promise.resolve() : Promise.reject(new Error("Select a valid operator."))
-                    }
+                    ({ getFieldValue }) => ({
+                      validator(_, v) {
+                        const nameV = getFieldValue(["tolerations", name, "key"]);
+                        if ((nameV === "nameV" || !nameV) && (!v || v !== "Exists")) {
+                          return Promise.reject(new Error("Operator must be Exists when `key` is empty"));
+                        }
+                        return Promise.resolve();
+                      }
+                    })
                   ],
                   children: /* @__PURE__ */ jsxRuntimeExports.jsx(
                     Select,
@@ -46871,9 +46932,23 @@ const YamlEditorSingleton = ({
   const [yamlData, setYamlData] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState();
+  const initialPrefillYamlRef = useRef(null);
+  const latestPrefillYamlRef = useRef(null);
   useEffect(() => {
-    setYamlData(stringify(prefillValuesSchema));
+    if (prefillValuesSchema === void 0) return;
+    const nextYaml = stringify(prefillValuesSchema);
+    if (initialPrefillYamlRef.current === null) {
+      initialPrefillYamlRef.current = nextYaml;
+      setYamlData(nextYaml);
+    }
+    latestPrefillYamlRef.current = nextYaml;
   }, [prefillValuesSchema]);
+  const handleReload = () => {
+    const nextYaml = latestPrefillYamlRef.current ?? initialPrefillYamlRef.current;
+    if (nextYaml !== null) {
+      setYamlData(nextYaml);
+    }
+  };
   const onSubmit = () => {
     setIsLoading(true);
     setError(void 0);
@@ -46945,7 +47020,8 @@ const YamlEditorSingleton = ({
     ) }),
     !readOnly && /* @__PURE__ */ jsxRuntimeExports.jsx(Styled$j.ControlsRowContainer, { $bgColor: token.colorPrimaryBg, $designNewLayout: designNewLayout, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(Flex, { gap: designNewLayout ? 10 : 16, align: "center", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { type: "primary", onClick: onSubmit, loading: isLoading, children: "Submit" }),
-      backlink && /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { onClick: () => navigate(backlink), children: "Cancel" })
+      backlink && /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { onClick: () => navigate(backlink), children: "Cancel" }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { onClick: handleReload, children: "Reload" })
     ] }) }),
     error && /* @__PURE__ */ jsxRuntimeExports.jsxs(
       Modal,
@@ -50996,7 +51072,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,