@dovetail-v2/refine 0.0.48-alpha.0 → 0.0.49-alpha.0

package/dist/{MonacoYamlDiffEditor-ed04648b.js → MonacoYamlDiffEditor-7cb1e598.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "./index-04f52e89.js";
+import { j as jsxRuntimeExports } from "./index-8f27c902.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "i18next";

package/dist/{index-04f52e89.js → index-8f27c902.js}

@@ -10,7 +10,7 @@ import React__default, { createElement, isValidElement, cloneElement, Children,
 import { ResourceContext, matchResourceFromRoute, useResource, useDelete, useNavigation, useBreadcrumb, useList, useParsed, useGo, useCan, useTable, useDeleteMany, CanAccess, useShow, useUpdate, useDataProvider, useRefineContext, useTranslate, useWarnAboutChange, useForm as useForm$2, flattenObjectKeys, pickNotDeprecated, useMenu, Refine } from "@refinedev/core";
 import { parse, stringify } from "qs";
 import { useLocation, useHistory, useParams, matchPath, Link, Route, NavLink, Router } from "react-router-dom";
-import { Typo, Tag, useUIKit, kitContext, Link as Link$1, OverflowTooltip, Tooltip, StatusCapsule, pushModal, Icon as Icon$1, Button, popModal, Loading, Divider, Fields, Space, Form, Modal, useMessage, ModalStack, KitStoreProvider } from "@cloudtower/eagle";
+import { Typo, Tag, useUIKit, kitContext, Link as Link$1, OverflowTooltip, Tooltip, StatusCapsule, usePushModal, Icon as Icon$1, Button, usePopModal, Loading, Divider, Fields, Space, Form, Modal, useMessage, ModalStack, KitStoreProvider } from "@cloudtower/eagle";
 import { EditPen16PrimaryIcon, Download16GradientBlueIcon, TrashBinDelete16Icon, MoreEllipsis324BoldSecondaryIcon, MoreEllipsis324BoldBlueIcon, MoreEllipsis316BoldBlueIcon, PlusAddCreateNew16BoldOntintIcon, ArrowChevronLeft16BoldTertiaryIcon, ArrowChevronLeftSmall16BoldBlueIcon, EditPen16GradientBlueIcon, ViewEye16GradientGrayIcon, EntityFilterIgnoreGradient16GrayIcon, RecoverContinue16GradientBlueIcon, SuspendedPause16GradientBlueIcon, Retry16GradientBlueIcon, HierarchyTriangleRight16GrayIcon, HierarchyTriangleRight16BlueIcon, ClipboardCopy16GradientGrayIcon, ClipboardCopy16GradientBlueIcon, Retry16GradientGrayIcon, EditPen16GradientGrayIcon, Showdiff16GradientGrayIcon, Showdiff16GradientBlueIcon, XmarkFailedSeriousWarningFill16RedIcon, ExclamationErrorCircleFill16RedIcon, Pause16GradientBlueIcon } from "@cloudtower/icons-react";
 import { omit as omit$1, merge, get as get$3, first, debounce, last, isObject as isObject$4, keyBy } from "lodash-es";
 import yaml from "js-yaml";
@@ -1010,7 +1010,7 @@ function useTranslation(ns) {
 }
 const copy$1 = "Copy";
 const reset_arguments$1 = "Reset";
-const view_changes$1 = "Show diff";
+const view_changes$1 = "Show Diff";
 const back_to_edit$1 = "Edit";
 const configure_file$1 = "Configuration";
 const yaml_format_wrong$1 = "Configuration is in an invalid YAML format.";
@@ -1023,7 +1023,7 @@ const obtain_data_error$1 = "Having trouble getting data.";
 const retry$1 = "Retry";
 const create_resource$1 = "Create {{resource}}";
 const edit_resource$1 = "Edit {{resource}}";
-const state$1 = "State";
+const state$1 = "Status";
 const name$1 = "Name";
 const pod$1 = "Pod";
 const cancel$1 = "Cancel";
@@ -1047,7 +1047,7 @@ const save$1 = "Save";
 const workload$1 = "Workload";
 const empty$1 = "No data available";
 const schedule$1 = "Schedule";
-const lastScheduleTime$1 = "Last schedule";
+const lastScheduleTime$1 = "Last Schedule";
 const duration$1 = "Duration";
 const started$1 = "Start time";
 const container$1 = "Container";
@@ -1074,7 +1074,7 @@ const rule$1 = "Rule";
 const port$1 = "Port";
 const cert$1 = "Certificate";
 const ip_address$1 = "IP address";
-const last_seen$1 = "Last seen";
+const last_seen$1 = "Last Seen";
 const node_port$1 = "NodePort";
 const protocol$1 = "Protocol";
 const key$1 = "Key";
@@ -1144,9 +1144,9 @@ const regular_container$1 = "Regular container";
 const suspend$1 = "Suspend";
 const default_backend$1 = "Default backend";
 const ingress_class$1 = "IngressClass";
-const pod_ready_num$1 = "Ready pod";
-const pod_complete_num$1 = "Completion pod";
-const pod_replicas_num$1 = "Desired pod";
+const pod_ready_num$1 = "Ready Pod";
+const pod_complete_num$1 = "Completion Pod";
+const pod_replicas_num$1 = "Desired Pod";
 const edit_replicas$1 = "Edit expected number of replicas";
 const dns_record$1 = "DNS record";
 const basic_info$1 = "Basic information";
@@ -9552,15 +9552,17 @@ var AccessControlAuth = /* @__PURE__ */ ((AccessControlAuth2) => {
   AccessControlAuth2["Create"] = "Create";
   return AccessControlAuth2;
 })(AccessControlAuth || {});
-function matchSelector(pod2, selector) {
+function matchSelector(pod2, selector, namespace2 = "default") {
   var _a, _b, _c;
   let match = true;
-  for (const key2 in selector.matchLabels) {
-    if (!((_b = (_a = pod2.metadata) == null ? void 0 : _a.labels) == null ? void 0 : _b[key2]) || ((_c = pod2.metadata.labels) == null ? void 0 : _c[key2]) !== selector.matchLabels[key2]) {
-      match = false;
+  if (selector) {
+    for (const key2 in selector.matchLabels) {
+      if (!((_b = (_a = pod2.metadata) == null ? void 0 : _a.labels) == null ? void 0 : _b[key2]) || ((_c = pod2.metadata.labels) == null ? void 0 : _c[key2]) !== selector.matchLabels[key2]) {
+        match = false;
+      }
     }
   }
-  return match;
+  return match && pod2.metadata.namespace === namespace2;
 }
 function shortenedImage(image2) {
   return (image2 || "").replace(/^(index\.)?docker.io\/(library\/)?/, "").replace(/:latest$/, "").replace(/^(.*@sha256:)([0-9a-f]{8})[0-9a-f]+$/i, "$1$2…");
@@ -9600,8 +9602,8 @@ class JobModel extends WorkloadBaseModel {
     });
     const myPods = pods.items.filter(
       (p) => {
-        var _a, _b;
-        return ((_a = this.spec) == null ? void 0 : _a.selector) ? matchSelector(p, (_b = this.spec) == null ? void 0 : _b.selector) : false;
+        var _a;
+        return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
       }
     );
     const result = lodashExports.sumBy(myPods, "restartCount");
@@ -9665,8 +9667,8 @@ class WorkloadModel extends WorkloadBaseModel {
     });
     const myPods = pods.items.filter(
       (p) => {
-        var _a, _b;
-        return ((_a = this.spec) == null ? void 0 : _a.selector) ? matchSelector(p, (_b = this.spec) == null ? void 0 : _b.selector) : false;
+        var _a;
+        return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
       }
     );
     const result = lodashExports.sumBy(myPods, "restartCount");
@@ -9823,7 +9825,10 @@ class PodModel extends WorkloadBaseModel {
   get restartCount() {
     var _a, _b;
     if ((_a = this._rawYaml.status) == null ? void 0 : _a.containerStatuses) {
-      return ((_b = this._rawYaml.status) == null ? void 0 : _b.containerStatuses[0].restartCount) || 0;
+      return ((_b = this._rawYaml.status) == null ? void 0 : _b.containerStatuses.reduce((count, container2) => {
+        count += container2.restartCount;
+        return count;
+      }, 0)) || 0;
     }
     return 0;
   }
@@ -10416,6 +10421,7 @@ function useOpenForm(options) {
   const configs = useContext(ConfigsContext);
   const { edit: edit2 } = useEdit();
   const navigation = useNavigation();
+  const pushModal = usePushModal();
   const go = useGo();
   return function openForm() {
     var _a, _b;
@@ -11336,6 +11342,7 @@ function KeyValueSecret(props) {
 }
 const WorkloadPodsTable_1giuese = "";
 const WorkloadPodsTable = ({
+  namespace: namespace2,
   selector,
   hideToolbar
 }) => {
@@ -11371,7 +11378,7 @@ const WorkloadPodsTable = ({
           field: "",
           value: "",
           fn(item) {
-            return selector ? matchSelector(item, selector) : true;
+            return matchSelector(item, selector, item.metadata.namespace);
           }
         }]
       }
@@ -11520,6 +11527,7 @@ function EditFieldModal(props) {
   const {
     i18n: i18n2
   } = useTranslation();
+  const popModal = usePopModal();
   const {
     submitting,
     errorMsgs,
@@ -11564,6 +11572,7 @@ function EditField(props) {
   const {
     resource
   } = useResource();
+  const pushModal = usePushModal();
   return /* @__PURE__ */ jsxRuntimeExports.jsx(CanAccess, {
     resource: resource == null ? void 0 : resource.name,
     action: AccessControlAuth.Edit,
@@ -11796,6 +11805,7 @@ const PodsField = () => {
           selector: (_b = (_a = record.metadata.relations) == null ? void 0 : _a.find((r2) => {
             return r2.kind === "Pod" && r2.type === "creates";
           })) == null ? void 0 : _b.selector,
+          namespace: record.metadata.namespace,
           hideToolbar: true
         }
       );
@@ -11889,6 +11899,7 @@ const ServicePodsField = () => {
           selector: (_b = (_a = record.metadata.relations) == null ? void 0 : _a.find((r2) => {
             return r2.kind === "Pod" && r2.type === "selects";
           })) == null ? void 0 : _b.selector,
+          namespace: record.metadata.namespace,
           hideToolbar: true
         }
       );
@@ -18390,6 +18401,7 @@ function ReplicasDropdown(props) {
   const { record, size, children } = props;
   const kit = useUIKit();
   const { t: t2 } = useTranslation();
+  const pushModal = usePushModal();
   const formRef = useRef(null);
   const { action, resource } = useResource();
   const isInShowPage = action === "show";
@@ -22864,7 +22876,7 @@ const Separator = () => {
   });
 };
 const MonacoYamlEditor = React__default.lazy(() => Promise.resolve().then(() => MonacoYamlEditor$2));
-const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-ed04648b.js"));
+const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-7cb1e598.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -23480,9 +23492,6 @@ function YamlForm(props) {
     errorNotification: false,
     transformInitValues,
     transformApplyValues,
-    mutationMeta: {
-      updateType: "put"
-    },
     ...useFormProps
   });
   const kit = useUIKit();
@@ -23568,6 +23577,7 @@ function FormModal(props) {
   const configs = useContext(ConfigsContext);
   const [yamlSaveButtonProps, setYamlSaveButtonProps] = useState({});
   const [isError, setIsError] = useState(false);
+  const popModal = usePopModal();
   const config = configs[resourceFromProps || (resource == null ? void 0 : resource.name) || ""];
   const okText = i18n2.t(id ? "dovetail.save" : "dovetail.create");
   const action = id ? "edit" : "create";
@@ -23588,7 +23598,7 @@ function FormModal(props) {
       onErrorsChange(errors) {
         setIsError(!!errors.length);
       },
-      onFinish: popModal
+      onFinish: usePopModal
     };
   }, [props.formProps, (_a = config.formConfig) == null ? void 0 : _a.transformInitValues, (_b = config.formConfig) == null ? void 0 : _b.transformApplyValues, config == null ? void 0 : config.initValue, id, action]);
   const refineFormResult = useRefineForm({
@@ -24160,7 +24170,7 @@ const WorkloadRestartsColumnRenderer = (i18n2) => {
     dataIndex,
     align: "right",
     title: i18n2.t("dovetail.restarts"),
-    sortable: true
+    sortable: false
   };
 };
 const ReplicasColumnRenderer = (i18n2) => {
@@ -24170,7 +24180,7 @@ const ReplicasColumnRenderer = (i18n2) => {
     display: true,
     dataIndex,
     title: /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip, {
-      title: i18n2.t("dovetail.ready_num_tooltip"),
+      title: i18n2.t("dovetail.completion_num_tooltip"),
       children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", {
         className: DashedTitleStyle,
         children: i18n2.t("dovetail.pod_num")
@@ -24191,7 +24201,6 @@ const AgeColumnRenderer = (i18n2, config, {
   isRelativeTime = true
 } = {}) => {
   const dataIndex = ["metadata", "creationTimestamp"];
-  const kit = useUIKit();
   return {
     key: "creationTimestamp",
     display: true,
@@ -24203,11 +24212,7 @@ const AgeColumnRenderer = (i18n2, config, {
       return isRelativeTime ? /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
         date: new Date(value2)
       }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
-        value: /* @__PURE__ */ jsxRuntimeExports.jsx(kit.time, {
-          date: value2,
-          timeTemplate: "HH:mm:ss",
-          dateTemplate: "YYYY-MM-DD"
-        })
+        value: dayjs(value2).format("YYYY-MM-DD hh:mm:ss")
       });
     },
     ...config
@@ -24548,8 +24553,8 @@ const PortMappingColumnRenderer = (i18n2) => {
         }),
         tooltip: `${v.servicePort} > ${v.targetPort}/${v.protocol}`
       }, v.servicePort));
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
-        value: content
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, {
+        children: content
       });
     }
   };

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-04f52e89.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-8f27c902.js";
 import "@cloudtower/eagle";
 import "@refinedev/core";
 import "@cloudtower/icons-react";

package/dist/refine.umd.cjs

@@ -1016,7 +1016,7 @@ var __publicField = (obj, key, value) => {
   }
   const copy$1 = "Copy";
   const reset_arguments$1 = "Reset";
-  const view_changes$1 = "Show diff";
+  const view_changes$1 = "Show Diff";
   const back_to_edit$1 = "Edit";
   const configure_file$1 = "Configuration";
   const yaml_format_wrong$1 = "Configuration is in an invalid YAML format.";
@@ -1029,7 +1029,7 @@ var __publicField = (obj, key, value) => {
   const retry$1 = "Retry";
   const create_resource$1 = "Create {{resource}}";
   const edit_resource$1 = "Edit {{resource}}";
-  const state$1 = "State";
+  const state$1 = "Status";
   const name$1 = "Name";
   const pod$1 = "Pod";
   const cancel$1 = "Cancel";
@@ -1053,7 +1053,7 @@ var __publicField = (obj, key, value) => {
   const workload$1 = "Workload";
   const empty$1 = "No data available";
   const schedule$1 = "Schedule";
-  const lastScheduleTime$1 = "Last schedule";
+  const lastScheduleTime$1 = "Last Schedule";
   const duration$1 = "Duration";
   const started$1 = "Start time";
   const container$1 = "Container";
@@ -1080,7 +1080,7 @@ var __publicField = (obj, key, value) => {
   const port$1 = "Port";
   const cert$1 = "Certificate";
   const ip_address$1 = "IP address";
-  const last_seen$1 = "Last seen";
+  const last_seen$1 = "Last Seen";
   const node_port$1 = "NodePort";
   const protocol$1 = "Protocol";
   const key$1 = "Key";
@@ -1150,9 +1150,9 @@ var __publicField = (obj, key, value) => {
   const suspend$1 = "Suspend";
   const default_backend$1 = "Default backend";
   const ingress_class$1 = "IngressClass";
-  const pod_ready_num$1 = "Ready pod";
-  const pod_complete_num$1 = "Completion pod";
-  const pod_replicas_num$1 = "Desired pod";
+  const pod_ready_num$1 = "Ready Pod";
+  const pod_complete_num$1 = "Completion Pod";
+  const pod_replicas_num$1 = "Desired Pod";
   const edit_replicas$1 = "Edit expected number of replicas";
   const dns_record$1 = "DNS record";
   const basic_info$1 = "Basic information";
@@ -9558,15 +9558,17 @@ var __publicField = (obj, key, value) => {
     AccessControlAuth2["Create"] = "Create";
     return AccessControlAuth2;
   })(AccessControlAuth || {});
-  function matchSelector(pod2, selector) {
+  function matchSelector(pod2, selector, namespace2 = "default") {
     var _a, _b, _c;
     let match = true;
-    for (const key2 in selector.matchLabels) {
-      if (!((_b = (_a = pod2.metadata) == null ? void 0 : _a.labels) == null ? void 0 : _b[key2]) || ((_c = pod2.metadata.labels) == null ? void 0 : _c[key2]) !== selector.matchLabels[key2]) {
-        match = false;
+    if (selector) {
+      for (const key2 in selector.matchLabels) {
+        if (!((_b = (_a = pod2.metadata) == null ? void 0 : _a.labels) == null ? void 0 : _b[key2]) || ((_c = pod2.metadata.labels) == null ? void 0 : _c[key2]) !== selector.matchLabels[key2]) {
+          match = false;
+        }
       }
     }
-    return match;
+    return match && pod2.metadata.namespace === namespace2;
   }
   function shortenedImage(image2) {
     return (image2 || "").replace(/^(index\.)?docker.io\/(library\/)?/, "").replace(/:latest$/, "").replace(/^(.*@sha256:)([0-9a-f]{8})[0-9a-f]+$/i, "$1$2…");
@@ -9606,8 +9608,8 @@ var __publicField = (obj, key, value) => {
       });
       const myPods = pods.items.filter(
         (p) => {
-          var _a, _b;
-          return ((_a = this.spec) == null ? void 0 : _a.selector) ? matchSelector(p, (_b = this.spec) == null ? void 0 : _b.selector) : false;
+          var _a;
+          return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
         }
       );
       const result = lodashExports.sumBy(myPods, "restartCount");
@@ -9671,8 +9673,8 @@ var __publicField = (obj, key, value) => {
       });
       const myPods = pods.items.filter(
         (p) => {
-          var _a, _b;
-          return ((_a = this.spec) == null ? void 0 : _a.selector) ? matchSelector(p, (_b = this.spec) == null ? void 0 : _b.selector) : false;
+          var _a;
+          return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
         }
       );
       const result = lodashExports.sumBy(myPods, "restartCount");
@@ -9829,7 +9831,10 @@ var __publicField = (obj, key, value) => {
     get restartCount() {
       var _a, _b;
       if ((_a = this._rawYaml.status) == null ? void 0 : _a.containerStatuses) {
-        return ((_b = this._rawYaml.status) == null ? void 0 : _b.containerStatuses[0].restartCount) || 0;
+        return ((_b = this._rawYaml.status) == null ? void 0 : _b.containerStatuses.reduce((count, container2) => {
+          count += container2.restartCount;
+          return count;
+        }, 0)) || 0;
       }
       return 0;
     }
@@ -10422,6 +10427,7 @@ var __publicField = (obj, key, value) => {
     const configs = React.useContext(ConfigsContext);
     const { edit: edit2 } = useEdit();
     const navigation = core.useNavigation();
+    const pushModal = eagle.usePushModal();
     const go = core.useGo();
     return function openForm() {
       var _a, _b;
@@ -10429,7 +10435,7 @@ var __publicField = (obj, key, value) => {
         const config = configs[resource.name];
         const formType = (_a = config.formConfig) == null ? void 0 : _a.formType;
         if (formType === void 0 || formType === FormType.MODAL) {
-          eagle.pushModal({
+          pushModal({
             component: FormModal,
             props: {
               resource: resource.name,
@@ -11342,6 +11348,7 @@ var __publicField = (obj, key, value) => {
   }
   const WorkloadPodsTable_1giuese = "";
   const WorkloadPodsTable = ({
+    namespace: namespace2,
     selector,
     hideToolbar
   }) => {
@@ -11377,7 +11384,7 @@ var __publicField = (obj, key, value) => {
             field: "",
             value: "",
             fn(item) {
-              return selector ? matchSelector(item, selector) : true;
+              return matchSelector(item, selector, item.metadata.namespace);
             }
           }]
         }
@@ -11526,6 +11533,7 @@ var __publicField = (obj, key, value) => {
     const {
       i18n: i18n2
     } = useTranslation();
+    const popModal = eagle.usePopModal();
     const {
       submitting,
       errorMsgs,
@@ -11534,11 +11542,11 @@ var __publicField = (obj, key, value) => {
     } = useSubmitForm({
       formRef: form,
       onSubmitSuccess: () => {
-        eagle.popModal();
+        popModal();
       }
     });
     const close = React.useCallback(() => {
-      eagle.popModal();
+      popModal();
       reset();
     }, [reset]);
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(kit.modal, {
@@ -11570,6 +11578,7 @@ var __publicField = (obj, key, value) => {
     const {
       resource
     } = core.useResource();
+    const pushModal = eagle.usePushModal();
     return /* @__PURE__ */ jsxRuntimeExports.jsx(core.CanAccess, {
       resource: resource == null ? void 0 : resource.name,
       action: AccessControlAuth.Edit,
@@ -11577,7 +11586,7 @@ var __publicField = (obj, key, value) => {
         className: EditButtonStyle,
         type: "link",
         onClick: () => {
-          eagle.pushModal({
+          pushModal({
             component: EditFieldModal,
             props: modalProps
           });
@@ -11802,6 +11811,7 @@ var __publicField = (obj, key, value) => {
             selector: (_b = (_a = record.metadata.relations) == null ? void 0 : _a.find((r2) => {
               return r2.kind === "Pod" && r2.type === "creates";
             })) == null ? void 0 : _b.selector,
+            namespace: record.metadata.namespace,
             hideToolbar: true
           }
         );
@@ -11895,6 +11905,7 @@ var __publicField = (obj, key, value) => {
             selector: (_b = (_a = record.metadata.relations) == null ? void 0 : _a.find((r2) => {
               return r2.kind === "Pod" && r2.type === "selects";
             })) == null ? void 0 : _b.selector,
+            namespace: record.metadata.namespace,
             hideToolbar: true
           }
         );
@@ -18396,6 +18407,7 @@ var __publicField = (obj, key, value) => {
     const { record, size, children } = props;
     const kit = eagle.useUIKit();
     const { t: t2 } = useTranslation();
+    const pushModal = eagle.usePushModal();
     const formRef = React.useRef(null);
     const { action, resource } = core.useResource();
     const isInShowPage = action === "show";
@@ -18423,7 +18435,7 @@ var __publicField = (obj, key, value) => {
                 );
               }
             };
-            eagle.pushModal({
+            pushModal({
               component: EditFieldModal,
               props: modalProps
             });
@@ -23486,9 +23498,6 @@ var __publicField = (obj, key, value) => {
       errorNotification: false,
       transformInitValues,
       transformApplyValues,
-      mutationMeta: {
-        updateType: "put"
-      },
       ...useFormProps
     });
     const kit = eagle.useUIKit();
@@ -23574,6 +23583,7 @@ var __publicField = (obj, key, value) => {
     const configs = React.useContext(ConfigsContext);
     const [yamlSaveButtonProps, setYamlSaveButtonProps] = React.useState({});
     const [isError, setIsError] = React.useState(false);
+    const popModal = eagle.usePopModal();
     const config = configs[resourceFromProps || (resource == null ? void 0 : resource.name) || ""];
     const okText = i18n2.t(id ? "dovetail.save" : "dovetail.create");
     const action = id ? "edit" : "create";
@@ -23594,7 +23604,7 @@ var __publicField = (obj, key, value) => {
         onErrorsChange(errors) {
           setIsError(!!errors.length);
         },
-        onFinish: eagle.popModal
+        onFinish: eagle.usePopModal
       };
     }, [props.formProps, (_a = config.formConfig) == null ? void 0 : _a.transformInitValues, (_b = config.formConfig) == null ? void 0 : _b.transformApplyValues, config == null ? void 0 : config.initValue, id, action]);
     const refineFormResult = useRefineForm({
@@ -23602,7 +23612,7 @@ var __publicField = (obj, key, value) => {
       id,
       refineProps: {
         onMutationSuccess: () => {
-          eagle.popModal();
+          popModal();
         },
         redirect: false,
         ...(_c = config.formConfig) == null ? void 0 : _c.refineCoreProps
@@ -23626,7 +23636,7 @@ var __publicField = (obj, key, value) => {
     })();
     const saveButtonProps = isYamlForm ? yamlSaveButtonProps : refineFormResult.formResult.saveButtonProps;
     const onCancel = React.useCallback(() => {
-      eagle.popModal();
+      popModal();
     }, []);
     const onOk = React.useCallback((e2) => {
       var _a2;
@@ -24166,7 +24176,7 @@ var __publicField = (obj, key, value) => {
       dataIndex,
       align: "right",
       title: i18n2.t("dovetail.restarts"),
-      sortable: true
+      sortable: false
     };
   };
   const ReplicasColumnRenderer = (i18n2) => {
@@ -24176,7 +24186,7 @@ var __publicField = (obj, key, value) => {
       display: true,
       dataIndex,
       title: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Tooltip, {
-        title: i18n2.t("dovetail.ready_num_tooltip"),
+        title: i18n2.t("dovetail.completion_num_tooltip"),
         children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", {
           className: DashedTitleStyle,
           children: i18n2.t("dovetail.pod_num")
@@ -24197,7 +24207,6 @@ var __publicField = (obj, key, value) => {
     isRelativeTime = true
   } = {}) => {
     const dataIndex = ["metadata", "creationTimestamp"];
-    const kit = eagle.useUIKit();
     return {
       key: "creationTimestamp",
       display: true,
@@ -24209,11 +24218,7 @@ var __publicField = (obj, key, value) => {
         return isRelativeTime ? /* @__PURE__ */ jsxRuntimeExports.jsx(Time, {
           date: new Date(value2)
         }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
-          value: /* @__PURE__ */ jsxRuntimeExports.jsx(kit.time, {
-            date: value2,
-            timeTemplate: "HH:mm:ss",
-            dateTemplate: "YYYY-MM-DD"
-          })
+          value: dayjs(value2).format("YYYY-MM-DD hh:mm:ss")
         });
       },
       ...config
@@ -24554,8 +24559,8 @@ var __publicField = (obj, key, value) => {
           }),
           tooltip: `${v.servicePort} > ${v.targetPort}/${v.protocol}`
         }, v.servicePort));
-        return /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, {
-          value: content
+        return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, {
+          children: content
         });
       }
     };

package/lib/src/components/WorkloadPodsTable/WorkloadPodsTable.d.ts

@@ -1,6 +1,7 @@
 import { LabelSelector } from 'kubernetes-types/meta/v1';
 import React from 'react';
 interface WorkloadPodsTableProps {
+    namespace?: string;
     selector?: LabelSelector;
     hideToolbar?: boolean;
 }

package/lib/src/utils/match-selector.d.ts

@@ -1,3 +1,3 @@
 import { LabelSelector } from 'kubernetes-types/meta/v1';
 import { PodModel } from '../models/pod-model';
-export declare function matchSelector(pod: PodModel, selector: LabelSelector): boolean;
+export declare function matchSelector(pod: PodModel, selector?: LabelSelector, namespace?: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.0.48-alpha.0",
+  "version": "0.0.49-alpha.0",
   "type": "module",
   "files": [
     "dist",
@@ -10,8 +10,8 @@
   "module": "./dist/refine.js",
   "types": "./lib/src/index.d.ts",
   "dependencies": {
-    "@cloudtower/eagle": "^0.27.84",
-    "@cloudtower/icons-react": "^0.27.84",
+    "@cloudtower/eagle": "^0.29.0-alpha.0",
+    "@cloudtower/icons-react": "^0.29.0-alpha.0",
     "@patternfly/react-core": "^5.1.1",
     "@patternfly/react-log-viewer": "^5.0.0",
     "@refinedev/core": "^4.47.2",
@@ -21,7 +21,7 @@
     "dayjs": "^1.11.10",
     "i18next": "^23.2.3",
     "js-yaml": "^4.1.0",
-    "k8s-api-provider": "0.0.23-alpha.0",
+    "k8s-api-provider": "0.0.21",
     "ky": "^0.33.3",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
@@ -69,8 +69,8 @@
     "vite-plugin-commonjs": "^0.10.0"
   },
   "peerDependencies": {
-    "@cloudtower/eagle": "^0.27.73",
-    "@cloudtower/icons-react": "^0.27.73",
+    "@cloudtower/eagle": "^0.28.0-alpha.0",
+    "@cloudtower/icons-react": "^0.28.0-alpha.0",
     "@refinedev/core": "^4.47.2",
     "antd": "4.5.0",
     "i18next": "^23.2.3",