@dovetail-v2/refine 0.2.4 → 0.2.6

package/dist/{MonacoYamlDiffEditor-e0b05820.js → MonacoYamlDiffEditor-a6fe7989.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "./index-d8439125.js";
+import { j as jsxRuntimeExports } from "./index-d9e1f169.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "dayjs";

package/dist/{MonacoYamlEditor-96d9a48c.js → MonacoYamlEditor-9a71461b.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports, c as cx_default, Y as YamlEditorStyle } from "./index-d8439125.js";
+import { j as jsxRuntimeExports, c as cx_default, Y as YamlEditorStyle } from "./index-d9e1f169.js";
 import * as monaco from "monaco-editor";
 import { setDiagnosticsOptions } from "monaco-yaml";
 import { useRef, useEffect } from "react";

package/dist/{index-d8439125.js → index-d9e1f169.js}

@@ -9239,7 +9239,7 @@ function EditFieldModal(props) {
   const close2 = useCallback(() => {
     popModal();
     reset();
-  }, [reset]);
+  }, [popModal, reset]);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(Modal, {
     className: fullscreen ? FullscreenModalStyle : SmallModalStyle,
     title: title || i18n2.t("dovetail.edit"),
@@ -9273,6 +9273,9 @@ function EditField(props) {
   return /* @__PURE__ */ jsxRuntimeExports.jsx(CanAccess, {
     resource: resource == null ? void 0 : resource.name,
     action: AccessControlAuth.Edit,
+    params: {
+      namespace: modalProps.namespace
+    },
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, {
       className: cx_default(EditButtonStyle, Typo.Label.l4_regular_title),
       type: "link",
@@ -9484,6 +9487,7 @@ function PVCDistributeStorage({ pvc: pvc2, editable }) {
         modalProps: {
           formRef,
           title: t2("dovetail.edit_distribute_storage"),
+          namespace: pvc2.namespace || "",
           renderContent() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(
               DistributeStorageForm,
@@ -11180,11 +11184,17 @@ function K8sDropdown(props) {
   const isInShowPage = useResourceResult.action === "show";
   const { data: canEditData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Edit
+    action: AccessControlAuth.Edit,
+    params: {
+      namespace: record.namespace
+    }
   });
   const { data: canDeleteData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Delete
+    action: AccessControlAuth.Delete,
+    params: {
+      namespace: record.namespace
+    }
   });
   const formType = ((_a = config.formConfig) == null ? void 0 : _a.formType) || FormType.FORM;
   return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -12050,6 +12060,9 @@ const ShowContent = (props) => {
         children: [(_e = showConfig.renderExtraButton) == null ? void 0 : _e.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ jsxRuntimeExports.jsx(CanAccess, {
           resource: resource == null ? void 0 : resource.name,
           action: AccessControlAuth.Edit,
+          params: {
+            namespace: record.namespace
+          },
           children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, {
             style: {
               marginRight: 8
@@ -12899,6 +12912,7 @@ function WorkloadReplicas({
             modalProps: {
               formRef,
               title: t2("dovetail.edit_replicas"),
+              namespace: record.namespace || "",
               renderContent() {
                 return /* @__PURE__ */ jsxRuntimeExports.jsx(WorkloadReplicasForm, {
                   ref: formRef,
@@ -13611,7 +13625,7 @@ const PodLogTab = (i18n2) => ({
   ]
 });
 const NetworkPolicyRulesViewer_r6jity = "";
-const MonacoYamlEditor$1 = lazy(() => import("./MonacoYamlEditor-96d9a48c.js"));
+const MonacoYamlEditor$1 = lazy(() => import("./MonacoYamlEditor-9a71461b.js"));
 const EditorStyle$1 = "e1cjl2b8";
 const NetworkPolicyRulesViewer = ({
   ingressOrEgress,
@@ -14036,7 +14050,10 @@ function WorkloadDropdown(props) {
   const { t: t2 } = useTranslation();
   const { data: canEditData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Edit
+    action: AccessControlAuth.Edit,
+    params: {
+      namespace: record.namespace
+    }
   });
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(K8sDropdown, { record, size, children: [
     (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -14091,7 +14108,10 @@ function ReplicasDropdown(props) {
   const isInShowPage = action === "show";
   const { data: canEditData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Edit
+    action: AccessControlAuth.Edit,
+    params: {
+      namespace: record.namespace
+    }
   });
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(WorkloadDropdown, { record, size, children: [
     isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -14101,6 +14121,7 @@ function ReplicasDropdown(props) {
           const modalProps = {
             formRef,
             title: t2("dovetail.edit_replicas"),
+            namespace: record.namespace || "",
             renderContent() {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(
                 WorkloadReplicasForm,
@@ -16447,7 +16468,10 @@ function PodDropdown(props) {
   const pushModal = usePushModal();
   const { data: canEditData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Edit
+    action: AccessControlAuth.Edit,
+    params: {
+      namespace: record.namespace
+    }
   });
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(K8sDropdown, { record, size, children: [
     (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -17696,8 +17720,8 @@ const PlainCodeStyle = "pqch97v";
 const ErrorMsgStyle = "eh2qjnl";
 const ErrorWrapperStyle = "e19q2bnp";
 const YamlEditorStyle = "y16u5v3w";
-const MonacoYamlEditor = React__default.lazy(() => import("./MonacoYamlEditor-96d9a48c.js"));
-const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-e0b05820.js"));
+const MonacoYamlEditor = React__default.lazy(() => import("./MonacoYamlEditor-9a71461b.js"));
+const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-a6fe7989.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -18846,7 +18870,10 @@ function CronJobDropdown(props) {
   const { t: t2 } = useTranslation();
   const { data: canEditData } = useCan({
     resource: resource == null ? void 0 : resource.name,
-    action: AccessControlAuth.Edit
+    action: AccessControlAuth.Edit,
+    params: {
+      namespace: record.namespace
+    }
   });
   const suspended = Boolean(spec == null ? void 0 : spec.suspend);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(K8sDropdown, { record, size, children: (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -18965,7 +18992,8 @@ function EditLabelDropdownMenuItem(props) {
           fullscreen: true,
           renderContent() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(EditLabelForm, { ref: formRef, resourceModel });
-          }
+          },
+          namespace: resourceModel.namespace || ""
         };
         pushModal({
           component: EditFieldModal,
@@ -19049,6 +19077,7 @@ function EditAnnotationDropdownMenuItem(props) {
           formRef,
           title: t2("dovetail.edit_annotation"),
           fullscreen: true,
+          namespace: resourceModel.namespace || "",
           renderContent() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(EditAnnotationForm, { ref: formRef, resourceModel });
           }
@@ -19080,7 +19109,8 @@ function EditNodeTaintDropdownMenuItem(props) {
           fullscreen: true,
           renderContent() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(EditNodeTaintForm, { ref: formRef, nodeModel: resourceModel });
-          }
+          },
+          namespace: resourceModel.namespace || ""
         };
         pushModal({
           component: EditFieldModal,

package/dist/refine.js

@@ -1,4 +1,4 @@
-import { bR, cH, A, a_, b0, aJ, cf, bo, a5, ct, ch, aU, X, C, m, cN, aM, bt, ag, cP, am, at, cY, aB, ci, cg, c$, aQ, bA, z, aH, bH, c_, cI, bK, D, b5, aw, bN, av, ax, a4, ce, cd, cZ, bm, aY, cK, ah, bU, cM, cL, cO, cr, aK, an, w, v, cQ, I, bx, aX, x, T, bi, bk, cj, cS, aP, bw, au, aC, aD, ac, aE, a$, aI, bI, bL, ad, d9, cs, cC, bQ, N, a6, h, aZ, aa, bT, bC, bB, cR, c4, d4, k, d3, aN, bu, cl, Q, be, bf, bs, L, bg, M, bh, G, b9, cF, F, b8, K, bc, H, ba, J, bb, O, c5, bd, cE, ae, d7, d6, P, bq, y, ai, al, c3, bn, cW, cV, b3, by, cb, ca, t, aO, bp, B, bz, b4, d8, E, cv, cJ, bO, bW, bX, db, aL, R, ak, ar, aq, bP, ao, cX, c7, ap, cG, cc, bl, bE, ay, l, V, U, bj, cy, cB, cx, cw, cz, cA, cu, cm, cp, cq, co, cn, ck, cD, bY, aR, bv, aF, p, b$, o, b1, d2, s, c0, b2, q, aW, br, n, d1, aT, aV, c9, bG, bF, c8, aS, S, bJ, d0, d5, b6, b7, bD, bM, c6, c1, c2, af, a3, cU, aj, W, cT, as, aA, az, i, aG, bZ, Z, a7, d, de, dd, dg, di, da, ab, dh, dc, bV, df, a9, a8, r, a, e, f, $, _, a0, g, a1, u, bS, a2, b_, b } from "./index-d8439125.js";
+import { bR, cH, A, a_, b0, aJ, cf, bo, a5, ct, ch, aU, X, C, m, cN, aM, bt, ag, cP, am, at, cY, aB, ci, cg, c$, aQ, bA, z, aH, bH, c_, cI, bK, D, b5, aw, bN, av, ax, a4, ce, cd, cZ, bm, aY, cK, ah, bU, cM, cL, cO, cr, aK, an, w, v, cQ, I, bx, aX, x, T, bi, bk, cj, cS, aP, bw, au, aC, aD, ac, aE, a$, aI, bI, bL, ad, d9, cs, cC, bQ, N, a6, h, aZ, aa, bT, bC, bB, cR, c4, d4, k, d3, aN, bu, cl, Q, be, bf, bs, L, bg, M, bh, G, b9, cF, F, b8, K, bc, H, ba, J, bb, O, c5, bd, cE, ae, d7, d6, P, bq, y, ai, al, c3, bn, cW, cV, b3, by, cb, ca, t, aO, bp, B, bz, b4, d8, E, cv, cJ, bO, bW, bX, db, aL, R, ak, ar, aq, bP, ao, cX, c7, ap, cG, cc, bl, bE, ay, l, V, U, bj, cy, cB, cx, cw, cz, cA, cu, cm, cp, cq, co, cn, ck, cD, bY, aR, bv, aF, p, b$, o, b1, d2, s, c0, b2, q, aW, br, n, d1, aT, aV, c9, bG, bF, c8, aS, S, bJ, d0, d5, b6, b7, bD, bM, c6, c1, c2, af, a3, cU, aj, W, cT, as, aA, az, i, aG, bZ, Z, a7, d, de, dd, dg, di, da, ab, dh, dc, bV, df, a9, a8, r, a, e, f, $, _, a0, g, a1, u, bS, a2, b_, b } from "./index-d9e1f169.js";
 import "@cloudtower/eagle";
 import "@refinedev/core";
 import "react";

package/dist/refine.umd.cjs

@@ -9236,7 +9236,7 @@ var __publicField = (obj, key, value) => {
     const close2 = React.useCallback(() => {
       popModal();
       reset();
-    }, [reset]);
+    }, [popModal, reset]);
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(eagle.Modal, {
       className: fullscreen ? FullscreenModalStyle : SmallModalStyle,
       title: title || i18n2.t("dovetail.edit"),
@@ -9270,6 +9270,9 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(core.CanAccess, {
       resource: resource == null ? void 0 : resource.name,
       action: AccessControlAuth.Edit,
+      params: {
+        namespace: modalProps.namespace
+      },
       children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Button, {
         className: cx_default(EditButtonStyle, eagle.Typo.Label.l4_regular_title),
         type: "link",
@@ -9481,6 +9484,7 @@ var __publicField = (obj, key, value) => {
           modalProps: {
             formRef,
             title: t2("dovetail.edit_distribute_storage"),
+            namespace: pvc2.namespace || "",
             renderContent() {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(
                 DistributeStorageForm,
@@ -11177,11 +11181,17 @@ var __publicField = (obj, key, value) => {
     const isInShowPage = useResourceResult.action === "show";
     const { data: canEditData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Edit
+      action: AccessControlAuth.Edit,
+      params: {
+        namespace: record.namespace
+      }
     });
     const { data: canDeleteData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Delete
+      action: AccessControlAuth.Delete,
+      params: {
+        namespace: record.namespace
+      }
     });
     const formType = ((_a = config.formConfig) == null ? void 0 : _a.formType) || FormType.FORM;
     return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -12047,6 +12057,9 @@ var __publicField = (obj, key, value) => {
           children: [(_e = showConfig.renderExtraButton) == null ? void 0 : _e.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ jsxRuntimeExports.jsx(core.CanAccess, {
             resource: resource == null ? void 0 : resource.name,
             action: AccessControlAuth.Edit,
+            params: {
+              namespace: record.namespace
+            },
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Button, {
               style: {
                 marginRight: 8
@@ -12896,6 +12909,7 @@ var __publicField = (obj, key, value) => {
               modalProps: {
                 formRef,
                 title: t2("dovetail.edit_replicas"),
+                namespace: record.namespace || "",
                 renderContent() {
                   return /* @__PURE__ */ jsxRuntimeExports.jsx(WorkloadReplicasForm, {
                     ref: formRef,
@@ -14033,7 +14047,10 @@ var __publicField = (obj, key, value) => {
     const { t: t2 } = useTranslation();
     const { data: canEditData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Edit
+      action: AccessControlAuth.Edit,
+      params: {
+        namespace: record.namespace
+      }
     });
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(K8sDropdown, { record, size, children: [
       (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -14088,7 +14105,10 @@ var __publicField = (obj, key, value) => {
     const isInShowPage = action === "show";
     const { data: canEditData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Edit
+      action: AccessControlAuth.Edit,
+      params: {
+        namespace: record.namespace
+      }
     });
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(WorkloadDropdown, { record, size, children: [
       isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -14098,6 +14118,7 @@ var __publicField = (obj, key, value) => {
             const modalProps = {
               formRef,
               title: t2("dovetail.edit_replicas"),
+              namespace: record.namespace || "",
               renderContent() {
                 return /* @__PURE__ */ jsxRuntimeExports.jsx(
                   WorkloadReplicasForm,
@@ -16444,7 +16465,10 @@ var __publicField = (obj, key, value) => {
     const pushModal = eagle.usePushModal();
     const { data: canEditData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Edit
+      action: AccessControlAuth.Edit,
+      params: {
+        namespace: record.namespace
+      }
     });
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(K8sDropdown, { record, size, children: [
       (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -18843,7 +18867,10 @@ var __publicField = (obj, key, value) => {
     const { t: t2 } = useTranslation();
     const { data: canEditData } = core.useCan({
       resource: resource == null ? void 0 : resource.name,
-      action: AccessControlAuth.Edit
+      action: AccessControlAuth.Edit,
+      params: {
+        namespace: record.namespace
+      }
     });
     const suspended = Boolean(spec == null ? void 0 : spec.suspend);
     return /* @__PURE__ */ jsxRuntimeExports.jsx(K8sDropdown, { record, size, children: (canEditData == null ? void 0 : canEditData.can) !== false ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -18962,7 +18989,8 @@ var __publicField = (obj, key, value) => {
             fullscreen: true,
             renderContent() {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(EditLabelForm, { ref: formRef, resourceModel });
-            }
+            },
+            namespace: resourceModel.namespace || ""
           };
           pushModal({
             component: EditFieldModal,
@@ -19046,6 +19074,7 @@ var __publicField = (obj, key, value) => {
             formRef,
             title: t2("dovetail.edit_annotation"),
             fullscreen: true,
+            namespace: resourceModel.namespace || "",
             renderContent() {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(EditAnnotationForm, { ref: formRef, resourceModel });
             }
@@ -19077,7 +19106,8 @@ var __publicField = (obj, key, value) => {
             fullscreen: true,
             renderContent() {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(EditNodeTaintForm, { ref: formRef, nodeModel: resourceModel });
-            }
+            },
+            namespace: resourceModel.namespace || ""
           };
           pushModal({
             component: EditFieldModal,

package/lib/components/EditField/index.d.ts

@@ -11,6 +11,7 @@ export interface EditFieldModalProps {
     } | null>;
     renderContent: () => React.ReactNode;
     fullscreen?: boolean;
+    namespace: string;
 }
 export declare function EditFieldModal(props: EditFieldModalProps): JSX.Element;
 export interface EditField {

package/lib/components/TableToolbar/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 type Props = {
     title?: string;
-    description?: string;
+    description?: React.ReactNode;
     selectedKeys: string[];
     hideCreate?: boolean;
 };

package/lib/types/resource.d.ts

@@ -166,7 +166,7 @@ export type ResourceConfig<Model extends ResourceModel = ResourceModel> = {
     /** 是否隐藏创建功能 */
     hideCreate?: boolean;
     /** 资源的描述信息 */
-    description?: string;
+    description?: React.ReactNode;
     /** 父级资源名称，用于建立资源层级关系。在 Dovetail2 中用不到这个 */
     parent?: string;
     /** 格式化数据参数，目前暂未完全实现，可能会删除 */

package/package.json

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