@dovetail-v2/refine 0.0.14-beta.0 → 0.0.14-beta.2

package/dist/{MonacoYamlDiffEditor.8847f437.js → MonacoYamlDiffEditor.e41c15eb.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntime } from "./index.0c2122ef.js";
+import { j as jsxRuntime } from "./index.453e0071.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "@refinedev/core";

package/dist/{index.0c2122ef.js → index.453e0071.js}

@@ -6857,18 +6857,14 @@ const useEagleForm = ({
   const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp != null ? warnWhenUnsavedChangesProp : warnWhenUnsavedChangesRefine;
   React.useEffect(() => {
     var _a2;
-    form.resetFields();
     if (editor.current) {
-      const editorValue = yaml.dump(form.getFieldsValue(true));
       const editorInstance = editor.current.getEditorInstance();
-      editor.current.setEditorValue(editorValue);
-      editor.current.setValue(editorValue);
       if (((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data) && editorInstance && !isFoldRef.current) {
         fold(editorInstance);
         isFoldRef.current = true;
       }
     }
-  }, [(_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data, id, form, fold]);
+  }, [(_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data, id, fold]);
   React.useEffect(() => {
     var _a2, _b2;
     const response = (_a2 = useFormCoreResult.mutationResult.error) == null ? void 0 : _a2.response;
@@ -7402,7 +7398,7 @@ const WorkloadReplicas = ({
   const currentReplicas = get(record, "spec.replicas", 0);
   const scale = (delta) => {
     const v = record.scale(currentReplicas + delta);
-    const id = v.id;
+    const id = record.id;
     pruneBeforeEdit(v);
     mutate({
       id,
@@ -7787,7 +7783,7 @@ const DurationColumnRenderer = () => {
   };
 };
 const ServiceTypeColumnRenderer = () => {
-  const dataIndex = ["rawYaml", "spec", "type"];
+  const dataIndex = ["spec", "type"];
   return {
     key: "type",
     title: i18n.t("dovetail.type"),
@@ -8927,7 +8923,7 @@ const DataField = () => {
   return {
     key: "data",
     title: i18n.t("dovetail.data"),
-    path: ["rawYaml", "data"],
+    path: ["data"],
     render: (val) => {
       return /* @__PURE__ */ jsxRuntime.exports.jsx(KeyValue, { value: val });
     }
@@ -8937,7 +8933,7 @@ const SecretDataField = () => {
   return {
     key: "data",
     title: i18n.t("dovetail.data"),
-    path: ["rawYaml", "data"],
+    path: ["data"],
     render: (val) => {
       const decodeVal = {};
       for (const key in val) {
@@ -8961,21 +8957,21 @@ const ServiceTypeField = () => {
   return {
     key: "type",
     title: i18n.t("dovetail.type"),
-    path: ["rawYaml", "spec", "type"]
+    path: ["spec", "type"]
   };
 };
 const ClusterIpField = () => {
   return {
     key: "clusterIp",
     title: i18n.t("dovetail.clusterIp"),
-    path: ["rawYaml", "spec", "clusterIP"]
+    path: ["spec", "clusterIP"]
   };
 };
 const SessionAffinityField = () => {
   return {
     key: "clusterIp",
     title: i18n.t("dovetail.sessionAffinity"),
-    path: ["rawYaml", "spec", "sessionAffinity"]
+    path: ["spec", "sessionAffinity"]
   };
 };
 const ServicePodsField = () => {
@@ -9171,46 +9167,45 @@ const EventsTable = ({}) => {
       {
         key: "type",
         display: true,
-        dataIndex: ["rawYaml", "type"],
+        dataIndex: ["type"],
         title: i18n2.t("dovetail.type"),
         sortable: true,
-        sorter: CommonSorter(["rawYaml", "type"])
+        sorter: CommonSorter(["type"])
       },
       {
         key: "reason",
         display: true,
-        dataIndex: ["rawYaml", "reason"],
+        dataIndex: ["reason"],
         title: i18n2.t("dovetail.reason"),
         sortable: true,
-        sorter: CommonSorter(["rawYaml", "reason"])
+        sorter: CommonSorter(["reason"])
       },
       {
         key: "object",
         display: true,
-        dataIndex: ["rawYaml", "regarding", "name"],
+        dataIndex: ["regarding", "name"],
         title: i18n2.t("dovetail.object"),
         sortable: true,
-        sorter: CommonSorter(["rawYaml", "regarding", "name"])
+        sorter: CommonSorter(["regarding", "name"])
       },
       {
         key: "note",
         display: true,
-        dataIndex: ["rawYaml", "note"],
+        dataIndex: ["note"],
         title: i18n2.t("dovetail.note"),
         sortable: true,
-        sorter: CommonSorter(["rawYaml", "note"])
+        sorter: CommonSorter(["note"])
       },
       AgeColumnRenderer()
     ],
     [i18n2]
   );
-  const dataSource = useMemo(
-    () => addId((data2 == null ? void 0 : data2.data) || [], "metadata.uid").filter((d) => {
+  const dataSource = useMemo(() => {
+    return data2 == null ? void 0 : data2.data.filter((d) => {
       const objectId = `${d.regarding.namespace}/${d.regarding.name}`;
       return objectId === parsed.id;
-    }),
-    [data2 == null ? void 0 : data2.data, parsed]
-  );
+    });
+  }, [data2 == null ? void 0 : data2.data, parsed]);
   return /* @__PURE__ */ jsxRuntime.exports.jsx(
     Table,
     {
@@ -9676,7 +9671,7 @@ const Separator = () => {
   });
 };
 const MonacoYamlEditor = React.lazy(() => Promise.resolve().then(() => MonacoYamlEditor$2));
-const MonacoYamlDiffEditor = React.lazy(() => import("./MonacoYamlDiffEditor.8847f437.js"));
+const MonacoYamlDiffEditor = React.lazy(() => import("./MonacoYamlDiffEditor.e41c15eb.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -10172,6 +10167,9 @@ function YamlForm(props) {
     i18n: i18n2
   } = useTranslation();
   const responseErrors = errorResponseBody ? getCommonErrors(errorResponseBody, i18n2) : [];
+  const schema = useMemo(() => {
+    return editorProps.schema || {};
+  }, [editorProps.schema]);
   return /* @__PURE__ */ jsxRuntime.exports.jsx(FormLayout, {
     children: /* @__PURE__ */ jsxRuntime.exports.jsx(kit.form, {
       ...formProps,
@@ -10190,7 +10188,7 @@ function YamlForm(props) {
             children: /* @__PURE__ */ jsxRuntime.exports.jsx(YamlEditorComponent, {
               ...editorProps,
               className: EditorStyle,
-              schema: editorProps.schema || {},
+              schema,
               collapsable: false
             })
           }), /* @__PURE__ */ jsxRuntime.exports.jsxs(kit.form.Item, {
@@ -16350,7 +16348,8 @@ class WorkloadModel extends WorkloadBaseModel {
     this.restarts = result;
   }
   redeploy() {
-    const newOne = lodash.exports.cloneDeep(this._rawYaml);
+    const rawYaml = this._globalStore.restoreItem(this);
+    const newOne = lodash.exports.cloneDeep(rawYaml);
     const path = "spec.template.metadata.annotations";
     const annotations = lodash.exports.get(newOne, path, {});
     lodash.exports.set(newOne, path, {
@@ -16360,7 +16359,8 @@ class WorkloadModel extends WorkloadBaseModel {
     return newOne;
   }
   scale(value) {
-    const newOne = lodash.exports.cloneDeep(this._rawYaml);
+    const rawYaml = this._globalStore.restoreItem(this);
+    const newOne = lodash.exports.cloneDeep(rawYaml);
     if (newOne.kind === "Deployment" || newOne.kind === "StatefulSet") {
       lodash.exports.set(newOne, "spec.replicas", value);
     }
@@ -16491,13 +16491,22 @@ class CronJobModel extends WorkloadBaseModel {
     return newOne;
   }
 }
+class EventModel extends ResourceModel {
+  constructor(_rawYaml, _globalStore) {
+    super(_rawYaml, _globalStore);
+    this._rawYaml = _rawYaml;
+    this._globalStore = _globalStore;
+    this.id = _rawYaml.metadata.uid || _rawYaml.id;
+  }
+}
 const ModelMap = {
   Deployment: WorkloadModel,
   DaemonSet: WorkloadModel,
   StatefulSet: WorkloadModel,
   CronJob: CronJobModel,
   Job: JobModel,
-  Pod: PodModel
+  Pod: PodModel,
+  Event: EventModel
 };
 class ModelPlugin {
   constructor() {
@@ -16679,7 +16688,6 @@ var RESOURCE_GROUP = /* @__PURE__ */ ((RESOURCE_GROUP2) => {
   RESOURCE_GROUP2["CLUSTER"] = "CLUSTER";
   return RESOURCE_GROUP2;
 })(RESOURCE_GROUP || {});
-console.log("betaversion");
 export {
   ConditionsField as $,
   AgeColumnRenderer as A,
@@ -16726,6 +16734,7 @@ export {
   PodMetricsModel as aD,
   ResourceModel as aE,
   CronJobModel as aF,
+  EventModel as aG,
   SchemaStrategy as aa,
   DeleteManyButton as ab,
   ListPage as ac,

package/dist/refine.js

@@ -1,4 +1,4 @@
-import { ai, A, an, B, ap, a6, g, C, f, ay, $, v, y, J, aF, Q, aq, ao, a2, V, ab, aw, ae, D, ag, Z, I, ar, az, a1, T, K, X, ac, af, M, ah, N, m, b, q, ak, d, at, t, P, w, am, aD, aC, a0, ax, _, R, G, F, z, aE, E, L, e, au, as, aa, a3, U, a8, S, a5, a7, a9, a4, ad, av, al, aB, x, W, aA, H, O, c, Y, n, s, p, o, r, a, i, h, k, l, aj, u } from "./index.0c2122ef.js";
+import { ai, A, an, B, ap, a6, g, C, f, ay, $, v, y, J, aF, Q, aq, ao, a2, V, ab, aw, ae, D, ag, aG, Z, I, ar, az, a1, T, K, X, ac, af, M, ah, N, m, b, q, ak, d, at, t, P, w, am, aD, aC, a0, ax, _, R, G, F, z, aE, E, L, e, au, as, aa, a3, U, a8, S, a5, a7, a9, a4, ad, av, al, aB, x, W, aA, H, O, c, Y, n, s, p, o, r, a, i, h, k, l, aj, u } from "./index.453e0071.js";
 import "@cloudtower/eagle";
 import "@refinedev/core";
 import "js-yaml";
@@ -40,6 +40,7 @@ export {
   ae as DrawerShow,
   D as DurationColumnRenderer,
   ag as EditButton,
+  aG as EventModel,
   Z as ImageField,
   I as ImageNames,
   ar as JOB_INIT_VALUE,

package/dist/refine.umd.cjs

@@ -6870,18 +6870,14 @@ var __publicField = (obj, key, value) => {
     const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp != null ? warnWhenUnsavedChangesProp : warnWhenUnsavedChangesRefine;
     React__default.default.useEffect(() => {
       var _a2;
-      form.resetFields();
       if (editor.current) {
-        const editorValue = yaml__default.default.dump(form.getFieldsValue(true));
         const editorInstance = editor.current.getEditorInstance();
-        editor.current.setEditorValue(editorValue);
-        editor.current.setValue(editorValue);
         if (((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data) && editorInstance && !isFoldRef.current) {
           fold(editorInstance);
           isFoldRef.current = true;
         }
       }
-    }, [(_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data, id, form, fold]);
+    }, [(_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data, id, fold]);
     React__default.default.useEffect(() => {
       var _a2, _b2;
       const response = (_a2 = useFormCoreResult.mutationResult.error) == null ? void 0 : _a2.response;
@@ -7415,7 +7411,7 @@ var __publicField = (obj, key, value) => {
     const currentReplicas = lodashEs.get(record, "spec.replicas", 0);
     const scale = (delta) => {
       const v = record.scale(currentReplicas + delta);
-      const id = v.id;
+      const id = record.id;
       pruneBeforeEdit(v);
       mutate({
         id,
@@ -7800,7 +7796,7 @@ var __publicField = (obj, key, value) => {
     };
   };
   const ServiceTypeColumnRenderer = () => {
-    const dataIndex = ["rawYaml", "spec", "type"];
+    const dataIndex = ["spec", "type"];
     return {
       key: "type",
       title: i18n__default.default.t("dovetail.type"),
@@ -8940,7 +8936,7 @@ var __publicField = (obj, key, value) => {
     return {
       key: "data",
       title: i18n__default.default.t("dovetail.data"),
-      path: ["rawYaml", "data"],
+      path: ["data"],
       render: (val) => {
         return /* @__PURE__ */ jsxRuntime.exports.jsx(KeyValue, { value: val });
       }
@@ -8950,7 +8946,7 @@ var __publicField = (obj, key, value) => {
     return {
       key: "data",
       title: i18n__default.default.t("dovetail.data"),
-      path: ["rawYaml", "data"],
+      path: ["data"],
       render: (val) => {
         const decodeVal = {};
         for (const key in val) {
@@ -8974,21 +8970,21 @@ var __publicField = (obj, key, value) => {
     return {
       key: "type",
       title: i18n__default.default.t("dovetail.type"),
-      path: ["rawYaml", "spec", "type"]
+      path: ["spec", "type"]
     };
   };
   const ClusterIpField = () => {
     return {
       key: "clusterIp",
       title: i18n__default.default.t("dovetail.clusterIp"),
-      path: ["rawYaml", "spec", "clusterIP"]
+      path: ["spec", "clusterIP"]
     };
   };
   const SessionAffinityField = () => {
     return {
       key: "clusterIp",
       title: i18n__default.default.t("dovetail.sessionAffinity"),
-      path: ["rawYaml", "spec", "sessionAffinity"]
+      path: ["spec", "sessionAffinity"]
     };
   };
   const ServicePodsField = () => {
@@ -9184,46 +9180,45 @@ var __publicField = (obj, key, value) => {
         {
           key: "type",
           display: true,
-          dataIndex: ["rawYaml", "type"],
+          dataIndex: ["type"],
           title: i18n2.t("dovetail.type"),
           sortable: true,
-          sorter: CommonSorter(["rawYaml", "type"])
+          sorter: CommonSorter(["type"])
         },
         {
           key: "reason",
           display: true,
-          dataIndex: ["rawYaml", "reason"],
+          dataIndex: ["reason"],
           title: i18n2.t("dovetail.reason"),
           sortable: true,
-          sorter: CommonSorter(["rawYaml", "reason"])
+          sorter: CommonSorter(["reason"])
         },
         {
           key: "object",
           display: true,
-          dataIndex: ["rawYaml", "regarding", "name"],
+          dataIndex: ["regarding", "name"],
           title: i18n2.t("dovetail.object"),
           sortable: true,
-          sorter: CommonSorter(["rawYaml", "regarding", "name"])
+          sorter: CommonSorter(["regarding", "name"])
         },
         {
           key: "note",
           display: true,
-          dataIndex: ["rawYaml", "note"],
+          dataIndex: ["note"],
           title: i18n2.t("dovetail.note"),
           sortable: true,
-          sorter: CommonSorter(["rawYaml", "note"])
+          sorter: CommonSorter(["note"])
         },
         AgeColumnRenderer()
       ],
       [i18n2]
     );
-    const dataSource = React.useMemo(
-      () => addId((data2 == null ? void 0 : data2.data) || [], "metadata.uid").filter((d) => {
+    const dataSource = React.useMemo(() => {
+      return data2 == null ? void 0 : data2.data.filter((d) => {
         const objectId = `${d.regarding.namespace}/${d.regarding.name}`;
         return objectId === parsed.id;
-      }),
-      [data2 == null ? void 0 : data2.data, parsed]
-    );
+      });
+    }, [data2 == null ? void 0 : data2.data, parsed]);
     return /* @__PURE__ */ jsxRuntime.exports.jsx(
       Table,
       {
@@ -10185,6 +10180,9 @@ var __publicField = (obj, key, value) => {
       i18n: i18n2
     } = useTranslation();
     const responseErrors = errorResponseBody ? getCommonErrors(errorResponseBody, i18n2) : [];
+    const schema = React.useMemo(() => {
+      return editorProps.schema || {};
+    }, [editorProps.schema]);
     return /* @__PURE__ */ jsxRuntime.exports.jsx(FormLayout, {
       children: /* @__PURE__ */ jsxRuntime.exports.jsx(kit.form, {
         ...formProps,
@@ -10203,7 +10201,7 @@ var __publicField = (obj, key, value) => {
               children: /* @__PURE__ */ jsxRuntime.exports.jsx(YamlEditorComponent, {
                 ...editorProps,
                 className: EditorStyle,
-                schema: editorProps.schema || {},
+                schema,
                 collapsable: false
               })
             }), /* @__PURE__ */ jsxRuntime.exports.jsxs(kit.form.Item, {
@@ -16363,7 +16361,8 @@ var __publicField = (obj, key, value) => {
       this.restarts = result;
     }
     redeploy() {
-      const newOne = lodash.exports.cloneDeep(this._rawYaml);
+      const rawYaml = this._globalStore.restoreItem(this);
+      const newOne = lodash.exports.cloneDeep(rawYaml);
       const path = "spec.template.metadata.annotations";
       const annotations = lodash.exports.get(newOne, path, {});
       lodash.exports.set(newOne, path, {
@@ -16373,7 +16372,8 @@ var __publicField = (obj, key, value) => {
       return newOne;
     }
     scale(value) {
-      const newOne = lodash.exports.cloneDeep(this._rawYaml);
+      const rawYaml = this._globalStore.restoreItem(this);
+      const newOne = lodash.exports.cloneDeep(rawYaml);
       if (newOne.kind === "Deployment" || newOne.kind === "StatefulSet") {
         lodash.exports.set(newOne, "spec.replicas", value);
       }
@@ -16504,13 +16504,22 @@ var __publicField = (obj, key, value) => {
       return newOne;
     }
   }
+  class EventModel extends ResourceModel {
+    constructor(_rawYaml, _globalStore) {
+      super(_rawYaml, _globalStore);
+      this._rawYaml = _rawYaml;
+      this._globalStore = _globalStore;
+      this.id = _rawYaml.metadata.uid || _rawYaml.id;
+    }
+  }
   const ModelMap = {
     Deployment: WorkloadModel,
     DaemonSet: WorkloadModel,
     StatefulSet: WorkloadModel,
     CronJob: CronJobModel,
     Job: JobModel,
-    Pod: PodModel
+    Pod: PodModel,
+    Event: EventModel
   };
   class ModelPlugin {
     constructor() {
@@ -16692,7 +16701,6 @@ var __publicField = (obj, key, value) => {
     RESOURCE_GROUP2["CLUSTER"] = "CLUSTER";
     return RESOURCE_GROUP2;
   })(RESOURCE_GROUP || {});
-  console.log("betaversion");
   const MonacoYamlDiffEditor = (props) => {
     const ref = React.useRef(null);
     const { origin, modified, id, height } = props;
@@ -16758,6 +16766,7 @@ var __publicField = (obj, key, value) => {
   exports2.DrawerShow = DrawerShow;
   exports2.DurationColumnRenderer = DurationColumnRenderer;
   exports2.EditButton = EditButton;
+  exports2.EventModel = EventModel;
   exports2.ImageField = ImageField;
   exports2.ImageNames = ImageNames;
   exports2.JOB_INIT_VALUE = JOB_INIT_VALUE;

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

@@ -1,5 +1,5 @@
 import { Column } from '../../components/Table';
-import { JobModel, PodModel, ResourceModel, WorkloadModel, WorkloadBaseModel } from '../../models';
+import { JobModel, PodModel, ResourceModel, WorkloadModel, WorkloadBaseModel, CronJobModel } from '../../models';
 export declare const CommonSorter: (dataIndex: string[]) => (a: unknown, b: unknown) => 0 | 1 | -1;
 export declare const NameColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>(resource?: string) => Column<Model>;
 export declare const NameSpaceColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>() => Column<Model>;
@@ -10,6 +10,6 @@ export declare const ReplicasColumnRenderer: <Model extends WorkloadModel>() =>
 export declare const AgeColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>() => Column<Model>;
 export declare const NodeNameColumnRenderer: <Model extends PodModel>(options?: Partial<Column<Model>> | undefined) => Column<Model>;
 export declare const RestartCountColumnRenderer: <Model extends PodModel>() => Column<Model>;
-export declare const CompletionsCountColumnRenderer: <Model extends JobModel>() => Column<Model>;
-export declare const DurationColumnRenderer: <Model extends JobModel>() => Column<Model>;
+export declare const CompletionsCountColumnRenderer: <Model extends JobModel | CronJobModel>() => Column<Model>;
+export declare const DurationColumnRenderer: <Model extends JobModel | CronJobModel>() => Column<Model>;
 export declare const ServiceTypeColumnRenderer: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>() => Column<Model>;

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

@@ -0,0 +1,8 @@
+import { GlobalStore, Unstructured } from 'k8s-api-provider';
+import { Event } from 'kubernetes-types/core/v1';
+import { ResourceModel } from './resource-model';
+export declare class EventModel extends ResourceModel {
+    _rawYaml: Unstructured & Event;
+    _globalStore: GlobalStore;
+    constructor(_rawYaml: Unstructured & Event, _globalStore: GlobalStore);
+}

package/lib/src/models/index.d.ts

@@ -6,3 +6,4 @@ export * from './pod-metrics-model';
 export * from './resource-model';
 export * from './workload-model';
 export * from './cronjob-model';
+export * from './event-model';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.0.14-beta.0",
+  "version": "0.0.14-beta.2",
   "type": "module",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "dayjs": "^1.11.10",
     "i18next": "^23.2.3",
     "js-yaml": "^4.1.0",
-    "k8s-api-provider": "0.0.15-beta.0",
+    "k8s-api-provider": "0.0.15-beta.2",
     "ky": "^0.33.3",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",