@dovetail-v2/refine 0.2.11 → 0.3.0

package/dist/{index-ef2a5914.cjs → index-7c78ef6f.cjs}

@@ -9317,7 +9317,7 @@ class JobModel extends WorkloadBaseModel {
         return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
       }
     );
-    const result = lodashExports.sumBy(myPods, "restartCount");
+    const result = lodashExports.sumBy(myPods, "restarts");
     this.restarts = result;
   }
   get duration() {
@@ -9384,7 +9384,7 @@ class WorkloadModel extends WorkloadBaseModel {
         return matchSelector(p, (_a = this.spec) == null ? void 0 : _a.selector, this.metadata.namespace);
       }
     );
-    const result = lodashExports.sumBy(myPods, "restartCount");
+    const result = lodashExports.sumBy(myPods, "restarts");
     this.restarts = result;
   }
   get replicas() {
@@ -9393,6 +9393,9 @@ class WorkloadModel extends WorkloadBaseModel {
   get readyReplicas() {
     return this.status && "readyReplicas" in this.status ? this.status.readyReplicas : 0;
   }
+  get appKey() {
+    return `${this.kind}-${this.name}-${this.namespace}`;
+  }
   redeploy() {
     const rawYaml = this._globalStore.restoreItem(this);
     const newOne = lodashExports.cloneDeep(rawYaml);
@@ -9465,7 +9468,7 @@ class PodModel extends WorkloadBaseModel {
       (container2) => shortenedImage(container2.image || "")
     )) || [];
   }
-  get restartCount() {
+  get restarts() {
     var _a, _b;
     if ((_a = this._rawYaml.status) == null ? void 0 : _a.containerStatuses) {
       return ((_b = this._rawYaml.status) == null ? void 0 : _b.containerStatuses.reduce((count, container2) => {
@@ -10197,16 +10200,17 @@ function useOpenForm(options) {
   const navigation = core.useNavigation();
   const pushModal = eagle.usePushModal();
   const go = core.useGo();
-  return function openForm() {
+  return function openForm(resourceName) {
     var _a, _b;
-    if (resource == null ? void 0 : resource.name) {
-      const config = configs[resource.name];
+    const finalResourceName = resourceName || (resource == null ? void 0 : resource.name);
+    if (finalResourceName) {
+      const config = configs[finalResourceName];
       const formType = (_a = config.formConfig) == null ? void 0 : _a.formContainerType;
       if (formType === void 0 || formType === FormContainerType.MODAL) {
         pushModal({
           component: ((_b = config.formConfig) == null ? void 0 : _b.CustomFormModal) || FormModal,
           props: {
-            resource: resource.name,
+            resource: finalResourceName,
             id: options == null ? void 0 : options.id,
             formProps: {
               initialValues: getInitialValues(config)
@@ -10217,7 +10221,7 @@ function useOpenForm(options) {
         edit2(options.id);
       } else {
         go({
-          to: navigation.createUrl(resource.name),
+          to: navigation.createUrl(finalResourceName),
           options: {
             keepQuery: true
           }
@@ -10226,28 +10230,32 @@ function useOpenForm(options) {
     }
   };
 }
+function getResourceNameByKind(kind, configs) {
+  var _a;
+  return (_a = Object.values(configs).find((config) => config.kind === kind)) == null ? void 0 : _a.name;
+}
 function K8sDropdown(props) {
   var _a;
   const { record, size = "normal" } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = core.useResource();
-  const resource = useResourceResult.resource;
   const configs = React.useContext(ConfigsContext);
-  const config = configs[(resource == null ? void 0 : resource.name) || ""];
+  const resourceName = getResourceNameByKind(record.kind || "", configs);
+  const config = configs[resourceName || ""];
   const { t: t2 } = common.useTranslation();
-  const { openDeleteConfirmModal } = useDeleteModal({ resourceName: (resource == null ? void 0 : resource.name) || "" });
+  const { openDeleteConfirmModal } = useDeleteModal({ resourceName: resourceName || "" });
   const download2 = useDownloadYAML();
   const openForm = useOpenForm({ id: record.id });
   const isInShowPage = useResourceResult.action === "show";
   const { data: canEditData } = core.useCan({
-    resource: resource == null ? void 0 : resource.name,
+    resource: resourceName,
     action: AccessControlAuth.Edit,
     params: {
       namespace: record.namespace
     }
   });
   const { data: canDeleteData } = core.useCan({
-    resource: resource == null ? void 0 : resource.name,
+    resource: resourceName,
     action: AccessControlAuth.Delete,
     params: {
       namespace: record.namespace
@@ -10258,7 +10266,7 @@ function K8sDropdown(props) {
     eagle.Dropdown,
     {
       overlay: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Menu, { children: [
-        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || config.hideEdit ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Menu.Item, { onClick: openForm, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? t2("dovetail.edit") : t2("dovetail.edit_yaml") }) }),
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || config.hideEdit ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Menu.Item, { onClick: () => openForm(), children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? t2("dovetail.edit") : t2("dovetail.edit_yaml") }) }),
         /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           eagle.Menu.Item,
           {
@@ -10416,7 +10424,7 @@ function CreateButton(props) {
     {
       prefixIcon: /* @__PURE__ */ common.jsxRuntimeExports.jsx(iconsReact.PlusAddCreateNew16BoldOntintIcon, {}),
       type: "primary",
-      onClick: openForm,
+      onClick: () => openForm(),
       children: createButtonText || t2("dovetail.create_resource", {
         resource: transformResourceKindInSentence(label2, i18n2.language)
       })
@@ -10695,7 +10703,7 @@ const index_x36tts = "";
 const LinkStyle = "l1vnw9x0";
 const ResourceLink = (props) => {
   const {
-    resourceKind: resourceName,
+    resourceName,
     namespace: namespace2,
     name: name2,
     uid,
@@ -10715,7 +10723,7 @@ const ResourceLink = (props) => {
   const isCanRead = data2 == null ? void 0 : data2.can;
   if (!isCanRead) {
     return /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
-      children: name2
+      children: displayName || name2
     });
   }
   const onClick = () => {
@@ -10786,7 +10794,7 @@ const IngressRulesTable = ({ ingress }) => {
         return record.serviceName ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           ResourceLink,
           {
-            resourceKind: "services",
+            resourceName: "services",
             namespace: ingress.metadata.namespace || "default",
             name: serviceName
           }
@@ -10813,7 +10821,7 @@ const IngressRulesTable = ({ ingress }) => {
         return secretName ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           ResourceLink,
           {
-            resourceKind: "secrets",
+            resourceName: "secrets",
             namespace: ingress.metadata.namespace || "default",
             name: secretName
           }
@@ -11141,7 +11149,7 @@ const ShowContent = (props) => {
             style: {
               marginRight: 8
             },
-            onClick: openForm,
+            onClick: () => openForm(),
             children: ((_f = config.formConfig) == null ? void 0 : _f.formType) === FormType.FORM ? t2("dovetail.edit") : t2("dovetail.edit_yaml")
           })
         }) : null, /* @__PURE__ */ common.jsxRuntimeExports.jsx(Dropdown, {
@@ -11784,7 +11792,7 @@ const WorkloadPodsTable = ({
     title: i18n2.t("dovetail.ip_address"),
     sortable: true,
     width: 160
-  }, hideNodeColumn ? void 0 : NodeNameColumnRenderer(i18n2), WorkloadImageColumnRenderer(i18n2), PodContainersNumColumnRenderer(i18n2), RestartCountColumnRenderer(i18n2), AgeColumnRenderer(i18n2)].filter((v) => !!v);
+  }, hideNodeColumn ? void 0 : NodeNameColumnRenderer(i18n2), WorkloadImageColumnRenderer(i18n2), PodContainersNumColumnRenderer(i18n2), RestartsColumnRenderer(i18n2), AgeColumnRenderer(i18n2)].filter((v) => !!v);
   const {
     tableProps
   } = useEagleTable({
@@ -12327,7 +12335,7 @@ const PVRefField = (i18n2) => {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
         ResourceLink,
         {
-          resourceKind: "persistentvolumes",
+          resourceName: "persistentvolumes",
           namespace: "",
           name: value2
         }
@@ -12341,7 +12349,7 @@ const PVStorageClassField = (i18n2) => {
     path: ["spec", "storageClassName"],
     title: i18n2.t("dovetail.storage_class"),
     renderContent(value2) {
-      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, { resourceKind: "storageclasses", namespace: "", name: value2 });
+      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, { resourceName: "storageclasses", namespace: "", name: value2 });
     }
   };
 };
@@ -12409,7 +12417,7 @@ const PVCRefField = (i18n2) => {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
         ResourceLink,
         {
-          resourceKind: "persistentvolumeclaims",
+          resourceName: "persistentvolumeclaims",
           namespace: pv2.pvcNamespace || "default",
           name: value2,
           uid: pv2.pvcUid
@@ -12699,7 +12707,7 @@ const PodLogTab = (i18n2) => ({
   ]
 });
 const NetworkPolicyRulesViewer_r6jity = "";
-const MonacoYamlEditor$1 = React.lazy(() => Promise.resolve().then(() => require("./MonacoYamlEditor-cdede43d.cjs")));
+const MonacoYamlEditor$1 = React.lazy(() => Promise.resolve().then(() => require("./MonacoYamlEditor-1ed09191.cjs")));
 const EditorStyle$1 = "e1cjl2b8";
 const NetworkPolicyRulesViewer = ({
   ingressOrEgress,
@@ -12776,13 +12784,13 @@ const PodContainersTable = ({
         }
       },
       {
-        key: "restartCount",
-        dataIndex: ["restartCount"],
+        key: "restarts",
+        dataIndex: ["restarts"],
         title: i18n2.t("dovetail.restarts"),
         sortable: true,
         align: "right",
         width: 120,
-        sorter: CommonSorter(["restartCount"])
+        sorter: CommonSorter(["restarts"])
       },
       {
         key: "started",
@@ -15086,18 +15094,26 @@ const NamespacesFilter = ({
 };
 function useNamespaceRefineFilter() {
   const { value: nsFilters = [] } = useNamespacesFilter();
-  const filters = React.useMemo(() => ({
-    permanent: [
-      {
-        operator: "or",
-        value: nsFilters.filter((filter) => filter !== ALL_NS).map((filter) => ({
-          field: "metadata.namespace",
-          operator: "eq",
-          value: filter
-        }))
-      }
-    ]
-  }), [nsFilters]);
+  const filters = React.useMemo(() => {
+    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
+    if (filters2.length === 0) {
+      return {
+        permanent: []
+      };
+    }
+    return {
+      permanent: [
+        {
+          operator: "or",
+          value: filters2.map((filter) => ({
+            field: "metadata.namespace",
+            operator: "eq",
+            value: filter
+          }))
+        }
+      ]
+    };
+  }, [nsFilters]);
   return filters;
 }
 const index_1l2xllo = "";
@@ -16123,7 +16139,7 @@ const PlainCodeStyle = "pqch97v";
 const ErrorMsgStyle = "eh2qjnl";
 const ErrorWrapperStyle = "e19q2bnp";
 const YamlEditorStyle = "y16u5v3w";
-const MonacoYamlEditor = React.lazy(() => Promise.resolve().then(() => require("./MonacoYamlEditor-cdede43d.cjs")));
+const MonacoYamlEditor = React.lazy(() => Promise.resolve().then(() => require("./MonacoYamlEditor-1ed09191.cjs")));
 const MonacoYamlDiffEditor = React.lazy(() => Promise.resolve().then(() => require("./MonacoYamlDiffEditor-7a07db88.cjs")));
 const YamlEditorComponent = React.forwardRef(
   function YamlEditorComponent2(props, ref) {
@@ -17712,7 +17728,7 @@ const ReferenceLink = (props) => {
     ResourceLink,
     {
       name: ownerReference.name,
-      resourceKind: resource.name || "",
+      resourceName: resource.name || "",
       namespace: namespace2
     }
   );
@@ -17774,7 +17790,7 @@ const IngressRulesComponent = ({ ingress }) => {
             /* @__PURE__ */ common.jsxRuntimeExports.jsx(
               ResourceLink,
               {
-                resourceKind: "services",
+                resourceName: "services",
                 namespace: ingress.metadata.namespace || "default",
                 name: r2.serviceName
               }
@@ -17828,6 +17844,10 @@ const CommonSorter = (dataIndex) => (a2, b) => {
   const valB = lodashExports.get(b, dataIndex);
   if (valA === valB)
     return 0;
+  if (valA !== void 0 && valB === void 0)
+    return 1;
+  if (valA === void 0 && valB !== void 0)
+    return -1;
   if (valA > valB)
     return 1;
   return -1;
@@ -17912,7 +17932,7 @@ const WorkloadImageColumnRenderer = (i18n2) => {
     }
   };
 };
-const WorkloadRestartsColumnRenderer = (i18n2) => {
+const RestartsColumnRenderer = (i18n2) => {
   const dataIndex = ["restarts"];
   return {
     key: "restarts",
@@ -17920,7 +17940,14 @@ const WorkloadRestartsColumnRenderer = (i18n2) => {
     width: 120,
     dataIndex,
     align: "right",
-    title: i18n2.t("dovetail.restarts")
+    sortable: true,
+    sorter: CommonSorter(dataIndex),
+    title: i18n2.t("dovetail.restarts"),
+    render: (value2) => {
+      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ValueDisplay, {
+        value: value2
+      });
+    }
   };
 };
 const ReplicasColumnRenderer = (i18n2) => {
@@ -17984,7 +18011,7 @@ const NodeNameColumnRenderer = (i18n2, options) => {
     sorter: CommonSorter(dataIndex),
     render: (v) => {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, {
-        resourceKind: "nodes",
+        resourceName: "nodes",
         name: v,
         namespace: ""
       });
@@ -17992,19 +18019,6 @@ const NodeNameColumnRenderer = (i18n2, options) => {
     ...options
   };
 };
-const RestartCountColumnRenderer = (i18n2) => {
-  const dataIndex = ["restartCount"];
-  return {
-    key: "restartCount",
-    display: true,
-    dataIndex,
-    title: i18n2.t("dovetail.restarts"),
-    sortable: true,
-    width: 120,
-    align: "right",
-    sorter: CommonSorter(dataIndex)
-  };
-};
 const CompletionsCountColumnRenderer = (i18n2) => {
   const dataIndex = ["succeeded"];
   return {
@@ -18374,7 +18388,7 @@ const PVRefColumnRenderer = (i18n2) => {
     sortable: true,
     render(value2) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, {
-        resourceKind: "persistentvolumes",
+        resourceName: "persistentvolumes",
         namespace: "",
         name: value2
       });
@@ -18391,7 +18405,7 @@ const PVStorageClassColumnRenderer = (i18n2) => {
     sortable: true,
     render(value2) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, {
-        resourceKind: "storageclasses",
+        resourceName: "storageclasses",
         namespace: "",
         name: value2
       });
@@ -18424,7 +18438,7 @@ const PVCRefColumnRenderer = (i18n2) => {
     sortable: true,
     render(value2, pv2) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceLink, {
-        resourceKind: "persistentvolumeclaims",
+        resourceName: "persistentvolumeclaims",
         namespace: pv2.pvcNamespace || "default",
         name: value2,
         uid: pv2.pvcUid
@@ -18921,7 +18935,7 @@ exports.ResourceTable = ResourceTable;
 exports.ResourceTableField = ResourceTableField;
 exports.ResourceTableGroup = ResourceTableGroup;
 exports.ResourceUsageBar = ResourceUsageBar;
-exports.RestartCountColumnRenderer = RestartCountColumnRenderer;
+exports.RestartsColumnRenderer = RestartsColumnRenderer;
 exports.SCAllowExpandColumnRenderer = SCAllowExpandColumnRenderer;
 exports.SCReclaimPolicyColumnRenderer = SCReclaimPolicyColumnRenderer;
 exports.SCReclaimPolicyField = SCReclaimPolicyField;
@@ -18981,7 +18995,6 @@ exports.WorkloadModel = WorkloadModel;
 exports.WorkloadPodsTable = WorkloadPodsTable;
 exports.WorkloadReplicas = WorkloadReplicas;
 exports.WorkloadReplicasForm = WorkloadReplicasForm;
-exports.WorkloadRestartsColumnRenderer = WorkloadRestartsColumnRenderer;
 exports.YamlEditorComponent = YamlEditorComponent;
 exports.YamlEditorStyle = YamlEditorStyle;
 exports.YamlForm = YamlForm;
@@ -18991,6 +19004,7 @@ exports.dovetailRefineI18n = dovetailRefineI18n;
 exports.generateSchemaTypeValue = generateSchemaTypeValue;
 exports.generateValueFromSchema = generateValueFromSchema;
 exports.getApiVersion = getApiVersion;
+exports.getResourceNameByKind = getResourceNameByKind;
 exports.index = index;
 exports.matchSelector = matchSelector;
 exports.modelPlugin = modelPlugin;

package/dist/models/pod-model.d.ts

@@ -11,7 +11,7 @@ export declare class PodModel extends WorkloadBaseModel {
     status?: RequiredPod['status'];
     constructor(_rawYaml: RequiredPod, _globalStore: GlobalStore);
     get imageNames(): string[];
-    get restartCount(): number;
+    get restarts(): number;
     get readyDisplay(): string;
     get readyContainerCount(): number | undefined;
     get containerCount(): number;

package/dist/models/workload-model.d.ts

@@ -12,6 +12,7 @@ export declare class WorkloadModel extends WorkloadBaseModel {
     private getRestarts;
     get replicas(): number | undefined;
     get readyReplicas(): number | undefined;
+    get appKey(): string;
     redeploy(): WorkloadTypes;
     scale(value: number): WorkloadTypes;
 }

package/dist/refine.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const refine = require("./index-ef2a5914.cjs");
+const refine = require("./index-7c78ef6f.cjs");
 require("./common-1eb43414.cjs");
 require("@cloudtower/eagle");
 require("@refinedev/core");
@@ -186,7 +186,7 @@ exports.ResourceTable = refine.ResourceTable;
 exports.ResourceTableField = refine.ResourceTableField;
 exports.ResourceTableGroup = refine.ResourceTableGroup;
 exports.ResourceUsageBar = refine.ResourceUsageBar;
-exports.RestartCountColumnRenderer = refine.RestartCountColumnRenderer;
+exports.RestartsColumnRenderer = refine.RestartsColumnRenderer;
 exports.SCAllowExpandColumnRenderer = refine.SCAllowExpandColumnRenderer;
 exports.SCReclaimPolicyColumnRenderer = refine.SCReclaimPolicyColumnRenderer;
 exports.SCReclaimPolicyField = refine.SCReclaimPolicyField;
@@ -246,7 +246,6 @@ exports.WorkloadModel = refine.WorkloadModel;
 exports.WorkloadPodsTable = refine.WorkloadPodsTable;
 exports.WorkloadReplicas = refine.WorkloadReplicas;
 exports.WorkloadReplicasForm = refine.WorkloadReplicasForm;
-exports.WorkloadRestartsColumnRenderer = refine.WorkloadRestartsColumnRenderer;
 exports.YamlEditorComponent = refine.YamlEditorComponent;
 exports.YamlForm = refine.YamlForm;
 exports.addDefaultRenderToColumns = refine.addDefaultRenderToColumns;
@@ -255,6 +254,7 @@ exports.dovetailRefineI18n = refine.dovetailRefineI18n;
 exports.generateSchemaTypeValue = refine.generateSchemaTypeValue;
 exports.generateValueFromSchema = refine.generateValueFromSchema;
 exports.getApiVersion = refine.getApiVersion;
+exports.getResourceNameByKind = refine.getResourceNameByKind;
 exports.matchSelector = refine.matchSelector;
 exports.modelPlugin = refine.modelPlugin;
 exports.namespaceRules = refine.namespaceRules;