@dovetail-v2/refine 0.3.11-alpha.3 → 0.3.12-alpha.1

package/dist/components/Dropdowns/K8sDropdown/index.d.ts

@@ -4,6 +4,7 @@ export type DropdownSize = 'normal' | 'large';
 interface K8sDropdownProps {
     record: ResourceModel;
     size?: DropdownSize;
+    customButton?: React.ReactNode;
 }
 export declare function K8sDropdown(props: React.PropsWithChildren<K8sDropdownProps>): JSX.Element;
 export default K8sDropdown;

package/dist/components/ResourceLink/index.d.ts

@@ -4,7 +4,7 @@ type Props = {
     namespace: string;
     name: string;
     displayName?: string;
-    uid?: string;
+    query?: Record<string, unknown>;
 };
 export declare const ResourceLink: React.FC<Props>;
 export {};

package/dist/components/ShowContent/fields.d.ts

@@ -36,6 +36,7 @@ export interface ShowConfig<Model extends ResourceModel = ResourceModel> {
     basicGroup?: ShowGroup<Model>;
     tabs?: ShowTab<Model>[];
     renderExtraButton?: (record: Model) => React.ReactNode;
+    renderCustomBackButton?: (record: Model) => React.ReactNode;
     resourceStateMap?: {
         color: Record<string, StatusCapsuleColor | 'loading'>;
         text: Record<string, string>;

package/dist/refine.cjs

@@ -10647,7 +10647,7 @@ function validateNodePort(nodePort, allNodePorts, i18n2) {
 }
 function K8sDropdown(props) {
   var _a;
-  const { record, size = "normal" } = props;
+  const { record, size = "normal", customButton } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = core.useResource();
   const configs = React.useContext(ConfigsContext);
@@ -10707,7 +10707,7 @@ function K8sDropdown(props) {
         ) : null
       ] }),
       trigger: ["click"],
