@dovetail-v2/refine 0.1.11 → 0.1.12

package/dist/refine.umd.cjs

@@ -1575,6 +1575,12 @@ var __publicField = (obj, key, value) => {
   const name_format_rule_1 = "由字母、数字、连字符 (-)、下划线(_) 或点 (.) 组成";
   const name_format_rule_2 = "以字母或数字开头和结尾";
   const name_format_rule_3 = "不超过 63 个字符";
+  const taint_effect_NoSchedule_tooltip_1 = "正在节点上运行的 Pod 不会被驱逐。";
+  const taint_effect_NoSchedule_tooltip_2 = "新 Pod 不会调度到污点节点，除非有匹配的容忍度。";
+  const taint_effect_PreferNoSchedule_tooltip_1 = "不容忍污点的 Pod 将被立即驱逐。";
+  const taint_effect_PreferNoSchedule_tooltip_2 = "容忍污点但未设置容忍时长的 Pod 将继续运行。";
+  const taint_effect_PreferNoSchedule_tooltip_3 = "容忍污点并设置了容忍时长的 Pod 将按指定时间运行，时间结束后被驱逐。";
+  const taint_effect_NoExecute_tooltip_3 = "控制平面将尝试避免将不能容忍污点的 Pod 调度到节点上，但无法保证完全避免。";
   const dovetail = {
     copy: copy$1,
     reset_arguments,
@@ -1802,7 +1808,13 @@ var __publicField = (obj, key, value) => {
     suffix_format_rule_3,
     name_format_rule_1,
     name_format_rule_2,
-    name_format_rule_3
+    name_format_rule_3,
+    taint_effect_NoSchedule_tooltip_1,
+    taint_effect_NoSchedule_tooltip_2,
+    taint_effect_PreferNoSchedule_tooltip_1,
+    taint_effect_PreferNoSchedule_tooltip_2,
+    taint_effect_PreferNoSchedule_tooltip_3,
+    taint_effect_NoExecute_tooltip_3
   };
   const ZH = {
     dovetail
@@ -8195,6 +8207,9 @@ var __publicField = (obj, key, value) => {
     }
     // Fetch and process OpenAPI schemas
     async fetch() {
+      if (this.schemas) {
+        return this.schemas;
+      }
       try {
         const response = await fetch(
           `${this.pathPrefix}${this.resourceBasePath}`
@@ -8242,6 +8257,24 @@ var __publicField = (obj, key, value) => {
       });
     }
   }
+  class SchemaStore {
+    constructor() {
+      __publicField(this, "openapiMap", {});
+    }
+    async fetchSchemas(resourceBasePath, pathPrefix) {
+      const openapi = this.openapiMap[`${resourceBasePath}-${pathPrefix}`] || new K8sOpenAPI(resourceBasePath, pathPrefix);
+      this.openapiMap[`${resourceBasePath}-${pathPrefix}`] = openapi;
+      const schemas = await openapi.fetch();
+      return schemas;
+    }
+    async fetchSchema(resourceBasePath, pathPrefix, kind) {
+      const openapi = this.openapiMap[`${resourceBasePath}-${pathPrefix}`] || new K8sOpenAPI(resourceBasePath, pathPrefix);
+      this.openapiMap[`${resourceBasePath}-${pathPrefix}`] = openapi;
+      await openapi.fetch();
+      return openapi.findSchema(kind);
+    }
+  }
+  const schemaStore = new SchemaStore();
   const ConstantsContext = React.createContext({
     schemaUrlPrefix: ""
   });
@@ -8260,8 +8293,7 @@ var __publicField = (obj, key, value) => {
             if (state2.schemasMap[apiGroup]) {
               return { apiGroup, schemas: state2.schemasMap[apiGroup] };
             }
-            const openapi = new K8sOpenAPI(apiGroup, schemaUrlPrefix);
-            const groupSchemas = await openapi.fetch();
+            const groupSchemas = await schemaStore.fetchSchemas(apiGroup, schemaUrlPrefix);
             return { apiGroup, schemas: groupSchemas || [] };
           })
         );
@@ -8290,20 +8322,12 @@ var __publicField = (obj, key, value) => {
     const useResourceResult = core.useResource();
     const resource = (options == null ? void 0 : options.resource) || useResourceResult.resource;
     const { schemaUrlPrefix } = React.useContext(ConstantsContext);
-    const openapi = React.useMemo(
-      () => {
-        var _a2;
-        return new K8sOpenAPI((_a2 = resource == null ? void 0 : resource.meta) == null ? void 0 : _a2.resourceBasePath, schemaUrlPrefix);
-      },
-      [(_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.resourceBasePath, schemaUrlPrefix]
-    );
     const fetchSchema = React.useCallback(async () => {
-      var _a2;
+      var _a2, _b2;
       setLoading(true);
       setError(null);
       try {
-        await openapi.fetch();
-        const schema2 = await openapi.findSchema((_a2 = resource == null ? void 0 : resource.meta) == null ? void 0 : _a2.kind);
+        const schema2 = await schemaStore.fetchSchema((_a2 = resource == null ? void 0 : resource.meta) == null ? void 0 : _a2.resourceBasePath, schemaUrlPrefix, (_b2 = resource == null ? void 0 : resource.meta) == null ? void 0 : _b2.kind);
         setSchema(schema2 || null);
         setError(null);
       } catch (e2) {
@@ -8311,7 +8335,7 @@ var __publicField = (obj, key, value) => {
       } finally {
         setLoading(false);
       }
-    }, [(_b = resource == null ? void 0 : resource.meta) == null ? void 0 : _b.kind, openapi]);
+    }, [(_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind, (_b = resource == null ? void 0 : resource.meta) == null ? void 0 : _b.resourceBasePath, schemaUrlPrefix]);
     React.useEffect(() => {
       if (options == null ? void 0 : options.skip)
         return;
@@ -8936,11 +8960,6 @@ var __publicField = (obj, key, value) => {
     } = props;
     const auxiliaryLineRef = React.useRef(null);
     const wrapperRef = React.useRef(null);
-    React.useMemo(() => ({
-      current: currentPage,
-      pageSize: defaultSize,
-      onChange: onPageChange
-    }), [currentPage, defaultSize, onPageChange]);
     const finalColumns = React.useMemo(() => {
       if (RowMenu) {
         const actionColumn = {
@@ -9538,10 +9557,8 @@ var __publicField = (obj, key, value) => {
                   distributeStorage: validators.distributeStorage(v)
                 });
               },
-              onBlur: () => {
-              },
-              onFocus: () => {
-              }
+              onBlur: () => void 0,
+              onFocus: () => void 0
             },
             min: 1,
             meta: {},
@@ -11563,7 +11580,7 @@ var __publicField = (obj, key, value) => {
           width: 120,
           render(value2) {
             const colorMap = {
-              "Warning": "red",
+              "Warning": "warning",
               "Normal": "green"
             };
             return /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.StatusCapsule, { color: colorMap[value2], className: cx_default(StateTagStyle, "no-background"), children: i18n2.t(`dovetail.${value2.toLowerCase()}`) });
@@ -18612,7 +18629,6 @@ var __publicField = (obj, key, value) => {
     const [currentItemCount, setCurrentItemCount] = React.useState(0);
     const [paused, setPaused] = React.useState(false);
     const [wrap, setWrap] = React.useState(false);
-    const [linesBehind, setLinesBehind] = React.useState(0);
     const logViewerRef = React.useRef(null);
     const abortControllerRef = React.useRef(null);
     const dataProvider = core.useDataProvider();
@@ -18626,10 +18642,6 @@ var __publicField = (obj, key, value) => {
         if (logViewerRef && logViewerRef.current) {
           logViewerRef.current.scrollToBottom();
         }
-      } else if (logs.length !== currentItemCount) {
-        setLinesBehind(logs.length - currentItemCount);
-      } else {
-        setLinesBehind(0);
       }
     }, [paused, logs, currentItemCount]);
     const onScroll = (params) => {
@@ -18748,7 +18760,6 @@ var __publicField = (obj, key, value) => {
                 setSelectedContainer(newValue);
                 setLogs([]);
                 setPaused(false);
-                setLinesBehind(0);
               },
               value: selectedContainer
             },
@@ -39238,8 +39249,7 @@ WARNING: This link could potentially be dangerous`)) {
             if (!value22)
               return t2("dovetail.key_empty_text");
             const {
-              isValid,
-              errorMessage
+              isValid
             } = validateLabelKey(value22 || "");
             if (!isValid)
               return t2("dovetail.format_error");
@@ -39450,6 +39460,179 @@ WARNING: This link could potentially be dangerous`)) {
       }
     );
   }
+  const EditNodeTaintForm_cgov7z = "";
+  const UlStyle = "u19jcs7t";
+  const EditNodeTaintForm = React.forwardRef(function EditNodeTaintForm2(props, ref) {
+    const {
+      nodeModel
+    } = props;
+    const {
+      mutateAsync
+    } = core.useUpdate();
+    const {
+      t: t2
+    } = useTranslation();
+    const defaultValue = React.useMemo(() => {
+      var _a;
+      return ((_a = nodeModel._rawYaml.spec) == null ? void 0 : _a.taints) || [];
+    }, [nodeModel]);
+    const onSubmit = React.useCallback((_value) => {
+      const value2 = _value;
+      const newYaml = nodeModel._globalStore.restoreItem(nodeModel);
+      if (newYaml.spec) {
+        newYaml.spec.taints = value2;
+      }
+      pruneBeforeEdit(newYaml);
+      return mutateAsync({
+        id: nodeModel.id,
+        resource: nodeModel.name || "",
+        values: newYaml,
+        meta: {
+          resourceBasePath: nodeModel.apiVersion,
+          kind: nodeModel.kind
+        },
+        successNotification() {
+          return {
+            message: t2("dovetail.edit_node_taint_success_toast", {
+              kind: nodeModel.kind,
+              name: nodeModel.metadata.name,
+              interpolation: {
+                escapeValue: false
+              }
+            }),
+            type: "success"
+          };
+        },
+        errorNotification: false
+      });
+    }, [nodeModel, mutateAsync, t2]);
+    const noScheduleTooltip = /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
+      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("b", {
+        children: "NoSchedule"
+      }), /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", {
+        className: UlStyle,
+        children: [/* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_NoSchedule_tooltip_1")
+        }), /* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_NoSchedule_tooltip_2")
+        })]
+      })]
+    });
+    const preferNoScheduleTooltip = /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
+      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("b", {
+        children: "PreferNoSchedule"
+      }), /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", {
+        className: UlStyle,
+        children: [/* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_PreferNoSchedule_tooltip_1")
+        }), /* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_PreferNoSchedule_tooltip_2")
+        }), /* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_PreferNoSchedule_tooltip_3")
+        })]
+      })]
+    });
+    const noExecuteTooltip = /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
+      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("b", {
+        children: "NoExecute"
+      }), /* @__PURE__ */ jsxRuntimeExports.jsx("ul", {
+        className: UlStyle,
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx("li", {
+          children: t2("dovetail.taint_effect_NoExecute_tooltip_3")
+        })
+      })]
+    });
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(KeyValueTableFormForm, {
+      ref,
+      defaultValue,
+      onSubmit,
+      addButtonText: t2("dovetail.add_taint"),
+      extraColumns: [{
+        key: "effect",
+        title: t2("dovetail.effect"),
+        render: ({
+          value: value2,
+          onChange
+        }) => {
+          return /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Select, {
+            input: {},
+            value: value2,
+            onChange,
+            size: "small",
+            children: eagle.getOptions([{
+              value: "NoSchedule",
+              children: t2(`dovetail.node_taint_${"NoSchedule"}`),
+              suffix: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Tooltip, {
+                title: noScheduleTooltip,
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Icon, {
+                  src: iconsReact.InfoICircleFill16GrayIcon,
+                  hoverSrc: iconsReact.InfoICircleFill16Gray70Icon
+                })
+              })
+            }, {
+              value: "PreferNoSchedule",
+              children: t2(`dovetail.node_taint_${"PreferNoSchedule"}`),
+              suffix: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Tooltip, {
+                title: preferNoScheduleTooltip,
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Icon, {
+                  src: iconsReact.InfoICircleFill16GrayIcon,
+                  hoverSrc: iconsReact.InfoICircleFill16Gray70Icon
+                })
+              })
+            }, {
+              value: "NoExecute",
+              children: t2(`dovetail.node_taint_${"NoExecute"}`),
+              suffix: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Tooltip, {
+                title: noExecuteTooltip,
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Icon, {
+                  src: iconsReact.InfoICircleFill16GrayIcon,
+                  hoverSrc: iconsReact.InfoICircleFill16Gray70Icon
+                })
+              })
+            }])
+          });
+        },
+        validator: ({
+          value: value2
+        }) => {
+          if (!value2)
+            return t2("dovetail.taint_effect_empty_text");
+        }
+      }]
+    });
+  });
+  function EditNodeTaintDropdownMenuItem(props) {
+    const { formRef, resourceModel } = props;
+    const { t: t2 } = useTranslation();
+    const pushModal = eagle.usePushModal();
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
+      eagle.Menu.Item,
+      {
+        className: "ant-dropdown-menu-item",
+        onClick: () => {
+          const modalProps = {
+            formRef,
+            title: t2("dovetail.edit_node_taint"),
+            fullscreen: true,
+            renderContent() {
+              return /* @__PURE__ */ jsxRuntimeExports.jsx(
+                EditNodeTaintForm,
+                {
+                  ref: formRef,
+                  nodeModel: resourceModel
+                }
+              );
+            }
+          };
+          pushModal({
+            component: EditFieldModal,
+            props: modalProps
+          });
+        },
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16BlueIcon, children: t2("dovetail.edit_node_taint") })
+      }
+    );
+  }
   const index_sazpyf = "";
   const WrapperStyle = "wfg6u6g";
   const InnerBar = ({
@@ -40739,6 +40922,7 @@ WARNING: This link could potentially be dangerous`)) {
   exports2.EditAnnotationDropdownMenuItem = EditAnnotationDropdownMenuItem;
   exports2.EditButton = EditButton;
   exports2.EditLabelDropdownMenuItem = EditLabelDropdownMenuItem;
+  exports2.EditNodeTaintDropdownMenuItem = EditNodeTaintDropdownMenuItem;
   exports2.ErrorContent = WidgetErrorContent;
   exports2.ErrorContentType = ErrorContentType;
   exports2.ErrorWrapper = ErrorWrapper;

package/dist/style.css

@@ -4335,6 +4335,56 @@
 /*  box shadow   */
 /*  fisheye   */
 /* z-index */
+.u19jcs7t {
+  list-style: disc;
+  padding-left: 2em;
+}/* // basic */
+/* FishEye Color Variables and Functions */
+/*
+ --------------------------- Primary Color ---------------------------
+*/
+/*
+ ---------------------------When necessary to add at any time---------------------------
+*/
+/* computed */
+/* blue */
+/* green */
+/* yellow */
+/* red */
+/* purple */
+/*  palette    global token*/
+/* color opaque */
+/* color transparent */
+/* blue transparent  */
+/* green transparent  */
+/* yellow transparent  */
+/* red transparent  */
+/* gray transparent */
+/* white transparent */
+/* gradient opaque */
+/* blue radial gradient */
+/* blue linear gradient */
+/* green radial gradient */
+/* yellow radial gradient */
+/* red radial gradient */
+/* gray radial gradient */
+/* white to gray radial gradient */
+/*  white to gray  linear gradient */
+/* gradient transparent */
+/* secondary palette */
+/* purple radial gradient */
+/*  refine alias color   */
+/*  text   */
+/*  link   */
+/*  fill   */
+/*  fill  element  */
+/*  fill  interaction  */
+/*  stroke   */
+/*  background   */
+/*  dim   */
+/*  box shadow   */
+/*  fisheye   */
+/* z-index */
 .wfg6u6g {
   display: flex;
   align-items: center;

package/lib/components/DropdownMenuItems/index.d.ts

@@ -1,2 +1,3 @@
 export * from './EditLabelDropdownMenuItem';
 export * from './EditAnnotationDropdownMenuItem';
+export * from './EditNodeTaintDropdownMenuItem';

package/lib/components/Form/useYamlForm.d.ts

@@ -4,8 +4,8 @@ import { FormInstance, FormProps } from 'antd/lib/form';
 import { JSONSchema7 } from 'json-schema';
 import { Unstructured } from 'k8s-api-provider';
 import React from 'react';
-import { type YamlEditorHandle, type YamlEditorProps } from 'src/components/YamlEditor';
 import { RefineFormValidator } from 'src/components/Form/type';
+import { type YamlEditorHandle, type YamlEditorProps } from 'src/components/YamlEditor';
 type EditorProps = YamlEditorProps & {
     ref: React.RefObject<YamlEditorHandle>;
 };

package/lib/i18n.d.ts

@@ -405,6 +405,12 @@ export declare const resources: {
             name_format_rule_1: string;
             name_format_rule_2: string;
             name_format_rule_3: string;
+            taint_effect_NoSchedule_tooltip_1: string;
+            taint_effect_NoSchedule_tooltip_2: string;
+            taint_effect_PreferNoSchedule_tooltip_1: string;
+            taint_effect_PreferNoSchedule_tooltip_2: string;
+            taint_effect_PreferNoSchedule_tooltip_3: string;
+            taint_effect_NoExecute_tooltip_3: string;
         };
     };
 };

package/lib/locales/zh-CN/index.d.ts

@@ -227,6 +227,12 @@ declare const _default: {
         name_format_rule_1: string;
         name_format_rule_2: string;
         name_format_rule_3: string;
+        taint_effect_NoSchedule_tooltip_1: string;
+        taint_effect_NoSchedule_tooltip_2: string;
+        taint_effect_PreferNoSchedule_tooltip_1: string;
+        taint_effect_PreferNoSchedule_tooltip_2: string;
+        taint_effect_PreferNoSchedule_tooltip_3: string;
+        taint_effect_NoExecute_tooltip_3: string;
     };
 };
 export default _default;

package/lib/types/resource.d.ts

@@ -2,8 +2,8 @@
 import { UseFormProps } from '@refinedev/react-hook-form';
 import { YamlFormProps } from '../components';
 import { RefineFormField } from '../components/Form';
-import { ShowConfig } from '../components/ShowContent';
 import { Column, InternalTableProps } from '../components/InternalBaseTable';
+import { ShowConfig } from '../components/ShowContent';
 import { ResourceModel } from '../models';
 export declare enum RESOURCE_GROUP {
     WORKLOAD = "WORKLOAD",

package/lib/utils/schema-store.d.ts

@@ -0,0 +1,13 @@
+declare class SchemaStore {
+    private openapiMap;
+    fetchSchemas(resourceBasePath: string, pathPrefix: string): Promise<(import("json-schema").JSONSchema7 & {
+        'x-kubernetes-group-version-kind': {
+            group: string;
+            kind: string;
+            version: string;
+        }[];
+    })[] | null>;
+    fetchSchema(resourceBasePath: string, pathPrefix: string, kind: string): Promise<import("json-schema").JSONSchema7 | undefined>;
+}
+declare const _default: SchemaStore;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "files": [
     "dist",
@@ -10,8 +10,8 @@
   "module": "./dist/refine.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@cloudtower/eagle":  "^0.31.18",
-    "@cloudtower/icons-react": "^0.31.18",
+    "@cloudtower/eagle":  "^0.31.19",
+    "@cloudtower/icons-react": "^0.31.19",
     "@patternfly/react-core": "^5.1.1",
     "@patternfly/react-log-viewer": "^5.0.0",
     "@refinedev/core": "^4.47.2",