@dovetail-v2/refine 0.1.14 → 0.1.15-alpha.0

package/dist/{MonacoYamlDiffEditor-fdc5faf9.js → MonacoYamlDiffEditor-22b5ead6.js}

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "./index-0a0a8e71.js";
+import { j as jsxRuntimeExports } from "./index-11293d19.js";
 import * as monaco from "monaco-editor";
 import { useRef, useEffect } from "react";
 import "i18next";

package/dist/{index-0a0a8e71.js → index-11293d19.js}

@@ -12184,7 +12184,8 @@ function KeyValueSecret(props) {
   });
 }
 function validateLabelKey(key2) {
-  const labelRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-\_]*[a-zA-Z0-9]$)/;
+  const labelPrefixRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.]*[a-zA-Z0-9]$)/;
+  const labelNameRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9]$)/;
   let prefix, name2;
   const splitResult = key2.split("/");
   if (splitResult.length === 1) {
@@ -12196,10 +12197,10 @@ function validateLabelKey(key2) {
   if (prefix === "") {
     return { isValid: false, errorMessage: "EMPTY_PREFIX" };
   }
-  if (prefix && !labelRegex.test(prefix)) {
+  if (prefix && !labelPrefixRegex.test(prefix)) {
     return { isValid: false, errorMessage: "INVALID_PREFIX" };
   }
-  if (!labelRegex.test(name2)) {
+  if (!labelNameRegex.test(name2)) {
     return { isValid: false, errorMessage: "INVALID_NAME" };
   }
   if (prefix && prefix.length > 253) {
@@ -12211,7 +12212,7 @@ function validateLabelKey(key2) {
   return { isValid: true };
 }
 function validateLabelValue(value2) {
-  const labelValueRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-\_]*[a-zA-Z0-9]$)/;
+  const labelValueRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9]$)/;
   if (value2 === "") {
     return { isValid: true };
   }
@@ -12225,37 +12226,31 @@ function validateLabelValue(value2) {
 }
 const LabelFormatPopover_105yfzn = "";
 const PodLabelFormatRulePopoverStyle = "p5jt6nm";
-const LabelFormatPopover = ({
-  noValueValidation
-}) => {
+const LabelFormatPopover = () => {
   const {
     t: t2
   } = useTranslation();
-  const data2 = [{
-    object: t2("dovetail.key"),
-    contains: t2("dovetail.suffix"),
-    optional: t2("dovetail.no"),
-    rule: [t2("dovetail.suffix_format_rule_1"), t2("dovetail.suffix_format_rule_2"), t2("dovetail.suffix_format_rule_3")]
-  }, {
-    object: t2("dovetail.key"),
-    contains: t2("dovetail.name"),
-    optional: t2("dovetail.yes"),
-    rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
-  }];
-  if (!noValueValidation) {
-    data2.push({
-      object: t2("dovetail.value"),
-      contains: t2("dovetail.name"),
-      optional: t2("dovetail.no"),
-      rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
-    });
-  }
   return /* @__PURE__ */ jsxRuntimeExports.jsx(Popover, {
     overlayClassName: PodLabelFormatRulePopoverStyle,
     placement: "bottomRight",
     content: /* @__PURE__ */ jsxRuntimeExports.jsx(AntdTable, {
       bordered: true,
-      dataSource: data2,
+      dataSource: [{
+        object: t2("dovetail.key"),
+        contains: t2("dovetail.suffix"),
+        optional: t2("dovetail.no"),
+        rule: [t2("dovetail.suffix_format_rule_1"), t2("dovetail.suffix_format_rule_2"), t2("dovetail.suffix_format_rule_3")]
+      }, {
+        object: t2("dovetail.key"),
+        contains: t2("dovetail.name"),
+        optional: t2("dovetail.yes"),
+        rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
+      }, {
+        object: t2("dovetail.value"),
+        contains: t2("dovetail.name"),
+        optional: t2("dovetail.no"),
+        rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
+      }],
       columns: [{
         key: "object",
         title: t2("dovetail.object"),
@@ -12307,8 +12302,7 @@ function _KeyValueTableFormForm(props, ref) {
     defaultValue,
     onSubmit,
     extraColumns,
-    addButtonText,
-    noValueValidation
+    addButtonText
   } = props;
   const {
     t: t2
@@ -12378,8 +12372,6 @@ function _KeyValueTableFormForm(props, ref) {
         validator: ({
           value: value22
         }) => {
-          if (noValueValidation)
-            return;
           const {
             isValid
           } = validateLabelValue(value22 || "");
@@ -12398,9 +12390,7 @@ function _KeyValueTableFormForm(props, ref) {
       row: {
         deletable: true
       }
-    }), /* @__PURE__ */ jsxRuntimeExports.jsx(LabelFormatPopover, {
-      noValueValidation
-    })]
+    }), /* @__PURE__ */ jsxRuntimeExports.jsx(LabelFormatPopover, {})]
   });
 }
 const KeyValueTableFormForm = React__default.forwardRef(_KeyValueTableFormForm);
@@ -19483,13 +19473,13 @@ const PodContainersTable = ({
       },
       {
         key: "started",
-        dataIndex: ["state", "running", "startedAt"],
+        dataIndex: ["startedAt"],
         title: i18n2.t("dovetail.created_time"),
         sortable: true,
-        sorter: CommonSorter(["state", "running", "startedAt"]),
+        sorter: CommonSorter(["startedAt"]),
         width: 120,
         render: (_, record) => {
-          const value2 = get$3(record, ["state", "running", "startedAt"]) || get$3(record, ["state", "terminated", "startedAt"]);
+          const value2 = record.startedAt;
           if (value2)
             return /* @__PURE__ */ jsxRuntimeExports.jsx(Time, { date: new Date(value2) });
           return /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, { value: "" });
@@ -19499,7 +19489,10 @@ const PodContainersTable = ({
     [i18n2, initContainerStatuses]
   );
   const dataSource = useMemo(
-    () => addId(containerStatuses.concat(initContainerStatuses), "containerID"),
+    () => addId(containerStatuses.concat(initContainerStatuses), "containerID").map((container2) => ({
+      ...container2,
+      startedAt: get$3(container2, ["state", "running", "startedAt"]) || get$3(container2, ["state", "terminated", "startedAt"])
+    })),
     [containerStatuses, initContainerStatuses]
   );
   const {
@@ -19511,7 +19504,7 @@ const PodContainersTable = ({
     data: dataSource,
     columns,
     defaultSorters: [{
-      field: "state.running.startedAt",
+      field: "startedAt",
       order: "desc"
     }]
   });
@@ -38400,7 +38393,7 @@ const Separator = () => {
   });
 };
 const MonacoYamlEditor = React__default.lazy(() => Promise.resolve().then(() => MonacoYamlEditor$2));
-const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-fdc5faf9.js"));
+const MonacoYamlDiffEditor = React__default.lazy(() => import("./MonacoYamlDiffEditor-22b5ead6.js"));
 const YamlEditorComponent = forwardRef(
   function YamlEditorComponent2(props, ref) {
     const {
@@ -39609,8 +39602,7 @@ const EditAnnotationForm = React__default.forwardRef(function EditAnnotationForm
       ref,
       defaultValue,
       onSubmit,
-      addButtonText: t2("dovetail.add_annotation"),
-      noValueValidation: true
+      addButtonText: t2("dovetail.add_annotation")
     }
   );
 });

package/dist/refine.js

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

package/dist/refine.umd.cjs

@@ -12190,7 +12190,8 @@ var __publicField = (obj, key, value) => {
     });
   }
   function validateLabelKey(key2) {
-    const labelRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-\_]*[a-zA-Z0-9]$)/;
+    const labelPrefixRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.]*[a-zA-Z0-9]$)/;
+    const labelNameRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9]$)/;
     let prefix, name2;
     const splitResult = key2.split("/");
     if (splitResult.length === 1) {
@@ -12202,10 +12203,10 @@ var __publicField = (obj, key, value) => {
     if (prefix === "") {
       return { isValid: false, errorMessage: "EMPTY_PREFIX" };
     }
-    if (prefix && !labelRegex.test(prefix)) {
+    if (prefix && !labelPrefixRegex.test(prefix)) {
       return { isValid: false, errorMessage: "INVALID_PREFIX" };
     }
-    if (!labelRegex.test(name2)) {
+    if (!labelNameRegex.test(name2)) {
       return { isValid: false, errorMessage: "INVALID_NAME" };
     }
     if (prefix && prefix.length > 253) {
@@ -12217,7 +12218,7 @@ var __publicField = (obj, key, value) => {
     return { isValid: true };
   }
   function validateLabelValue(value2) {
-    const labelValueRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-\_]*[a-zA-Z0-9]$)/;
+    const labelValueRegex = /(^[a-zA-Z0-9]$)|(^[a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9]$)/;
     if (value2 === "") {
       return { isValid: true };
     }
@@ -12231,37 +12232,31 @@ var __publicField = (obj, key, value) => {
   }
   const LabelFormatPopover_105yfzn = "";
   const PodLabelFormatRulePopoverStyle = "p5jt6nm";
-  const LabelFormatPopover = ({
-    noValueValidation
-  }) => {
+  const LabelFormatPopover = () => {
     const {
       t: t2
     } = useTranslation();
-    const data2 = [{
-      object: t2("dovetail.key"),
-      contains: t2("dovetail.suffix"),
-      optional: t2("dovetail.no"),
-      rule: [t2("dovetail.suffix_format_rule_1"), t2("dovetail.suffix_format_rule_2"), t2("dovetail.suffix_format_rule_3")]
-    }, {
-      object: t2("dovetail.key"),
-      contains: t2("dovetail.name"),
-      optional: t2("dovetail.yes"),
-      rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
-    }];
-    if (!noValueValidation) {
-      data2.push({
-        object: t2("dovetail.value"),
-        contains: t2("dovetail.name"),
-        optional: t2("dovetail.no"),
-        rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
-      });
-    }
     return /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Popover, {
       overlayClassName: PodLabelFormatRulePopoverStyle,
       placement: "bottomRight",
       content: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.AntdTable, {
         bordered: true,
-        dataSource: data2,
+        dataSource: [{
+          object: t2("dovetail.key"),
+          contains: t2("dovetail.suffix"),
+          optional: t2("dovetail.no"),
+          rule: [t2("dovetail.suffix_format_rule_1"), t2("dovetail.suffix_format_rule_2"), t2("dovetail.suffix_format_rule_3")]
+        }, {
+          object: t2("dovetail.key"),
+          contains: t2("dovetail.name"),
+          optional: t2("dovetail.yes"),
+          rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
+        }, {
+          object: t2("dovetail.value"),
+          contains: t2("dovetail.name"),
+          optional: t2("dovetail.no"),
+          rule: [t2("dovetail.name_format_rule_1"), t2("dovetail.name_format_rule_2"), t2("dovetail.name_format_rule_3")]
+        }],
         columns: [{
           key: "object",
           title: t2("dovetail.object"),
@@ -12313,8 +12308,7 @@ var __publicField = (obj, key, value) => {
       defaultValue,
       onSubmit,
       extraColumns,
-      addButtonText,
-      noValueValidation
+      addButtonText
     } = props;
     const {
       t: t2
@@ -12384,8 +12378,6 @@ var __publicField = (obj, key, value) => {
           validator: ({
             value: value22
           }) => {
-            if (noValueValidation)
-              return;
             const {
               isValid
             } = validateLabelValue(value22 || "");
@@ -12404,9 +12396,7 @@ var __publicField = (obj, key, value) => {
         row: {
           deletable: true
         }
-      }), /* @__PURE__ */ jsxRuntimeExports.jsx(LabelFormatPopover, {
-        noValueValidation
-      })]
+      }), /* @__PURE__ */ jsxRuntimeExports.jsx(LabelFormatPopover, {})]
     });
   }
   const KeyValueTableFormForm = React.forwardRef(_KeyValueTableFormForm);
@@ -19489,13 +19479,13 @@ var __publicField = (obj, key, value) => {
         },
         {
           key: "started",
-          dataIndex: ["state", "running", "startedAt"],
+          dataIndex: ["startedAt"],
           title: i18n2.t("dovetail.created_time"),
           sortable: true,
-          sorter: CommonSorter(["state", "running", "startedAt"]),
+          sorter: CommonSorter(["startedAt"]),
           width: 120,
           render: (_, record) => {
-            const value2 = lodashEs.get(record, ["state", "running", "startedAt"]) || lodashEs.get(record, ["state", "terminated", "startedAt"]);
+            const value2 = record.startedAt;
             if (value2)
               return /* @__PURE__ */ jsxRuntimeExports.jsx(Time, { date: new Date(value2) });
             return /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, { value: "" });
@@ -19505,7 +19495,10 @@ var __publicField = (obj, key, value) => {
       [i18n2, initContainerStatuses]
     );
     const dataSource = React.useMemo(
-      () => addId(containerStatuses.concat(initContainerStatuses), "containerID"),
+      () => addId(containerStatuses.concat(initContainerStatuses), "containerID").map((container2) => ({
+        ...container2,
+        startedAt: lodashEs.get(container2, ["state", "running", "startedAt"]) || lodashEs.get(container2, ["state", "terminated", "startedAt"])
+      })),
       [containerStatuses, initContainerStatuses]
     );
     const {
@@ -19517,7 +19510,7 @@ var __publicField = (obj, key, value) => {
       data: dataSource,
       columns,
       defaultSorters: [{
-        field: "state.running.startedAt",
+        field: "startedAt",
         order: "desc"
       }]
     });
@@ -39615,8 +39608,7 @@ WARNING: This link could potentially be dangerous`)) {
         ref,
         defaultValue,
         onSubmit,
-        addButtonText: t2("dovetail.add_annotation"),
-        noValueValidation: true
+        addButtonText: t2("dovetail.add_annotation")
       }
     );
   });

package/lib/components/EditMetadataForm/KeyValueTableForm.d.ts

@@ -10,7 +10,6 @@ interface KeyValueTableFormFormProps<T extends KeyValuePair> {
     onSubmit: (value: T[]) => Promise<unknown> | undefined;
     extraColumns?: TableFormColumn[];
     addButtonText?: string;
-    noValueValidation?: boolean;
 }
 export declare const KeyValueTableFormForm: React.ForwardRefExoticComponent<KeyValueTableFormFormProps<KeyValuePair> & React.RefAttributes<EditFieldFormHandler>>;
 export {};

package/lib/components/EditMetadataForm/LabelFormatPopover.d.ts

@@ -1,5 +1,3 @@
 import React from 'react';
 export declare const PodLabelFormatRulePopoverStyle: import("@linaria/core").LinariaClassName;
-export declare const LabelFormatPopover: React.FC<{
-    noValueValidation?: boolean;
-}>;
+export declare const LabelFormatPopover: React.FC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.1.14",
+  "version": "0.1.15-alpha.0",
   "type": "module",
   "files": [
     "dist",