-      children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(
+      children: customButton || /* @__PURE__ */ common.jsxRuntimeExports.jsx(
         eagle.Button,
         {
           type: "quiet",
@@ -11117,7 +11117,7 @@ const ResourceLink = (props) => {
     resourceName,
     namespace: namespace2,
     name: name2,
-    uid,
+    query,
     displayName
   } = props;
   const navigation = core.useNavigation();
@@ -11142,7 +11142,9 @@ const ResourceLink = (props) => {
       to: navigation.showUrl(resourceName, ""),
       query: {
         id: namespace2 ? `${namespace2}/${name2}` : name2,
-        uid
+        // from is current resource by default
+        from: resourceName,
+        ...query
       },
       options: {
         keepQuery: true
@@ -12735,7 +12737,7 @@ const PVCRefField = (i18n2) => {
           resourceName: "persistentvolumeclaims",
           namespace: pv2.pvcNamespace || "default",
           name: value2,
-          uid: pv2.pvcUid
+          query: { uid: pv2.pvcUid }
         }
       );
     }
@@ -13479,7 +13481,7 @@ function BasicShowGroupComponent(props) {
   });
 }
 const ShowContentView = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const {
     id,
     resourceName,
@@ -13604,7 +13606,7 @@ const ShowContentView = (props) => {
   const stateDisplay = lodashEs.get(record, "stateDisplay");
   const topBar = /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
     className: ToolBarWrapper,
-    children: [!hideBackButton && /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
+    children: [!hideBackButton && !showConfig.renderCustomBackButton && /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
       className: common.cx_default(eagle.Typo.Label.l4_bold, BackButton),
       onClick: () => {
         go({
@@ -13622,7 +13624,7 @@ const ShowContentView = (props) => {
           children: (config == null ? void 0 : config.displayName) || resourceName
         })
       })
-    }), /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Space, {
+    }), (_a = showConfig.renderCustomBackButton) == null ? void 0 : _a.call(showConfig, record), /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Space, {
       className: TopBarStyle,
       children: [/* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
         style: {
@@ -13633,13 +13635,13 @@ const ShowContentView = (props) => {
           children: config.kind
         }), /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
           className: common.cx_default(eagle.Typo.Display.d2_regular_title, NameStyle),
-          children: ((_a = showConfig.displayName) == null ? void 0 : _a.call(showConfig, record)) || ((_b = record == null ? void 0 : record.metadata) == null ? void 0 : _b.name)
+          children: ((_b = showConfig.displayName) == null ? void 0 : _b.call(showConfig, record)) || ((_c = record == null ? void 0 : record.metadata) == null ? void 0 : _c.name)
         }), stateDisplay ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(StateTag, {
           state: stateDisplay,
           customResourceStateMap: showConfig.resourceStateMap
         }) : void 0]
       }), /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Space, {
-        children: [(_c = showConfig.renderExtraButton) == null ? void 0 : _c.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(core.CanAccess, {
+        children: [(_d = showConfig.renderExtraButton) == null ? void 0 : _d.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(core.CanAccess, {
           resource: resourceName,
           action: AccessControlAuth.Edit,
           params: {
@@ -13652,7 +13654,7 @@ const ShowContentView = (props) => {
             onClick: () => openForm({
               id
             }),
-            children: ((_d = config.formConfig) == null ? void 0 : _d.formType) === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(config.displayName || config.kind, i18n2.language)}` : t2("dovetail.edit_yaml")
+            children: ((_e = config.formConfig) == null ? void 0 : _e.formType) === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(config.displayName || config.kind, i18n2.language)}` : t2("dovetail.edit_yaml")
           })
         }) : null, /* @__PURE__ */ common.jsxRuntimeExports.jsx(Dropdown, {
           record,
@@ -19178,7 +19180,9 @@ const PVCRefColumnRenderer = (i18n2) => {
         resourceName: "persistentvolumeclaims",
         namespace: pv2.pvcNamespace || "default",
         name: value2,
-        uid: pv2.pvcUid
+        query: {
+          uid: pv2.pvcUid
+        }
       });
     }
   };

package/dist/refine.js

@@ -10628,7 +10628,7 @@ function validateNodePort(nodePort, allNodePorts, i18n2) {
 }
 function K8sDropdown(props) {
   var _a;
-  const { record, size = "normal" } = props;
+  const { record, size = "normal", customButton } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = useResource();
   const configs = useContext(ConfigsContext);
@@ -10688,7 +10688,7 @@ function K8sDropdown(props) {
         ) : null
       ] }),
       trigger: ["click"],
-      children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+      children: customButton || /* @__PURE__ */ jsxRuntimeExports.jsx(
         Button,
         {
           type: "quiet",
@@ -11098,7 +11098,7 @@ const ResourceLink = (props) => {
     resourceName,
     namespace: namespace2,
     name: name2,
-    uid,
+    query,
     displayName
   } = props;
   const navigation = useNavigation();
@@ -11123,7 +11123,9 @@ const ResourceLink = (props) => {
       to: navigation.showUrl(resourceName, ""),
       query: {
         id: namespace2 ? `${namespace2}/${name2}` : name2,
-        uid
+        // from is current resource by default
+        from: resourceName,
+        ...query
       },
       options: {
         keepQuery: true
@@ -12716,7 +12718,7 @@ const PVCRefField = (i18n2) => {
           resourceName: "persistentvolumeclaims",
           namespace: pv2.pvcNamespace || "default",
           name: value2,
-          uid: pv2.pvcUid
+          query: { uid: pv2.pvcUid }
         }
       );
     }
@@ -13460,7 +13462,7 @@ function BasicShowGroupComponent(props) {
   });
 }
 const ShowContentView = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const {
     id,
     resourceName,
@@ -13585,7 +13587,7 @@ const ShowContentView = (props) => {
   const stateDisplay = get$2(record, "stateDisplay");
   const topBar = /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
     className: ToolBarWrapper,
-    children: [!hideBackButton && /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
+    children: [!hideBackButton && !showConfig.renderCustomBackButton && /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
       className: cx_default(Typo.Label.l4_bold, BackButton),
       onClick: () => {
         go({
@@ -13603,7 +13605,7 @@ const ShowContentView = (props) => {
           children: (config == null ? void 0 : config.displayName) || resourceName
         })
       })
-    }), /* @__PURE__ */ jsxRuntimeExports.jsxs(Space, {
+    }), (_a = showConfig.renderCustomBackButton) == null ? void 0 : _a.call(showConfig, record), /* @__PURE__ */ jsxRuntimeExports.jsxs(Space, {
       className: TopBarStyle,
       children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
         style: {
@@ -13614,13 +13616,13 @@ const ShowContentView = (props) => {
           children: config.kind
         }), /* @__PURE__ */ jsxRuntimeExports.jsx("span", {
           className: cx_default(Typo.Display.d2_regular_title, NameStyle),
-          children: ((_a = showConfig.displayName) == null ? void 0 : _a.call(showConfig, record)) || ((_b = record == null ? void 0 : record.metadata) == null ? void 0 : _b.name)
+          children: ((_b = showConfig.displayName) == null ? void 0 : _b.call(showConfig, record)) || ((_c = record == null ? void 0 : record.metadata) == null ? void 0 : _c.name)
         }), stateDisplay ? /* @__PURE__ */ jsxRuntimeExports.jsx(StateTag, {
           state: stateDisplay,
           customResourceStateMap: showConfig.resourceStateMap
         }) : void 0]
       }), /* @__PURE__ */ jsxRuntimeExports.jsxs(Space, {
-        children: [(_c = showConfig.renderExtraButton) == null ? void 0 : _c.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ jsxRuntimeExports.jsx(CanAccess, {
+        children: [(_d = showConfig.renderExtraButton) == null ? void 0 : _d.call(showConfig, record), !config.hideEdit ? /* @__PURE__ */ jsxRuntimeExports.jsx(CanAccess, {
           resource: resourceName,
           action: AccessControlAuth.Edit,
           params: {
@@ -13633,7 +13635,7 @@ const ShowContentView = (props) => {
             onClick: () => openForm({
               id
             }),
-            children: ((_d = config.formConfig) == null ? void 0 : _d.formType) === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(config.displayName || config.kind, i18n2.language)}` : t2("dovetail.edit_yaml")
+            children: ((_e = config.formConfig) == null ? void 0 : _e.formType) === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(config.displayName || config.kind, i18n2.language)}` : t2("dovetail.edit_yaml")
           })
         }) : null, /* @__PURE__ */ jsxRuntimeExports.jsx(Dropdown2, {
           record,
@@ -19159,7 +19161,9 @@ const PVCRefColumnRenderer = (i18n2) => {
         resourceName: "persistentvolumeclaims",
         namespace: pv2.pvcNamespace || "default",
         name: value2,
-        uid: pv2.pvcUid
+        query: {
+          uid: pv2.pvcUid
+        }
       });
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.3.11-alpha.3",
+  "version": "0.3.12-alpha.1",
   "type": "module",
   "files": [
     "dist",