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

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");
@@ -8456,6 +8456,7 @@
     const [lastError, setLastError] = K.useState(void 0);
     const [isPaused, setIsPaused] = K.useState(paused);
     const [isRemoveIgnored, setIsRemoveIgnored] = K.useState(ignoreRemove);
+    const [hasInitial, setHasInitial] = K.useState(false);
     const queryRef = K.useRef(query);
     const wsRef = K.useRef(null);
     const connectingRef = K.useRef(false);
@@ -8627,19 +8628,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;
@@ -8653,6 +8641,7 @@
             setHasMore(false);
             anchorRVRef.current = void 0;
             haveAnchorRef.current = false;
+            setHasInitial(false);
           }
           if (enabledRef.current) reconnect();
         }
@@ -8671,6 +8660,7 @@
           dispatch({ type: "RESET", items: [] });
           setContToken(void 0);
           setHasMore(false);
+          setHasInitial(false);
         }
         if (prevId !== nextId) {
           anchorRVRef.current = void 0;
@@ -8693,6 +8683,17 @@
           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);
@@ -8705,6 +8706,7 @@
             anchorRVRef.current = snapshotRV;
             haveAnchorRef.current = true;
           }
+          setHasInitial(true);
           return;
         }
         if (frame.type === "PAGE") {
@@ -8763,12 +8765,26 @@
     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();
         suppressErrorsRef.current = true;
         anchorRVRef.current = void 0;
         haveAnchorRef.current = false;
+        setHasInitial(false);
         resIdRef.current = resId;
         queryRef.current = query;
         if (enabledRef.current) reconnect();
@@ -8853,6 +8869,7 @@
       continueToken,
       status,
       lastError,
+      hasInitial,
       setPaused: setIsPaused,
       setIgnoreRemove: setIsRemoveIgnored,
       sendScroll,
@@ -8912,7 +8929,7 @@
       group,
       version,
       plural,
-      isEnabled
+      isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
     });
     const listUri = buildListUri({
       cluster,
@@ -8924,7 +8941,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,
@@ -8945,8 +8964,10 @@
       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,
@@ -8971,7 +8992,7 @@
       [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;
@@ -34397,7 +34418,7 @@
         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: [
@@ -34699,6 +34720,37 @@
     ] });
   };
 
+  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
@@ -34714,7 +34766,9 @@
       apiGroup,
       apiVersion,
       typeName,
+      forcedKind,
       prefillValuesRequestIndex,
+      pathToData,
       substractHeight,
       ...props
     } = data;
@@ -34740,7 +34794,9 @@
     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" });
     }
@@ -34750,7 +34806,7 @@
         {
           cluster: clusterPrepared,
           theme,
-          prefillValuesSchema: prefillValues,
+          prefillValuesSchema: prefillValuesWithForces,
           isNameSpaced,
           isCreate: false,
           type,
@@ -36146,10 +36202,15 @@
                     ...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(
                       antd.Select,
@@ -46870,9 +46931,23 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     const [yamlData, setYamlData] = K.useState("");
     const [isLoading, setIsLoading] = K.useState(false);
     const [error, setError] = K.useState();
+    const initialPrefillYamlRef = K.useRef(null);
+    const latestPrefillYamlRef = K.useRef(null);
     K.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);
@@ -46944,7 +47019,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       ) }),
       !readOnly && /* @__PURE__ */ jsxRuntimeExports.jsx(Styled$j.ControlsRowContainer, { $bgColor: token.colorPrimaryBg, $designNewLayout: designNewLayout, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(antd.Flex, { gap: designNewLayout ? 10 : 16, align: "center", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Button, { type: "primary", onClick: onSubmit, loading: isLoading, children: "Submit" }),
-        backlink && /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Button, { onClick: () => navigate(backlink), children: "Cancel" })
+        backlink && /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Button, { onClick: () => navigate(backlink), children: "Cancel" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Button, { onClick: handleReload, children: "Reload" })
       ] }) }),
       error && /* @__PURE__ */ jsxRuntimeExports.jsxs(
         antd.Modal,
@@ -50995,7 +51071,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,