@dovetail-v2/refine 0.0.52 → 0.0.54

package/dist/{MonacoYamlDiffEditor-1745c907.js → MonacoYamlDiffEditor-f2a92bde.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "./index-7fe9ade3.js";
+import { j as jsxRuntimeExports } from "./index-d2d0cacc.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "i18next";

package/dist/{index-7fe9ade3.js → index-d2d0cacc.js}

@@ -1054,7 +1054,7 @@ const container$1 = "Container";
 const redeploy$1 = "Redeploy";
 const data$1 = "Data";
 const resume$1 = "Resume";
-const sessionAffinity$1 = "会话保持";
+const sessionAffinity$1 = "Session Affinity";
 const log$1 = "Log";
 const ready$1 = "Ready";
 const updating$1 = "Updating";
@@ -1064,7 +1064,7 @@ const suspended$1 = "Suspended";
 const running$1 = "Running";
 const terminating$1 = "Terminating";
 const terminated$1 = "Terminated";
-const succeeded$1 = "Succeed";
+const succeeded$1 = "Succeeded";
 const unknown$1 = "Unknown";
 const pending$1 = "Pending";
 const waiting$1 = "Waiting";
@@ -10016,6 +10016,7 @@ class ServiceModel extends ResourceModel {
       }
       return {
         servicePort: p.port,
+        nodePort: p.nodePort,
         link,
         targetPort: p.targetPort,
         protocol: p.protocol
@@ -11399,7 +11400,7 @@ const WorkloadPodsTable = ({
           field: "",
           value: "",
           fn(item) {
-            return matchSelector(item, selector, item.metadata.namespace);
+            return matchSelector(item, selector, namespace2);
           }
         }]
       }
@@ -22904,7 +22905,7 @@ const Separator = () => {
   });
 };
 const MonacoYamlEditor = React__default.lazy(() => Promise.resolve().then(() => MonacoYamlEditor$2));
