@dovetail-v2/refine 0.3.33 → 0.3.34

package/dist/components/Form/FormModal.d.ts

@@ -17,7 +17,7 @@ export interface ConfirmModalProps {
 }
 export type FormModalProps = {
     id?: string;
-    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig'>;
+    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig' | 'dataProviderName'>;
     yamlFormProps?: YamlFormProps;
     options?: {
         initialValues?: Record<string, unknown>;

package/dist/components/Form/RawYamlFormModal.d.ts

@@ -4,7 +4,7 @@ import { ResourceConfig } from 'src/types';
 import { YamlFormProps } from './YamlForm';
 type RawYamlFormModalProps = {
     id?: string;
-    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig'>;
+    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig' | 'dataProviderName'>;
     yamlFormProps?: YamlFormProps;
     onSuccess?: (data: UpdateResponse<BaseRecord> | CreateResponse<BaseRecord>) => void;
 };

package/dist/components/Form/RefineFormContainer.d.ts

@@ -7,7 +7,7 @@ import { YamlFormProps } from './YamlForm';
 interface RefineFormContainerProps {
     id: string;
     isYamlMode: boolean;
-    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'basePath' | 'formConfig'>;
+    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'basePath' | 'formConfig' | 'dataProviderName'>;
     step: number;
     formConfig: (RefineFormConfig & CommonFormConfig) | undefined;
     customYamlFormProps?: YamlFormProps;

package/dist/components/Form/useReactHookForm.d.ts

@@ -1,7 +1,6 @@
 import { BaseRecord, HttpError, UseFormProps as UseFormCoreProps, UseFormReturnType as UseFormReturnTypeCore } from '@refinedev/core';
 import React from 'react';
-import { DefaultValues } from 'react-hook-form';
-import { UseFormProps as UseHookFormProps, UseFormReturn, FieldValues } from 'react-hook-form';
+import { DefaultValues, UseFormProps as UseHookFormProps, UseFormReturn, FieldValues } from 'react-hook-form';
 export type UseFormReturnType<TQueryFnData extends BaseRecord = BaseRecord, TError extends HttpError = HttpError, TVariables extends FieldValues = FieldValues, TContext extends object = object, TData extends BaseRecord = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError> = UseFormReturn<TVariables, TContext> & {
     transformedInitValues: TVariables | undefined;
     refineCore: UseFormReturnTypeCore<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError>;

package/dist/components/Form/useRefineForm.d.ts

@@ -9,7 +9,7 @@ interface UseRefineFormOptions {
 export declare const useRefineForm: (props: {
     formConfig?: RefineFormConfig & CommonFormConfig;
     id?: string;
-    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'formConfig'>;
+    resourceConfig: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'formConfig' | 'dataProviderName'>;
     refineProps?: UseFormProps['refineCoreProps'];
     options?: UseRefineFormOptions;
 }) => {

package/dist/hooks/use409Retry.d.ts

@@ -0,0 +1,48 @@
+import { Unstructured } from 'k8s-api-provider';
+export type Retry409MetaOptions = {
+    /** 编辑表单打开时捕获的初始版本；通常由本 hook 自动捕获，外部一般不需要手动传入。 */
+    initialResource?: Unstructured;
+    /** provider 判断无法安全重试时抛出的本地化错误文案。 */
+    conflictMessage?: string;
+};
+type MutationMetaWith409Retry = Record<string, unknown> & {
+    /** 传给 k8s-api-provider 的 409 恢复内部参数。 */
+    resourceVersionConflictRetry?: Retry409MetaOptions;
+};
+type Use409RetryOptions = {
+    /** 当前表单动作；只有 edit 动作会启用 409 重试，create 会自动移除重试 meta。 */
+    action?: string;
+    /** 当前表单使用的数据源名称，用于找到对应 GlobalStore 并还原 raw YAML。 */
+    dataProviderName?: string;
+    /** 当前编辑资源的 id；部分调用链 action 不稳定时，用 id 作为 edit 场景的兜底判断。 */
+    id?: unknown;
+    /** 调用方原本要传给 refine useFormCore 的 mutationMeta，本 hook 会保留其它字段并覆盖内部 409 重试参数。 */
+    mutationMeta?: MutationMetaWith409Retry;
+};
+type Use409RetryResult = {
+    /** queryResult 拿到资源后调用，用来捕获打开编辑表单时的初始版本。 */
+    captureInitialResource: (resource?: Unstructured) => void;
+    /** 已合并 409 重试参数的 mutationMeta，应直接传给 refine useFormCore。 */
+    mutationMeta: Record<string, unknown>;
+};
+/**
+ * 为 D2 编辑表单接入 Kubernetes PUT 409 自动恢复能力。
+ *
+ * 背景：Kubernetes PUT 保存要求用户保存版本里的 `metadata.resourceVersion`
+ * 与服务端版本一致。如果用户编辑期间只有 status、managedFields 等运行时字段发生变化，
+ * D2 可以把打开表单时的初始版本交给 k8s-api-provider，由 provider 拉取服务端版本、
+ * 判断是否安全，并在安全时替换用户保存版本的 resourceVersion 后重试一次。
+ *
+ * 用法：FORM/YAML 表单在创建 refine useFormCore 前调用本 hook，把返回的 `mutationMeta`
+ * 传给 useFormCore；queryResult 首次拿到资源后调用 `captureInitialResource(data)`。
+ * D2 只负责捕获初始版本和传递本地化错误文案，比较、拉取服务端版本和重试都内聚在 provider。
+ *
+ * @param options - 409 重试接入配置。
+ * @param options.action - 当前表单动作；只有 edit 动作会启用 409 重试。
+ * @param options.dataProviderName - 当前表单使用的数据源名称，用于选择对应 GlobalStore。
+ * @param options.id - 当前编辑资源的 id，用作 edit 场景的兜底判断。
+ * @param options.mutationMeta - 调用方原本的 mutationMeta，本 hook 会保留其它字段并覆盖内部 409 重试参数。
+ * @returns 用于捕获初始版本的方法，以及应传给 useFormCore 的 mutationMeta。
+ */
+export declare function use409Retry({ action, dataProviderName, id, mutationMeta, }: Use409RetryOptions): Use409RetryResult;
+export {};

package/dist/hooks/useOpenForm.d.ts

@@ -2,7 +2,7 @@ import { CreateResponse, UpdateResponse, BaseRecord } from '@refinedev/core';
 import { ResourceConfig } from 'src/types';
 interface OpenFormOptions {
     id?: string;
-    resourceConfig?: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig'>;
+    resourceConfig?: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig' | 'dataProviderName'>;
     resourceName?: string;
     initialValues?: Record<string, unknown>;
     customOptions?: Record<string, unknown>;

package/dist/i18n.d.ts

@@ -187,6 +187,7 @@ export declare const resources: {
             data_expired: string;
             data_expired_body: string;
             data_expired_note: string;
+            resource_version_conflict: string;
             abandon_edit: string;
             exit_yaml_tip: string;
             value_optional: string;
@@ -473,6 +474,7 @@ export declare const resources: {
             data_expired: string;
             data_expired_body: string;
             data_expired_note: string;
+            resource_version_conflict: string;
             abandon_edit: string;
             exit_yaml_tip: string;
             form: string;

package/dist/locales/en-US/index.d.ts

@@ -184,6 +184,7 @@ declare const _default: {
         data_expired: string;
         data_expired_body: string;
         data_expired_note: string;
+        resource_version_conflict: string;
         abandon_edit: string;
         exit_yaml_tip: string;
         value_optional: string;

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

@@ -186,6 +186,7 @@ declare const _default: {
         data_expired: string;
         data_expired_body: string;
         data_expired_note: string;
+        resource_version_conflict: string;
         abandon_edit: string;
         exit_yaml_tip: string;
         form: string;

package/dist/refine.cjs

@@ -641,6 +641,7 @@ const edit_form$1 = "Edit form";
 const data_expired$1 = "Data expired";
 const data_expired_body$1 = "The data in this form is no longer the latest version. To avoid saving errors, please discard this edit and reopen the form to edit again.";
 const data_expired_note$1 = "Your current entries will not be saved.";
+const resource_version_conflict$1 = "The data in this form is no longer the latest version. Please discard this edit and reopen the form to edit again.";
 const abandon_edit$1 = "Discard edit";
 const exit_yaml_tip$1 = "If you go back to the form, any changes made to the YAML file will be lost.";
 const value_optional$1 = "Value (optional)";
@@ -922,6 +923,7 @@ const dovetail$1 = {
   data_expired: data_expired$1,
   data_expired_body: data_expired_body$1,
   data_expired_note: data_expired_note$1,
+  resource_version_conflict: resource_version_conflict$1,
   abandon_edit: abandon_edit$1,
   exit_yaml_tip: exit_yaml_tip$1,
   value_optional: value_optional$1,
@@ -1205,6 +1207,7 @@ const edit_form = "编辑表单";
 const data_expired = "数据已过期";
 const data_expired_body = "当前表单中的数据已不是最新版。为避免保存失败，请放弃本次编辑，并重新打开表单进行编辑。";
 const data_expired_note = "当前已填写内容将不会保留。";
+const resource_version_conflict = "当前表单中的数据已不是最新版，请放弃本次编辑，并重新打开表单进行编辑。";
 const abandon_edit = "放弃编辑";
 const exit_yaml_tip = "返回编辑表单，不会保留对 YAML 文件做出的所有更改。";
 const form = "表单";
@@ -1485,6 +1488,7 @@ const dovetail = {
   data_expired,
   data_expired_body,
   data_expired_note,
+  resource_version_conflict,
   abandon_edit,
   exit_yaml_tip,
   form,
@@ -10708,26 +10712,6 @@ function usePathMap(options) {
     transformApplyValues
   };
 }
-const useResourceVersionCheck = ({
-  queryResult
-}) => {
-  var _a, _b, _c;
-  const initialResourceVersionRef = React.useRef();
-  const [isExpired, setIsExpired] = React.useState(false);
-  const currentResourceVersion = (_c = (_b = (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data) == null ? void 0 : _b.metadata) == null ? void 0 : _c.resourceVersion;
-  React.useEffect(() => {
-    if (!currentResourceVersion)
-      return;
-    if (!initialResourceVersionRef.current) {
-      initialResourceVersionRef.current = currentResourceVersion;
-      return;
-    }
-    if (currentResourceVersion !== initialResourceVersionRef.current) {
-      setIsExpired(true);
-    }
-  }, [currentResourceVersion]);
-  return isExpired;
-};
 function getInitialValues(resourceConfig) {
   return resourceConfig.initValue || {
     apiVersion: resourceConfig.apiVersion,
@@ -10736,42 +10720,6 @@ function getInitialValues(resourceConfig) {
     spec: {}
   };
 }
-const button_1v659kh = "";
-const WarningButtonStyle = "wwyz7ti";
-const DataExpiredModal_eazxh6 = "";
-const NoteStyle = "n609wlp";
-function DataExpiredModal({
-  onAbandon
-}) {
-  const {
-    t: t2
-  } = common.useTranslation();
-  return /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.SmallDialog, {
-    title: t2("dovetail.data_expired"),
-    closable: false,
-    maskClosable: false,
-    cancelButtonProps: {
-      style: {
-        display: "none"
-      }
-    },
-    okText: t2("dovetail.abandon_edit"),
-    okButtonProps: {
-      className: WarningButtonStyle
-    },
-    onOk: (popModal) => {
-      popModal();
-      onAbandon();
-    },
-    children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
-      className: eagle.Typo.Label.l2_regular,
-      children: t2("dovetail.data_expired_body")
-    }), /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
-      className: `${eagle.Typo.Label.l2_regular} ${NoteStyle}`,
-      children: t2("dovetail.data_expired_note")
-    })]
-  });
-}
 const index_az4wrx = "";
 const WrapperStyle$5 = "w1akirqw";
 const TitleStyle$2 = "t30srnq";
@@ -11101,6 +11049,52 @@ function copyToClipboard(text) {
   document.execCommand("copy");
   document.body.removeChild(input);
 }
+const useGlobalStore = (name2 = "default") => {
+  const globalStores = React.useContext(GlobalStoreContext);
+  return globalStores[name2];
+};
+function use409Retry({
+  action,
+  dataProviderName,
+  id,
+  mutationMeta
+}) {
+  const { t: t2 } = common.useTranslation();
+  const globalStore = useGlobalStore(dataProviderName);
+  const initialResourceRef = React.useRef();
+  const isEditAction = action === "edit" || !!id;
+  const captureInitialResource = React.useCallback((resource) => {
+    var _a;
+    if (!isEditAction || initialResourceRef.current || !resource) {
+      return;
+    }
+    const rawResource = (_a = globalStore == null ? void 0 : globalStore.restoreItem) == null ? void 0 : _a.call(globalStore, resource);
+    if (!rawResource) {
+      return;
+    }
+    initialResourceRef.current = lodashEs.cloneDeep(rawResource);
+  }, [globalStore, isEditAction]);
+  const retryMutationMeta = React.useMemo(() => {
+    const restMutationMeta = lodashEs.omit(mutationMeta, "resourceVersionConflictRetry");
+    if (!isEditAction) {
+      return restMutationMeta;
+    }
+    return {
+      ...restMutationMeta,
+      resourceVersionConflictRetry: {
+        // refine 的 mutationMeta 在 hook 创建时就会固定；用 getter 让 provider 在保存瞬间读取最新的初始版本。
+        get initialResource() {
+          return initialResourceRef.current;
+        },
+        conflictMessage: t2("dovetail.resource_version_conflict")
+      }
+    };
+  }, [isEditAction, mutationMeta, t2]);
+  return {
+    captureInitialResource,
+    mutationMeta: retryMutationMeta
+  };
+}
 function useK8sYamlEditor() {
   const foldSymbol = React.useCallback(function(editor, symbol) {
     const model = editor.getModel();
@@ -11211,10 +11205,6 @@ function generateYamlBySchema(defaultValue, schema) {
   const content = yaml$2.dump(merged);
   return content.replace(/(')(#.+?)(')/g, "$2").replace(/( +)(#)/g, "$2$1");
 }
-const useGlobalStore = (name2 = "default") => {
-  const globalStores = React.useContext(GlobalStoreContext);
-  return globalStores[name2];
-};
 const useYamlForm = ({
   action: actionFromProps,
   resource,
@@ -11252,7 +11242,7 @@ const useYamlForm = ({
   onSubmitAbort,
   rules
 } = {}) => {
-  var _a;
+  var _a, _b;
   const editor = React.useRef(null);
   const { t: t2 } = common.useTranslation();
   const [isYamlValid, setIsYamlValid] = React.useState(true);
@@ -11263,7 +11253,17 @@ const useYamlForm = ({
   const [beforeSubmitErrors, setBeforeSubmitErrors] = React.useState([]);
   const [errorResponseBody, setErrorResponseBody] = React.useState(null);
   const useResourceResult = core.useResource();
-  const globalStore = useGlobalStore();
+  const globalStore = useGlobalStore(dataProviderName);
+  const action = React.useMemo(
+    () => actionFromProps || useResourceResult.action,
+    [actionFromProps, useResourceResult.action]
+  );
+  const { captureInitialResource, mutationMeta: finalMutationMeta } = use409Retry({
+    action,
+    dataProviderName,
+    id: idFromProps,
+    mutationMeta
+  });
   const {
     schema,
     loading: isLoadingSchema,
@@ -11300,7 +11300,7 @@ const useYamlForm = ({
     meta: core.pickNotDeprecated(meta, metaData),
     metaData: core.pickNotDeprecated(meta, metaData),
     queryMeta,
-    mutationMeta,
+    mutationMeta: finalMutationMeta,
     liveMode,
     liveParams,
     mutationMode,
@@ -11315,12 +11315,12 @@ const useYamlForm = ({
     overtimeOptions
   });
   const { formLoading, onFinish, queryResult } = useFormCoreResult;
+  React.useEffect(() => {
+    var _a2;
+    captureInitialResource((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data);
+  }, [captureInitialResource, (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data]);
   const { warnWhenUnsavedChanges: warnWhenUnsavedChangesRefine, setWarnWhen } = core.useWarnAboutChange();
   const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp ?? warnWhenUnsavedChangesRefine;
-  const action = React.useMemo(
-    () => actionFromProps || useResourceResult.action,
-    [actionFromProps, useResourceResult.action]
-  );
   const initialValues = React.useMemo(() => {
     var _a2;
     const initialValues2 = (action === "edit" && ((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data) ? initialValuesForEdit || (globalStore == null ? void 0 : globalStore.restoreItem(queryResult.data.data)) : initialValuesForCreate) || {};
@@ -11363,10 +11363,10 @@ const useYamlForm = ({
         }
       },
       onEditorCreate(editorInstance) {
-        var _a3, _b;
+        var _a3, _b2;
         const editorValue = yaml$2.dump(initialValues);
         (_a3 = editor.current) == null ? void 0 : _a3.setEditorValue(editorValue);
-        (_b = editor.current) == null ? void 0 : _b.setValue(editorValue);
+        (_b2 = editor.current) == null ? void 0 : _b2.setValue(editorValue);
         if (action === "edit") {
           fold2(editorInstance);
         }
@@ -11379,7 +11379,7 @@ const useYamlForm = ({
     initialValues,
     schemas,
     resource,
-    (_a = useResourceResult.resource) == null ? void 0 : _a.name,
+    (_b = useResourceResult.resource) == null ? void 0 : _b.name,
     action,
     finalErrors,
     fold2
@@ -11419,7 +11419,7 @@ const useYamlForm = ({
     formProps: {
       ...formSF.formProps,
       onFinish: async (values) => {
-        var _a2, _b;
+        var _a2, _b2;
         setBeforeSubmitErrors([]);
         onSubmitStart == null ? void 0 : onSubmitStart();
         const errors = [
@@ -11439,7 +11439,7 @@ const useYamlForm = ({
           return;
         }
         try {
-          const objectValues = editor.current ? yaml$2.load(((_b = editor.current) == null ? void 0 : _b.getEditorValue()) || "") : values;
+          const objectValues = editor.current ? yaml$2.load(((_b2 = editor.current) == null ? void 0 : _b2.getEditorValue()) || "") : values;
           let finalValues = (transformApplyValues == null ? void 0 : transformApplyValues(objectValues)) || objectValues;
           if (beforeSubmit) {
             try {
@@ -11541,6 +11541,7 @@ function YamlForm(props) {
     id,
     action: actionFromProps,
     resource: resource == null ? void 0 : resource.name,
+    dataProviderName: resourceConfig.dataProviderName,
     editorOptions: {
       isSkipSchema: schemaStrategy === "None"
       /* None */
@@ -11663,31 +11664,6 @@ function YamlFormContainer({
   onSaveButtonPropsChange
 }) {
   const action = id ? "edit" : "create";
-  const pushModal = eagle.usePushModal();
-  const popModal = eagle.usePopModal();
-  const hasShownExpiredRef = React.useRef(false);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const queryResult = core.useOne({
-    resource: resourceConfig.name,
-    id,
-    liveMode: id ? "auto" : "off",
-    queryOptions: { enabled: !!id }
-  });
-  const isExpired = useResourceVersionCheck({ queryResult });
-  React.useEffect(() => {
-    if (!isExpired || isSubmitting || hasShownExpiredRef.current) {
-      return;
-    }
-    hasShownExpiredRef.current = true;
-    pushModal({
-      component: DataExpiredModal,
-      props: {
-        onAbandon: () => {
-          popModal();
-        }
-      }
-    });
-  }, [isExpired, isSubmitting, pushModal, popModal]);
   const { transformInitValues, transformApplyValues } = usePathMap({
     pathMap: formConfig == null ? void 0 : formConfig.pathMap,
     transformInitValues: formConfig == null ? void 0 : formConfig.transformInitValues,
@@ -11707,13 +11683,7 @@ function YamlFormContainer({
       action,
       isShowLayout: false,
       useFormProps: {
-        redirect: false,
-        onSubmitStart: () => {
-          setIsSubmitting(true);
-        },
-        onSubmitAbort: () => {
-          setIsSubmitting(false);
-        }
+        redirect: false
       },
       rules: void 0,
       onSaveButtonPropsChange,
@@ -16068,6 +16038,8 @@ function ResourceShow(props) {
     }
   );
 }
+const button_1v659kh = "";
+const WarningButtonStyle = "wwyz7ti";
 const modal_1eijuvm = "";
 const SmallModalStyle = "s1nc293e";
 function FormModeSegmentControl({
@@ -16903,9 +16875,16 @@ const useForm = ({
   onSubmitAbort,
   ...rest
 } = {}) => {
+  var _a;
   const { options } = core.useRefineContext();
   const disableServerSideValidation = (options == null ? void 0 : options.disableServerSideValidation) || disableServerSideValidationProp;
   const translate = core.useTranslate();
+  const { captureInitialResource, mutationMeta } = use409Retry({
+    action: refineCoreProps == null ? void 0 : refineCoreProps.action,
+    dataProviderName: refineCoreProps == null ? void 0 : refineCoreProps.dataProviderName,
+    id: refineCoreProps == null ? void 0 : refineCoreProps.id,
+    mutationMeta: refineCoreProps == null ? void 0 : refineCoreProps.mutationMeta
+  });
   const { warnWhenUnsavedChanges: warnWhenUnsavedChangesRefine, setWarnWhen } = core.useWarnAboutChange();
   const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp ?? warnWhenUnsavedChangesRefine;
   const useHookFormResult = reactHookForm.useForm({
@@ -16925,10 +16904,11 @@ const useForm = ({
   } = useHookFormResult;
   const useFormCoreResult = core.useForm({
     ...refineCoreProps,
+    mutationMeta,
     onMutationError: (error, _variables, _context) => {
-      var _a, _b;
+      var _a2, _b;
       if (disableServerSideValidation) {
-        (_a = refineCoreProps == null ? void 0 : refineCoreProps.onMutationError) == null ? void 0 : _a.call(refineCoreProps, error, _variables, _context);
+        (_a2 = refineCoreProps == null ? void 0 : refineCoreProps.onMutationError) == null ? void 0 : _a2.call(refineCoreProps, error, _variables, _context);
         return;
       }
       const errors = error == null ? void 0 : error.errors;
@@ -16961,10 +16941,14 @@ const useForm = ({
   });
   const { queryResult, onFinish, formLoading, onFinishAutoSave } = useFormCoreResult;
   React.useEffect(() => {
-    var _a;
+    var _a2;
+    captureInitialResource((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data);
+  }, [captureInitialResource, (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data]);
+  React.useEffect(() => {
+    var _a2;
     if (formState.isDirty)
       return;
-    const data2 = (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data;
+    const data2 = (_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data;
     if (!data2)
       return;
     const transformedData = transformInitValues ? transformInitValues(data2) : data2;
@@ -16992,13 +16976,13 @@ const useForm = ({
   }, [watch]);
   const onValuesChange = React.useCallback(
     (changeValues) => {
-      var _a;
+      var _a2;
       if (warnWhenUnsavedChanges) {
         setWarnWhen(true);
       }
       if (refineCoreProps == null ? void 0 : refineCoreProps.autoSave) {
         setWarnWhen(false);
-        const onFinishProps = (_a = refineCoreProps.autoSave) == null ? void 0 : _a.onFinish;
+        const onFinishProps = (_a2 = refineCoreProps.autoSave) == null ? void 0 : _a2.onFinish;
         if (onFinishProps) {
           return onFinishAutoSave(onFinishProps(changeValues));
         }
@@ -17112,6 +17096,7 @@ const useRefineForm = (props) => {
       resource: resourceConfig.name,
       action: id ? "edit" : "create",
       id,
+      dataProviderName: resourceConfig.dataProviderName,
       liveMode: id ? "auto" : "off",
       ...refineProps
     },
@@ -17125,10 +17110,11 @@ const useRefineForm = (props) => {
     ...formConfig == null ? void 0 : formConfig.useFormProps
   });
   React.useEffect(() => {
-    var _a, _b;
+    var _a, _b, _c;
     const response = (_a = result.refineCore.mutationResult.error) == null ? void 0 : _a.response;
+    const message2 = (_b = result.refineCore.mutationResult.error) == null ? void 0 : _b.message;
     if (response && !(response == null ? void 0 : response.bodyUsed)) {
-      (_b = response.json) == null ? void 0 : _b.call(response).then((body) => {
+      (_c = response.json) == null ? void 0 : _c.call(response).then((body) => {
         var _a2;
         setResponseErrorMsgs(
           [].concat(
@@ -17136,8 +17122,10 @@ const useRefineForm = (props) => {
           )
         );
       });
+    } else if (message2 && responseErrorMsgs[0] !== message2) {
+      setResponseErrorMsgs([message2]);
     }
-  }, [formConfig, result, i18n2]);
+  }, [formConfig, result, i18n2, responseErrorMsgs]);
   return {
     formResult: result,
     responseErrorMsgs,
@@ -17158,10 +17146,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
 }, ref) {
   var _a, _b;
   const action = id ? "edit" : "create";
-  const pushModal = eagle.usePushModal();
-  const popModal = eagle.usePopModal();
-  const hasShownExpiredRef = React.useRef(false);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
   const refineFormResult = useRefineForm({
     resourceConfig,
     id,
@@ -17170,7 +17154,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         onSuccess == null ? void 0 : onSuccess(data2);
       },
       onMutationError() {
-        setIsSubmitting(false);
         onError == null ? void 0 : onError();
       },
       redirect: false,
@@ -17184,35 +17167,11 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
       ...options,
       onBeforeSubmitError: (errors) => {
         if (errors.length) {
-          setIsSubmitting(false);
           onError == null ? void 0 : onError();
         }
-      },
-      onSubmitStart: () => {
-        setIsSubmitting(true);
-      },
-      onSubmitAbort: () => {
-        setIsSubmitting(false);
       }
     }
   });
-  const isExpired = useResourceVersionCheck({
-    queryResult: refineFormResult.formResult.refineCore.queryResult
-  });
-  React.useEffect(() => {
-    if (!isExpired || isSubmitting || hasShownExpiredRef.current) {
-      return;
-    }
-    hasShownExpiredRef.current = true;
-    pushModal({
-      component: DataExpiredModal,
-      props: {
-        onAbandon: () => {
-          popModal();
-        }
-      }
-    });
-  }, [isExpired, isSubmitting, pushModal, popModal]);
   const fieldsConfig = useFieldsConfig(
     resourceConfig,
     { fields: formConfig == null ? void 0 : formConfig.fields },
@@ -17244,13 +17203,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         action,
         isShowLayout: false,
         useFormProps: {
-          redirect: false,
-          onSubmitStart: () => {
-            setIsSubmitting(true);
-          },
-          onSubmitAbort: () => {
-            setIsSubmitting(false);
-          }
+          redirect: false
         },
         rules: fieldsConfig == null ? void 0 : fieldsConfig.filter(
           (config) => "isSkipValidationInYaml" in config && !config.isSkipValidationInYaml

package/dist/refine.js

@@ -7,13 +7,13 @@ var __publicField = (obj, key2, value2) => {
 import dayjs from "dayjs";
 import i18n from "i18next";
 import { w as warnOnce, g as getDefaults, a as warn, b as getI18n, s as setDefaults, d as setI18n, I as I18nContext, j as jsxRuntimeExports, u as useTranslation, c as cx_default, S as SocketStatus } from "./common-241b21f8.js";
-import { ResourceContext, matchResourceFromRoute, useResource, useDelete, useNavigation, useBreadcrumb, useList, CanAccess, useUpdate, useForm as useForm$2, pickNotDeprecated, useWarnAboutChange, useOne, useParsed, useGo, useCan, useTable, useDeleteMany, useShow, useRefineContext, useTranslate, flattenObjectKeys, useMenu, Refine } from "@refinedev/core";
+import { ResourceContext, matchResourceFromRoute, useResource, useDelete, useNavigation, useBreadcrumb, useList, CanAccess, useUpdate, useForm as useForm$2, pickNotDeprecated, useWarnAboutChange, useParsed, useGo, useCan, useTable, useDeleteMany, useShow, useRefineContext, useTranslate, flattenObjectKeys, useMenu, Refine } from "@refinedev/core";
 import { parse, stringify } from "qs";
 import React, { createElement, isValidElement, cloneElement, Children, useContext, useCallback, createContext, useState, useEffect, useMemo, useRef, useImperativeHandle, forwardRef, Suspense, lazy, memo } from "react";
 import { useLocation, useHistory, useParams, matchPath, Link, Route, NavLink, Router } from "react-router-dom";
 import { usePushModal, usePopModal, DeleteDialog, Tag, RejectDialog, RejectDialogType, OverflowTooltip, Typo, Input, Select, AntdOption, Button, Form, Space, TextArea, kitContext, Loading, Table as Table$2, Pagination, Alert, ImmersiveDialog, SmallDialog, Fields, Units, Link as Link$1, Tooltip, Divider, Icon, Dropdown, Menu as Menu$1, LegacyModal, StatusCapsule, Popover, AntdTable, Upload, TableForm, ValidateTriggerType, AutoComplete, getOptions, DonutChart, SegmentControl, Checkbox, Tabs as Tabs$1, TabsTabPane, Col, Row, useMessage, SearchInput, Token, AntdSelectOptGroup, WizardDialog, MenuItemGroup, Layout as Layout$1, InputGroup, InputInteger, Time as Time$1, ModalStack, KitStoreProvider, ConfigProvider } from "@cloudtower/eagle";
 import { HierarchyTriangleRight16GrayIcon, HierarchyTriangleRight16BlueIcon, ClipboardCopy16GradientGrayIcon, ClipboardCopy16GradientBlueIcon, Retry16GradientGrayIcon, Retry16GradientBlueIcon, EditPen16GradientGrayIcon, EditPen16GradientBlueIcon, Showdiff16GradientGrayIcon, Showdiff16GradientBlueIcon, XmarkFailedSeriousWarningFill16RedIcon, EditPen16PrimaryIcon, Download16GradientBlueIcon, TrashBinDelete16Icon, MoreEllipsis324BoldSecondaryIcon, MoreEllipsis324BoldBlueIcon, MoreEllipsis316BoldBlueIcon, PlusAddCreateNew16BoldOntintIcon, ViewEye16GradientGrayIcon, EntityFilterIgnoreGradient16GrayIcon, InfoICircleFill16GrayIcon, InfoICircleFill16Gray70Icon, RecoverContinue16GradientBlueIcon, SuspendedPause16GradientBlueIcon, ArrowChevronLeft16BoldTertiaryIcon, ArrowChevronLeftSmall16BoldBlueIcon, OpenTerminal16GradientBlueIcon, ArrowChevronDown16BlueIcon, ArrowChevronUp16BlueIcon, Pause16GradientBlueIcon, EditPen16BlueIcon } from "@cloudtower/icons-react";
-import { first, get as get$2, cloneDeep, set, setWith, clone, debounce, isEqual as isEqual$1, isObject as isObject$4, uniq, omit as omit$1, merge, last, keyBy } from "lodash-es";
+import { first, get as get$2, cloneDeep, set, setWith, clone, debounce, isEqual as isEqual$1, omit as omit$1, isObject as isObject$4, uniq, merge, last, keyBy } from "lodash-es";
 import yaml$2 from "js-yaml";
 import { useForm as useForm$1 } from "sunflower-antd";
 import { useLocalStorage } from "usehooks-ts";
@@ -622,6 +622,7 @@ const edit_form$1 = "Edit form";
 const data_expired$1 = "Data expired";
 const data_expired_body$1 = "The data in this form is no longer the latest version. To avoid saving errors, please discard this edit and reopen the form to edit again.";
 const data_expired_note$1 = "Your current entries will not be saved.";
+const resource_version_conflict$1 = "The data in this form is no longer the latest version. Please discard this edit and reopen the form to edit again.";
 const abandon_edit$1 = "Discard edit";
 const exit_yaml_tip$1 = "If you go back to the form, any changes made to the YAML file will be lost.";
 const value_optional$1 = "Value (optional)";
@@ -903,6 +904,7 @@ const dovetail$1 = {
   data_expired: data_expired$1,
   data_expired_body: data_expired_body$1,
   data_expired_note: data_expired_note$1,
+  resource_version_conflict: resource_version_conflict$1,
   abandon_edit: abandon_edit$1,
   exit_yaml_tip: exit_yaml_tip$1,
   value_optional: value_optional$1,
@@ -1186,6 +1188,7 @@ const edit_form = "编辑表单";
 const data_expired = "数据已过期";
 const data_expired_body = "当前表单中的数据已不是最新版。为避免保存失败，请放弃本次编辑，并重新打开表单进行编辑。";
 const data_expired_note = "当前已填写内容将不会保留。";
+const resource_version_conflict = "当前表单中的数据已不是最新版，请放弃本次编辑，并重新打开表单进行编辑。";
 const abandon_edit = "放弃编辑";
 const exit_yaml_tip = "返回编辑表单，不会保留对 YAML 文件做出的所有更改。";
 const form = "表单";
@@ -1466,6 +1469,7 @@ const dovetail = {
   data_expired,
   data_expired_body,
   data_expired_note,
+  resource_version_conflict,
   abandon_edit,
   exit_yaml_tip,
   form,
@@ -10689,26 +10693,6 @@ function usePathMap(options) {
     transformApplyValues
   };
 }
-const useResourceVersionCheck = ({
-  queryResult
-}) => {
-  var _a, _b, _c;
-  const initialResourceVersionRef = useRef();
-  const [isExpired, setIsExpired] = useState(false);
-  const currentResourceVersion = (_c = (_b = (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data) == null ? void 0 : _b.metadata) == null ? void 0 : _c.resourceVersion;
-  useEffect(() => {
-    if (!currentResourceVersion)
-      return;
-    if (!initialResourceVersionRef.current) {
-      initialResourceVersionRef.current = currentResourceVersion;
-      return;
-    }
-    if (currentResourceVersion !== initialResourceVersionRef.current) {
-      setIsExpired(true);
-    }
-  }, [currentResourceVersion]);
-  return isExpired;
-};
 function getInitialValues(resourceConfig) {
   return resourceConfig.initValue || {
     apiVersion: resourceConfig.apiVersion,
@@ -10717,42 +10701,6 @@ function getInitialValues(resourceConfig) {
     spec: {}
   };
 }
-const button_1v659kh = "";
-const WarningButtonStyle = "wwyz7ti";
-const DataExpiredModal_eazxh6 = "";
-const NoteStyle = "n609wlp";
-function DataExpiredModal({
-  onAbandon
-}) {
-  const {
-    t: t2
-  } = useTranslation();
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs(SmallDialog, {
-    title: t2("dovetail.data_expired"),
-    closable: false,
-    maskClosable: false,
-    cancelButtonProps: {
-      style: {
-        display: "none"
-      }
-    },
-    okText: t2("dovetail.abandon_edit"),
-    okButtonProps: {
-      className: WarningButtonStyle
-    },
-    onOk: (popModal) => {
-      popModal();
-      onAbandon();
-    },
-    children: [/* @__PURE__ */ jsxRuntimeExports.jsx("div", {
-      className: Typo.Label.l2_regular,
-      children: t2("dovetail.data_expired_body")
-    }), /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
-      className: `${Typo.Label.l2_regular} ${NoteStyle}`,
-      children: t2("dovetail.data_expired_note")
-    })]
-  });
-}
 const index_az4wrx = "";
 const WrapperStyle$5 = "w1akirqw";
 const TitleStyle$2 = "t30srnq";
@@ -11082,6 +11030,52 @@ function copyToClipboard(text) {
   document.execCommand("copy");
   document.body.removeChild(input);
 }
+const useGlobalStore = (name2 = "default") => {
+  const globalStores = useContext(GlobalStoreContext);
+  return globalStores[name2];
+};
+function use409Retry({
+  action,
+  dataProviderName,
+  id,
+  mutationMeta
+}) {
+  const { t: t2 } = useTranslation();
+  const globalStore = useGlobalStore(dataProviderName);
+  const initialResourceRef = useRef();
+  const isEditAction = action === "edit" || !!id;
+  const captureInitialResource = useCallback((resource) => {
+    var _a;
+    if (!isEditAction || initialResourceRef.current || !resource) {
+      return;
+    }
+    const rawResource = (_a = globalStore == null ? void 0 : globalStore.restoreItem) == null ? void 0 : _a.call(globalStore, resource);
+    if (!rawResource) {
+      return;
+    }
+    initialResourceRef.current = cloneDeep(rawResource);
+  }, [globalStore, isEditAction]);
+  const retryMutationMeta = useMemo(() => {
+    const restMutationMeta = omit$1(mutationMeta, "resourceVersionConflictRetry");
+    if (!isEditAction) {
+      return restMutationMeta;
+    }
+    return {
+      ...restMutationMeta,
+      resourceVersionConflictRetry: {
+        // refine 的 mutationMeta 在 hook 创建时就会固定；用 getter 让 provider 在保存瞬间读取最新的初始版本。
+        get initialResource() {
+          return initialResourceRef.current;
+        },
+        conflictMessage: t2("dovetail.resource_version_conflict")
+      }
+    };
+  }, [isEditAction, mutationMeta, t2]);
+  return {
+    captureInitialResource,
+    mutationMeta: retryMutationMeta
+  };
+}
 function useK8sYamlEditor() {
   const foldSymbol = useCallback(function(editor, symbol) {
     const model = editor.getModel();
@@ -11192,10 +11186,6 @@ function generateYamlBySchema(defaultValue, schema) {
   const content = yaml$2.dump(merged);
   return content.replace(/(')(#.+?)(')/g, "$2").replace(/( +)(#)/g, "$2$1");
 }
-const useGlobalStore = (name2 = "default") => {
-  const globalStores = useContext(GlobalStoreContext);
-  return globalStores[name2];
-};
 const useYamlForm = ({
   action: actionFromProps,
   resource,
@@ -11233,7 +11223,7 @@ const useYamlForm = ({
   onSubmitAbort,
   rules
 } = {}) => {
-  var _a;
+  var _a, _b;
   const editor = useRef(null);
   const { t: t2 } = useTranslation();
   const [isYamlValid, setIsYamlValid] = useState(true);
@@ -11244,7 +11234,17 @@ const useYamlForm = ({
   const [beforeSubmitErrors, setBeforeSubmitErrors] = useState([]);
   const [errorResponseBody, setErrorResponseBody] = useState(null);
   const useResourceResult = useResource();
-  const globalStore = useGlobalStore();
+  const globalStore = useGlobalStore(dataProviderName);
+  const action = useMemo(
+    () => actionFromProps || useResourceResult.action,
+    [actionFromProps, useResourceResult.action]
+  );
+  const { captureInitialResource, mutationMeta: finalMutationMeta } = use409Retry({
+    action,
+    dataProviderName,
+    id: idFromProps,
+    mutationMeta
+  });
   const {
     schema,
     loading: isLoadingSchema,
@@ -11281,7 +11281,7 @@ const useYamlForm = ({
     meta: pickNotDeprecated(meta, metaData),
     metaData: pickNotDeprecated(meta, metaData),
     queryMeta,
-    mutationMeta,
+    mutationMeta: finalMutationMeta,
     liveMode,
     liveParams,
     mutationMode,
@@ -11296,12 +11296,12 @@ const useYamlForm = ({
     overtimeOptions
   });
   const { formLoading, onFinish, queryResult } = useFormCoreResult;
+  useEffect(() => {
+    var _a2;
+    captureInitialResource((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data);
+  }, [captureInitialResource, (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data]);
   const { warnWhenUnsavedChanges: warnWhenUnsavedChangesRefine, setWarnWhen } = useWarnAboutChange();
   const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp ?? warnWhenUnsavedChangesRefine;
-  const action = useMemo(
-    () => actionFromProps || useResourceResult.action,
-    [actionFromProps, useResourceResult.action]
-  );
   const initialValues = useMemo(() => {
     var _a2;
     const initialValues2 = (action === "edit" && ((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data) ? initialValuesForEdit || (globalStore == null ? void 0 : globalStore.restoreItem(queryResult.data.data)) : initialValuesForCreate) || {};
@@ -11344,10 +11344,10 @@ const useYamlForm = ({
         }
       },
       onEditorCreate(editorInstance) {
-        var _a3, _b;
+        var _a3, _b2;
         const editorValue = yaml$2.dump(initialValues);
         (_a3 = editor.current) == null ? void 0 : _a3.setEditorValue(editorValue);
-        (_b = editor.current) == null ? void 0 : _b.setValue(editorValue);
+        (_b2 = editor.current) == null ? void 0 : _b2.setValue(editorValue);
         if (action === "edit") {
           fold2(editorInstance);
         }
@@ -11360,7 +11360,7 @@ const useYamlForm = ({
     initialValues,
     schemas,
     resource,
-    (_a = useResourceResult.resource) == null ? void 0 : _a.name,
+    (_b = useResourceResult.resource) == null ? void 0 : _b.name,
     action,
     finalErrors,
     fold2
@@ -11400,7 +11400,7 @@ const useYamlForm = ({
     formProps: {
       ...formSF.formProps,
       onFinish: async (values) => {
-        var _a2, _b;
+        var _a2, _b2;
         setBeforeSubmitErrors([]);
         onSubmitStart == null ? void 0 : onSubmitStart();
         const errors = [
@@ -11420,7 +11420,7 @@ const useYamlForm = ({
           return;
         }
         try {
-          const objectValues = editor.current ? yaml$2.load(((_b = editor.current) == null ? void 0 : _b.getEditorValue()) || "") : values;
+          const objectValues = editor.current ? yaml$2.load(((_b2 = editor.current) == null ? void 0 : _b2.getEditorValue()) || "") : values;
           let finalValues = (transformApplyValues == null ? void 0 : transformApplyValues(objectValues)) || objectValues;
           if (beforeSubmit) {
             try {
@@ -11522,6 +11522,7 @@ function YamlForm(props) {
     id,
     action: actionFromProps,
     resource: resource == null ? void 0 : resource.name,
+    dataProviderName: resourceConfig.dataProviderName,
     editorOptions: {
       isSkipSchema: schemaStrategy === "None"
       /* None */
@@ -11644,31 +11645,6 @@ function YamlFormContainer({
   onSaveButtonPropsChange
 }) {
   const action = id ? "edit" : "create";
-  const pushModal = usePushModal();
-  const popModal = usePopModal();
-  const hasShownExpiredRef = useRef(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const queryResult = useOne({
-    resource: resourceConfig.name,
-    id,
-    liveMode: id ? "auto" : "off",
-    queryOptions: { enabled: !!id }
-  });
-  const isExpired = useResourceVersionCheck({ queryResult });
-  useEffect(() => {
-    if (!isExpired || isSubmitting || hasShownExpiredRef.current) {
-      return;
-    }
-    hasShownExpiredRef.current = true;
-    pushModal({
-      component: DataExpiredModal,
-      props: {
-        onAbandon: () => {
-          popModal();
-        }
-      }
-    });
-  }, [isExpired, isSubmitting, pushModal, popModal]);
   const { transformInitValues, transformApplyValues } = usePathMap({
     pathMap: formConfig == null ? void 0 : formConfig.pathMap,
     transformInitValues: formConfig == null ? void 0 : formConfig.transformInitValues,
@@ -11688,13 +11664,7 @@ function YamlFormContainer({
       action,
       isShowLayout: false,
       useFormProps: {
-        redirect: false,
-        onSubmitStart: () => {
-          setIsSubmitting(true);
-        },
-        onSubmitAbort: () => {
-          setIsSubmitting(false);
-        }
+        redirect: false
       },
       rules: void 0,
       onSaveButtonPropsChange,
@@ -16049,6 +16019,8 @@ function ResourceShow(props) {
     }
   );
 }
+const button_1v659kh = "";
+const WarningButtonStyle = "wwyz7ti";
 const modal_1eijuvm = "";
 const SmallModalStyle = "s1nc293e";
 function FormModeSegmentControl({
@@ -16884,9 +16856,16 @@ const useForm = ({
   onSubmitAbort,
   ...rest
 } = {}) => {
+  var _a;
   const { options } = useRefineContext();
   const disableServerSideValidation = (options == null ? void 0 : options.disableServerSideValidation) || disableServerSideValidationProp;
   const translate = useTranslate();
+  const { captureInitialResource, mutationMeta } = use409Retry({
+    action: refineCoreProps == null ? void 0 : refineCoreProps.action,
+    dataProviderName: refineCoreProps == null ? void 0 : refineCoreProps.dataProviderName,
+    id: refineCoreProps == null ? void 0 : refineCoreProps.id,
+    mutationMeta: refineCoreProps == null ? void 0 : refineCoreProps.mutationMeta
+  });
   const { warnWhenUnsavedChanges: warnWhenUnsavedChangesRefine, setWarnWhen } = useWarnAboutChange();
   const warnWhenUnsavedChanges = warnWhenUnsavedChangesProp ?? warnWhenUnsavedChangesRefine;
   const useHookFormResult = useForm$3({
@@ -16906,10 +16885,11 @@ const useForm = ({
   } = useHookFormResult;
   const useFormCoreResult = useForm$2({
     ...refineCoreProps,
+    mutationMeta,
     onMutationError: (error, _variables, _context) => {
-      var _a, _b;
+      var _a2, _b;
       if (disableServerSideValidation) {
-        (_a = refineCoreProps == null ? void 0 : refineCoreProps.onMutationError) == null ? void 0 : _a.call(refineCoreProps, error, _variables, _context);
+        (_a2 = refineCoreProps == null ? void 0 : refineCoreProps.onMutationError) == null ? void 0 : _a2.call(refineCoreProps, error, _variables, _context);
         return;
       }
       const errors = error == null ? void 0 : error.errors;
@@ -16942,10 +16922,14 @@ const useForm = ({
   });
   const { queryResult, onFinish, formLoading, onFinishAutoSave } = useFormCoreResult;
   useEffect(() => {
-    var _a;
+    var _a2;
+    captureInitialResource((_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data);
+  }, [captureInitialResource, (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data]);
+  useEffect(() => {
+    var _a2;
     if (formState.isDirty)
       return;
-    const data2 = (_a = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a.data;
+    const data2 = (_a2 = queryResult == null ? void 0 : queryResult.data) == null ? void 0 : _a2.data;
     if (!data2)
       return;
     const transformedData = transformInitValues ? transformInitValues(data2) : data2;
@@ -16973,13 +16957,13 @@ const useForm = ({
   }, [watch]);
   const onValuesChange = useCallback(
     (changeValues) => {
-      var _a;
+      var _a2;
       if (warnWhenUnsavedChanges) {
         setWarnWhen(true);
       }
       if (refineCoreProps == null ? void 0 : refineCoreProps.autoSave) {
         setWarnWhen(false);
-        const onFinishProps = (_a = refineCoreProps.autoSave) == null ? void 0 : _a.onFinish;
+        const onFinishProps = (_a2 = refineCoreProps.autoSave) == null ? void 0 : _a2.onFinish;
         if (onFinishProps) {
           return onFinishAutoSave(onFinishProps(changeValues));
         }
@@ -17093,6 +17077,7 @@ const useRefineForm = (props) => {
       resource: resourceConfig.name,
       action: id ? "edit" : "create",
       id,
+      dataProviderName: resourceConfig.dataProviderName,
       liveMode: id ? "auto" : "off",
       ...refineProps
     },
@@ -17106,10 +17091,11 @@ const useRefineForm = (props) => {
     ...formConfig == null ? void 0 : formConfig.useFormProps
   });
   useEffect(() => {
-    var _a, _b;
+    var _a, _b, _c;
     const response = (_a = result.refineCore.mutationResult.error) == null ? void 0 : _a.response;
+    const message2 = (_b = result.refineCore.mutationResult.error) == null ? void 0 : _b.message;
     if (response && !(response == null ? void 0 : response.bodyUsed)) {
-      (_b = response.json) == null ? void 0 : _b.call(response).then((body) => {
+      (_c = response.json) == null ? void 0 : _c.call(response).then((body) => {
         var _a2;
         setResponseErrorMsgs(
           [].concat(
@@ -17117,8 +17103,10 @@ const useRefineForm = (props) => {
           )
         );
       });
+    } else if (message2 && responseErrorMsgs[0] !== message2) {
+      setResponseErrorMsgs([message2]);
     }
-  }, [formConfig, result, i18n2]);
+  }, [formConfig, result, i18n2, responseErrorMsgs]);
   return {
     formResult: result,
     responseErrorMsgs,
@@ -17139,10 +17127,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
 }, ref) {
   var _a, _b;
   const action = id ? "edit" : "create";
-  const pushModal = usePushModal();
-  const popModal = usePopModal();
-  const hasShownExpiredRef = useRef(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
   const refineFormResult = useRefineForm({
     resourceConfig,
     id,
@@ -17151,7 +17135,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         onSuccess == null ? void 0 : onSuccess(data2);
       },
       onMutationError() {
-        setIsSubmitting(false);
         onError == null ? void 0 : onError();
       },
       redirect: false,
@@ -17165,35 +17148,11 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
       ...options,
       onBeforeSubmitError: (errors) => {
         if (errors.length) {
-          setIsSubmitting(false);
           onError == null ? void 0 : onError();
         }
-      },
-      onSubmitStart: () => {
-        setIsSubmitting(true);
-      },
-      onSubmitAbort: () => {
-        setIsSubmitting(false);
       }
     }
   });
-  const isExpired = useResourceVersionCheck({
-    queryResult: refineFormResult.formResult.refineCore.queryResult
-  });
-  useEffect(() => {
-    if (!isExpired || isSubmitting || hasShownExpiredRef.current) {
-      return;
-    }
-    hasShownExpiredRef.current = true;
-    pushModal({
-      component: DataExpiredModal,
-      props: {
-        onAbandon: () => {
-          popModal();
-        }
-      }
-    });
-  }, [isExpired, isSubmitting, pushModal, popModal]);
   const fieldsConfig = useFieldsConfig(
     resourceConfig,
     { fields: formConfig == null ? void 0 : formConfig.fields },
@@ -17225,13 +17184,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         action,
         isShowLayout: false,
         useFormProps: {
-          redirect: false,
-          onSubmitStart: () => {
-            setIsSubmitting(true);
-          },
-          onSubmitAbort: () => {
-            setIsSubmitting(false);
-          }
+          redirect: false
         },
         rules: fieldsConfig == null ? void 0 : fieldsConfig.filter(
           (config) => "isSkipValidationInYaml" in config && !config.isSkipValidationInYaml

package/dist/style.css

@@ -1148,113 +1148,6 @@
 /*  box shadow   */
 /*  fisheye   */
 /* z-index */
-.wwyz7ti.ant-btn.ant-btn.ant-btn-primary {
-  background-color: #fea008;
-}
-.wwyz7ti.ant-btn.ant-btn.ant-btn-primary:hover {
-  background-color: #feba33;
-}
-
-.c1xsou5f.ant-btn {
-  border-radius: 6px;
-  border: 1px solid rgba(172, 186, 211, 0.6) !important;
-}/* // 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 */
-.n609wlp {
-  margin-top: 8px;
-  color: #2d3a56;
-}/* // 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 */
 .w1akirqw {
   height: 100%;
   display: flex;
@@ -4376,6 +4269,63 @@
 /*  box shadow   */
 /*  fisheye   */
 /* z-index */
+.wwyz7ti.ant-btn.ant-btn.ant-btn-primary {
+  background-color: #fea008;
+}
+.wwyz7ti.ant-btn.ant-btn.ant-btn-primary:hover {
+  background-color: #feba33;
+}
+
+.c1xsou5f.ant-btn {
+  border-radius: 6px;
+  border: 1px solid rgba(172, 186, 211, 0.6) !important;
+}/* // 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 */
 .fq4465w.ant-modal.fullscreen .ant-modal-header {
   padding: 60px 0 32px 0;
   max-width: var(--max-modal-width, 1024px);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.3.33",
+  "version": "0.3.34",
   "type": "module",
   "files": [
     "dist",
@@ -30,7 +30,7 @@
     "dayjs": "^1.11.10",
     "i18next": "^23.2.3",
     "js-yaml": "^4.1.0",
-    "k8s-api-provider": "^0.0.36",
+    "k8s-api-provider": "^0.0.37",
     "ky": "^0.33.3",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",