-const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-1745c907.js"));
+const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-f2a92bde.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -23099,7 +23100,7 @@ const YamlEditorComponent = forwardRef(
                 ] }),
                 errorMsgs.length ? /* @__PURE__ */ jsxRuntimeExports.jsxs(kit.space, { className: ErrorWrapperStyle, size: 8, align: "start", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsx(XmarkFailedSeriousWarningFill16RedIcon, { className: ErrorIconStyle }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: errorMsgs.map((errorMsg, index) => /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: ErrorMsgStyle, children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: errorMsgs.map((errorMsg, index) => /* @__PURE__ */ jsxRuntimeExports.jsxs("pre", { className: ErrorMsgStyle, children: [
                     errorMsgs.length > 1 ? `${index + 1}. ` : "",
                     errorMsg
                   ] }, errorMsg)) })
@@ -23533,17 +23534,28 @@ function YamlForm(props) {
     i18n: i18n2
   } = useTranslation();
   const FormWrapper = isShowLayout ? FormLayout : React__default.Fragment;
+  const formWrapperProps = isShowLayout ? {
+    saveButtonProps
+  } : {};
   const schema = useMemo(() => {
     return editorProps.schema || {};
   }, [editorProps.schema]);
   const responseErrors = useMemo(() => errorResponseBody ? getCommonErrors(errorResponseBody, i18n2) : [], [errorResponseBody, i18n2]);
   const onFinish = useCallback(async (store) => {
     var _a, _b;
-    const result = await ((_a = formProps.onFinish) == null ? void 0 : _a.call(formProps, store));
-    if (result) {
-      (_b = props.onFinish) == null ? void 0 : _b.call(props);
+    try {
+      const result = await ((_a = formProps.onFinish) == null ? void 0 : _a.call(formProps, store));
+      if (result) {
+        (_b = props.onFinish) == null ? void 0 : _b.call(props);
+      }
+    } catch {
+    } finally {
+      onSaveButtonPropsChange == null ? void 0 : onSaveButtonPropsChange({
+        ...saveButtonProps,
+        loading: false
+      });
     }
-  }, [formProps, props]);
+  }, [formProps, props, saveButtonProps, onSaveButtonPropsChange]);
   useEffect(() => {
     onSaveButtonPropsChange == null ? void 0 : onSaveButtonPropsChange(saveButtonProps);
   }, [saveButtonProps, onSaveButtonPropsChange]);
@@ -23551,7 +23563,7 @@ function YamlForm(props) {
     onErrorsChange == null ? void 0 : onErrorsChange(responseErrors);
   }, [responseErrors, onErrorsChange]);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormWrapper, {
-    saveButtonProps,
+    ...formWrapperProps,
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(kit.form, {
       ...formProps,
       initialValues: formProps.initialValues,
@@ -23665,9 +23677,10 @@ function FormModal(props) {
   const saveButtonProps = isYamlForm ? yamlSaveButtonProps : refineFormResult.formResult.saveButtonProps;
   const onCancel = useCallback(() => {
     popModal();
-  }, []);
+  }, [popModal]);
   const onOk = useCallback((e2) => {
     var _a2;
+    setIsError(false);
     (_a2 = saveButtonProps.onClick) == null ? void 0 : _a2.call(saveButtonProps, e2);
   }, [saveButtonProps]);
   const errorText = (() => {
@@ -23696,11 +23709,11 @@ function FormModal(props) {
     }) : "",
     okButtonProps: {
       ...saveButtonProps,
-      children: (_e = config.formConfig) == null ? void 0 : _e.saveButtonText
+      children: (_e = config.formConfig) == null ? void 0 : _e.saveButtonText,
+      onClick: onOk
     },
     closeIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(CloseCircleFilled$1, {}),
     okText,
-    onOk,
     onCancel,
     destroyOnClose: true,
     fullscreen: true,
@@ -24081,7 +24094,7 @@ const IngressRulesComponent = ({
     children: result
   });
 };
-const columns_qgyagz = "";
+const columns_1h38dp = "";
 const DashedTitleStyle = "dh5j833";
 const ServiceClusterTooltipStyle = "s1fcgan";
 const NameLink = (props) => {
@@ -24569,7 +24582,7 @@ const DataKeysColumnRenderer = (i18n2) => {
     sortable: true
   };
 };
-const PortMappingColumnRenderer = (i18n2) => {
+const PortMappingColumnRenderer = (i18n2, clusterVip) => {
   return {
     key: "displayPortMapping",
     title: /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip, {
@@ -24590,8 +24603,9 @@ const PortMappingColumnRenderer = (i18n2) => {
             whiteSpace: "pre"
           },
           children: [record.displayType === "NodePort" ? /* @__PURE__ */ jsxRuntimeExports.jsx(Link$1, {
-            href: `//${v.link}`,
+            href: `//${clusterVip}:${v.nodePort}`,
             target: "_blank",
+            className: "ciistgu",
             children: v.servicePort
           }) : v.servicePort, " ", "> ", v.targetPort, "/", v.protocol]
         }),

package/dist/refine.js

@@ -1,4 +1,4 @@
-import { b7, bL, A, aA, aC, ak, bn, aK, H, bB, bp, au, x, C, h, bP, an, aO, Z, bR, a1, a8, b_, ac, bq, bo, c1, aq, aU, v, ai, aZ, c0, bM, b1, D, aH, b3, b$, aI, ay, ba, bO, bQ, bz, al, a2, q, p, bS, I, aR, ax, s, br, bU, ap, aQ, ad, ae, U, af, aB, aj, a_, b2, V, M, bA, b6, N, J, c, az, Q, b9, aW, aV, bT, bl, f, bt, X, P, aM, t, _, bk, aJ, bY, bX, aF, aS, o, ao, aL, w, aT, aG, c5, bN, b4, bb, bc, am, R, a0, a6, a5, b5, a3, bZ, a4, a9, g, bG, bJ, bF, bE, bH, bI, bC, bu, bx, by, bw, bv, bs, bd, ar, aP, ag, l, bg, k, aD, c4, n, bh, aE, m, aw, aN, i, c3, at, av, aY, aX, as, S, b0, a$, c2, bD, bm, bi, bj, Y, bW, $, W, bV, a7, ab, aa, e, bK, ah, be, y, K, d, T, O, L, r, b, B, z, E, F, u, b8, G, bf, a } from "./index-7fe9ade3.js";
+import { b7, bL, A, aA, aC, ak, bn, aK, H, bB, bp, au, x, C, h, bP, an, aO, Z, bR, a1, a8, b_, ac, bq, bo, c1, aq, aU, v, ai, aZ, c0, bM, b1, D, aH, b3, b$, aI, ay, ba, bO, bQ, bz, al, a2, q, p, bS, I, aR, ax, s, br, bU, ap, aQ, ad, ae, U, af, aB, aj, a_, b2, V, M, bA, b6, N, J, c, az, Q, b9, aW, aV, bT, bl, f, bt, X, P, aM, t, _, bk, aJ, bY, bX, aF, aS, o, ao, aL, w, aT, aG, c5, bN, b4, bb, bc, am, R, a0, a6, a5, b5, a3, bZ, a4, a9, g, bG, bJ, bF, bE, bH, bI, bC, bu, bx, by, bw, bv, bs, bd, ar, aP, ag, l, bg, k, aD, c4, n, bh, aE, m, aw, aN, i, c3, at, av, aY, aX, as, S, b0, a$, c2, bD, bm, bi, bj, Y, bW, $, W, bV, a7, ab, aa, e, bK, ah, be, y, K, d, T, O, L, r, b, B, z, E, F, u, b8, G, bf, a } from "./index-d2d0cacc.js";
 import "@cloudtower/eagle";
 import "@refinedev/core";
 import "@cloudtower/icons-react";

package/dist/refine.umd.cjs

@@ -1060,7 +1060,7 @@ var __publicField = (obj, key, value) => {
   const redeploy$1 = "Redeploy";
   const data$1 = "Data";
   const resume$1 = "Resume";
-  const sessionAffinity$1 = "会话保持";
+  const sessionAffinity$1 = "Session Affinity";
   const log$1 = "Log";
   const ready$1 = "Ready";
   const updating$1 = "Updating";
@@ -1070,7 +1070,7 @@ var __publicField = (obj, key, value) => {
   const running$1 = "Running";
   const terminating$1 = "Terminating";
   const terminated$1 = "Terminated";
-  const succeeded$1 = "Succeed";
+  const succeeded$1 = "Succeeded";
   const unknown$1 = "Unknown";
   const pending$1 = "Pending";
   const waiting$1 = "Waiting";
@@ -10022,6 +10022,7 @@ var __publicField = (obj, key, value) => {
         }
         return {
           servicePort: p.port,
+          nodePort: p.nodePort,
           link,
           targetPort: p.targetPort,
           protocol: p.protocol
@@ -11405,7 +11406,7 @@ var __publicField = (obj, key, value) => {
             field: "",
             value: "",
             fn(item) {
-              return matchSelector(item, selector, item.metadata.namespace);
+              return matchSelector(item, selector, namespace2);
             }
           }]
         }
@@ -23105,7 +23106,7 @@ var __publicField = (obj, key, value) => {
                   ] }),
                   errorMsgs.length ? /* @__PURE__ */ jsxRuntimeExports.jsxs(kit.space, { className: ErrorWrapperStyle, size: 8, align: "start", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx(iconsReact.XmarkFailedSeriousWarningFill16RedIcon, { className: ErrorIconStyle }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: errorMsgs.map((errorMsg, index) => /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: ErrorMsgStyle, children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: errorMsgs.map((errorMsg, index) => /* @__PURE__ */ jsxRuntimeExports.jsxs("pre", { className: ErrorMsgStyle, children: [
                       errorMsgs.length > 1 ? `${index + 1}. ` : "",
                       errorMsg
                     ] }, errorMsg)) })
@@ -23539,17 +23540,28 @@ var __publicField = (obj, key, value) => {
       i18n: i18n2
     } = useTranslation();
     const FormWrapper = isShowLayout ? FormLayout : React.Fragment;
+    const formWrapperProps = isShowLayout ? {
+      saveButtonProps
+    } : {};
     const schema = React.useMemo(() => {
       return editorProps.schema || {};
     }, [editorProps.schema]);
     const responseErrors = React.useMemo(() => errorResponseBody ? getCommonErrors(errorResponseBody, i18n2) : [], [errorResponseBody, i18n2]);
     const onFinish = React.useCallback(async (store) => {
       var _a, _b;
-      const result = await ((_a = formProps.onFinish) == null ? void 0 : _a.call(formProps, store));
-      if (result) {
-        (_b = props.onFinish) == null ? void 0 : _b.call(props);
+      try {
+        const result = await ((_a = formProps.onFinish) == null ? void 0 : _a.call(formProps, store));
+        if (result) {
+          (_b = props.onFinish) == null ? void 0 : _b.call(props);
+        }
+      } catch {
+      } finally {
+        onSaveButtonPropsChange == null ? void 0 : onSaveButtonPropsChange({
+          ...saveButtonProps,
+          loading: false
+        });
       }
-    }, [formProps, props]);
+    }, [formProps, props, saveButtonProps, onSaveButtonPropsChange]);
     React.useEffect(() => {
       onSaveButtonPropsChange == null ? void 0 : onSaveButtonPropsChange(saveButtonProps);
     }, [saveButtonProps, onSaveButtonPropsChange]);
@@ -23557,7 +23569,7 @@ var __publicField = (obj, key, value) => {
       onErrorsChange == null ? void 0 : onErrorsChange(responseErrors);
     }, [responseErrors, onErrorsChange]);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(FormWrapper, {
-      saveButtonProps,
+      ...formWrapperProps,
       children: /* @__PURE__ */ jsxRuntimeExports.jsx(kit.form, {
         ...formProps,
         initialValues: formProps.initialValues,
@@ -23671,9 +23683,10 @@ var __publicField = (obj, key, value) => {
     const saveButtonProps = isYamlForm ? yamlSaveButtonProps : refineFormResult.formResult.saveButtonProps;
     const onCancel = React.useCallback(() => {
       popModal();
-    }, []);
+    }, [popModal]);
     const onOk = React.useCallback((e2) => {
       var _a2;
+      setIsError(false);
       (_a2 = saveButtonProps.onClick) == null ? void 0 : _a2.call(saveButtonProps, e2);
     }, [saveButtonProps]);
     const errorText = (() => {
@@ -23702,11 +23715,11 @@ var __publicField = (obj, key, value) => {
       }) : "",
       okButtonProps: {
         ...saveButtonProps,
-        children: (_e = config.formConfig) == null ? void 0 : _e.saveButtonText
+        children: (_e = config.formConfig) == null ? void 0 : _e.saveButtonText,
+        onClick: onOk
       },
       closeIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(CloseCircleFilled$1, {}),
       okText,
-      onOk,
       onCancel,
       destroyOnClose: true,
       fullscreen: true,
@@ -24087,7 +24100,7 @@ var __publicField = (obj, key, value) => {
       children: result
     });
   };
-  const columns_qgyagz = "";
+  const columns_1h38dp = "";
   const DashedTitleStyle = "dh5j833";
   const ServiceClusterTooltipStyle = "s1fcgan";
   const NameLink = (props) => {
@@ -24575,7 +24588,7 @@ var __publicField = (obj, key, value) => {
       sortable: true
     };
   };
-  const PortMappingColumnRenderer = (i18n2) => {
+  const PortMappingColumnRenderer = (i18n2, clusterVip) => {
     return {
       key: "displayPortMapping",
       title: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Tooltip, {
@@ -24596,8 +24609,9 @@ var __publicField = (obj, key, value) => {
               whiteSpace: "pre"
             },
             children: [record.displayType === "NodePort" ? /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Link, {
-              href: `//${v.link}`,
+              href: `//${clusterVip}:${v.nodePort}`,
               target: "_blank",
+              className: "ciistgu",
               children: v.servicePort
             }) : v.servicePort, " ", "> ", v.targetPort, "/", v.protocol]
           }),

package/dist/style.css

@@ -1541,6 +1541,7 @@
 .l25ca2k{padding:0 !important;}
 .dh5j833{border-bottom:1px dashed rgba(107,128,167,0.6);padding-bottom:1px;}
 .s1fcgan.ant-tooltip .ant-tooltip-inner{width:256px;}
+.ciistgu{padding:0 !important;}
 body,
 #root {
   height: 100%;

package/lib/src/components/Form/YamlForm.d.ts

@@ -19,6 +19,9 @@ export interface YamlFormProps {
     onSaveButtonPropsChange?: (saveButtonProps: {
         disabled?: boolean;
         onClick: () => void;
+        loading?: boolean | {
+            delay?: number | undefined;
+        };
     }) => void;
     onErrorsChange?: (errors: string[]) => void;
     onFinish?: () => void;

package/lib/src/hooks/useEagleTable/columns.d.ts

@@ -32,4 +32,4 @@ export declare const IngressClassColumnRenderer: <Model extends IngressModel>(i1
 export declare const IngressTlsColumnRenderer: <Model extends IngressModel>(i18n: I18nType) => Column<Model>;
 export declare const PodContainersNumColumnRenderer: <Model extends PodModel>(i18n: I18nType) => Column<Model>;
 export declare const DataKeysColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>(i18n: I18nType) => Column<Model>;
-export declare const PortMappingColumnRenderer: <Model extends ServiceModel>(i18n: I18nType) => Column<Model>;
+export declare const PortMappingColumnRenderer: <Model extends ServiceModel>(i18n: I18nType, clusterVip: string) => Column<Model>;

package/lib/src/models/service-model.d.ts

@@ -17,6 +17,7 @@ export declare class ServiceModel extends ResourceModel<ServiceType> {
     get dnsRecord(): string;
     get displayPortMapping(): {
         servicePort: number;
+        nodePort: number | undefined;
         link: string;
         targetPort: string | number | undefined;
         protocol: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "type": "module",
   "files": [
     "dist",