@dovetail-v2/refine 0.3.19-alpha.1 → 0.3.19-alpha.2

package/dist/components/Dropdowns/K8sDropdown/index.d.ts

@@ -1,5 +1,6 @@
 import { DeleteDialogProps } from '@cloudtower/eagle';
 import React from 'react';
+import { ResourceConfig } from 'src/types';
 import { ResourceModel } from '../../../models';
 export type DropdownSize = 'normal' | 'large';
 interface K8sDropdownProps {
@@ -7,6 +8,7 @@ interface K8sDropdownProps {
     size?: DropdownSize;
     customButton?: React.ReactNode;
     resourceName?: string;
+    config?: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig' | 'hideEdit'>;
     displayName?: string;
     deleteDialogProps?: Partial<DeleteDialogProps>;
     hideEdit?: boolean;

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

@@ -1,6 +1,7 @@
 import { WizardDialogProps } from '@cloudtower/eagle/dist/src/core/WizardDialog/type';
 import { BaseRecord, CreateResponse, UpdateResponse } from '@refinedev/core';
 import React from 'react';
+import { ResourceConfig } from 'src/types';
 import { YamlFormProps } from './YamlForm';
 export type SaveButtonProps = {
     disabled: boolean;
@@ -15,8 +16,8 @@ export interface ConfirmModalProps {
     onOk?: () => void;
 }
 export type FormModalProps = {
-    resource?: string;
     id?: string;
+    config: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig'>;
     yamlFormProps?: YamlFormProps;
     options?: {
         initialValues?: Record<string, unknown>;

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

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

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

@@ -5,7 +5,7 @@ import { RefineFormFieldRenderProps } from 'src/components/Form/type';
 import { ResourceModel } from 'src/models';
 import { CommonFormConfig, RefineFormConfig, ResourceConfig } from 'src/types';
 type RefineFormContentProps<Model extends ResourceModel> = {
-    config?: ResourceConfig<Model>;
+    config?: Pick<ResourceConfig<Model>, 'name' | 'displayName' | 'kind' | 'initValue' | 'basePath' | 'formConfig'>;
     step?: number;
     formConfig?: CommonFormConfig & RefineFormConfig;
     formResult: UseFormReturnType;

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

@@ -14,7 +14,7 @@ export interface YamlFormProps<Model extends ResourceModel = ResourceModel> {
     id?: string;
     resource?: string;
     action?: FormAction;
-    config: ResourceConfig<Model>;
+    config: Pick<ResourceConfig<Model>, 'displayName' | 'dataProviderName' | 'basePath' | 'kind' | 'parent'>;
     initialValuesForCreate?: Record<string, unknown>;
     initialValuesForEdit?: Record<string, unknown>;
     schemaStrategy?: SchemaStrategy;

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

@@ -7,7 +7,7 @@ import { YamlFormConfig } from 'src/types';
 import { YamlFormProps } from './YamlForm';
 interface YamlFormContainerProps {
     id: string;
-    config: ResourceConfig;
+    config: Pick<ResourceConfig, 'name' | 'displayName' | 'kind' | 'initValue' | 'apiVersion' | 'basePath' | 'formConfig' | 'dataProviderName' | 'parent'>;
     customYamlFormProps?: YamlFormProps;
     formConfig?: YamlFormConfig & CommonFormConfig;
     onSuccess?: (data: UpdateResponse<BaseRecord> | CreateResponse<BaseRecord>) => void;

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

@@ -1,7 +1,7 @@
 import { FieldValues } from 'react-hook-form';
 import { ResourceModel } from 'src/models';
 import { RefineFormConfig, ResourceConfig } from 'src/types';
-declare function useFieldsConfig<Model extends ResourceModel>(config?: ResourceConfig<Model>, formConfig?: {
+declare function useFieldsConfig<Model extends ResourceModel>(config?: Pick<ResourceConfig<Model>, 'name' | 'displayName' | 'kind' | 'initValue' | 'basePath' | 'formConfig'>, formConfig?: {
     fields: RefineFormConfig['fields'];
 }, resourceId?: string, step?: number, customOptions?: Record<string, unknown>, transformedInitValues?: FieldValues): (import("./type").RefineFormField | import("./type").RefineFormSection)[] | undefined;
 export default useFieldsConfig;

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

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

package/dist/hooks/useOpenForm.d.ts

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

package/dist/refine.cjs

@@ -10583,11 +10583,11 @@ function useOpenForm() {
   const pushModal = eagle.usePushModal();
   const go = core.useGo();
   return function openForm(options) {
-    var _a;
-    const finalResourceName = (options == null ? void 0 : options.resourceName) || (resource == null ? void 0 : resource.name);
-    if (finalResourceName) {
-      const config = configs[finalResourceName];
-      const formType = (_a = config.formConfig) == null ? void 0 : _a.formContainerType;
+    var _a, _b;
+    const finalResourceName = (options == null ? void 0 : options.resourceName) || ((_a = options == null ? void 0 : options.config) == null ? void 0 : _a.name) || (resource == null ? void 0 : resource.name);
+    if (finalResourceName || (options == null ? void 0 : options.config)) {
+      const config = (options == null ? void 0 : options.config) || configs[finalResourceName || ""];
+      const formType = (_b = config.formConfig) == null ? void 0 : _b.formContainerType;
       if (formType === void 0 || formType === FormContainerType.MODAL) {
         pushModal({
           component: () => {
@@ -10596,8 +10596,8 @@ function useOpenForm() {
             return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
               ModalComponent,
               {
-                resource: finalResourceName,
                 id: options == null ? void 0 : options.id,
+                config,
                 yamlFormProps: {
                   config
                 },
@@ -10612,7 +10612,7 @@ function useOpenForm() {
         edit2(options.id);
       } else {
         go({
-          to: navigation.createUrl(finalResourceName),
+          to: navigation.createUrl(finalResourceName || ""),
           options: {
             keepQuery: true
           }
@@ -10838,6 +10838,7 @@ function K8sDropdown(props) {
     record,
     size = "normal",
     resourceName: resourceNameFromProps,
+    config: configFromProps,
     customButton,
     deleteDialogProps,
     displayName,
@@ -10847,7 +10848,7 @@ function K8sDropdown(props) {
   const useResourceResult = core.useResource();
   const configs = React.useContext(ConfigsContext);
   const resourceName = resourceNameFromProps || getResourceNameByKind(record.kind || "", configs);
-  const config = configs[resourceName || ""];
+  const config = configFromProps || configs[resourceName || ""];
   const { t: t2, i18n: i18n2 } = common.useTranslation();
   const { openDeleteConfirmModal } = useDeleteModal({
     resourceName: resourceName || "",
@@ -10855,7 +10856,10 @@ function K8sDropdown(props) {
     displayName,
     meta: record.apiVersion ? {
       kind: record.kind || "",
-      resourceBasePath: (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
+      resourceBasePath: (
+        // k8s 通用规则，apiVersion 包含 / 则使用 apis，否则使用 api
+        (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
+      )
     } : void 0
   });
   const download2 = useDownloadYAML();
@@ -10880,10 +10884,16 @@ function K8sDropdown(props) {
     eagle.Dropdown,
     {
       overlay: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Menu, { children: [
-        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Menu.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
-          (config == null ? void 0 : config.displayName) || record.kind || "",
-          i18n2.language
-        )}` : t2("dovetail.edit_yaml") }) }),
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(
+          eagle.Menu.Item,
+          {
+            onClick: () => openForm({ id: record.id, resourceName, config }),
+            children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
+              displayName || (config == null ? void 0 : config.displayName) || record.kind || "",
+              i18n2.language
+            )}` : t2("dovetail.edit_yaml") })
+          }
+        ),
         /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           eagle.Menu.Item,
           {
@@ -14620,7 +14630,7 @@ function ListPage(props) {
       })]
     }) : void 0, /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
       className: common.cx_default(ListContentStyle, contentClassName),
-      style: !config.customFilterBar && config.nonNsResource ? {
+      style: !customFilterBar && !config.customFilterBar && config.nonNsResource ? {
         paddingTop: 0
       } : {},
       children: [customFilterBar || config.customFilterBar || !config.nonNsResource && /* @__PURE__ */ common.jsxRuntimeExports.jsx(NamespacesFilter, {
@@ -15745,14 +15755,14 @@ const useRefineForm = (props) => {
         var _a;
         const formValue = result.getValues();
         return {
-          message: i18n2.t(
-            id ? "dovetail.edit_resource_success" : "dovetail.create_success_toast",
-            {
-              kind: transformResourceKindInSentence(config.displayName || config.kind, i18n2.language),
-              name: (_a = formValue.metadata) == null ? void 0 : _a.name,
-              interpolation: { escapeValue: false }
-            }
-          ).trim(),
+          message: i18n2.t(id ? "dovetail.edit_resource_success" : "dovetail.create_success_toast", {
+            kind: transformResourceKindInSentence(
+              config.displayName || config.kind,
+              i18n2.language
+            ),
+            name: (_a = formValue.metadata) == null ? void 0 : _a.name,
+            interpolation: { escapeValue: false }
+          }).trim(),
           description: "Success",
           type: "success"
         };
@@ -15776,11 +15786,19 @@ const useRefineForm = (props) => {
     if (response && !(response == null ? void 0 : response.bodyUsed)) {
       (_b = response.json) == null ? void 0 : _b.call(response).then((body) => {
         var _a2;
-        setResponseErrorMsgs([].concat(((_a2 = formConfig == null ? void 0 : formConfig.formatError) == null ? void 0 : _a2.call(formConfig, body)) || getCommonErrors(body, i18n2)));
+        setResponseErrorMsgs(
+          [].concat(
+            ((_a2 = formConfig == null ? void 0 : formConfig.formatError) == null ? void 0 : _a2.call(formConfig, body)) || getCommonErrors(body, i18n2)
+          )
+        );
       });
     }
   }, [formConfig, result, i18n2]);
-  return { formResult: result, responseErrorMsgs, beforeSubmitErrors: result.beforeSubmitErrors };
+  return {
+    formResult: result,
+    responseErrorMsgs,
+    beforeSubmitErrors: result.beforeSubmitErrors
+  };
 };
 const index_2ivb33 = "";
 const Style = "s1bsn3us";
@@ -16513,7 +16531,11 @@ function YamlForm(props) {
     transformInitValues,
     transformApplyValues,
     mutationMeta: {
-      updateType: "put"
+      updateType: "put",
+      dataProviderName: config.dataProviderName,
+      resourceBasePath: config.basePath,
+      kind: config.kind,
+      label: `${config.kind}s`
     },
     ...useFormProps
   });
@@ -16835,20 +16857,16 @@ function ConfirmModal({
 function FormModal(props) {
   var _a, _b, _c, _d;
   const {
-    resource: resourceFromProps,
     id,
     yamlFormProps: customYamlFormProps,
     modalProps,
     options,
+    config,
     onSuccess
   } = props;
   const {
     i18n: i18n2
   } = common.useTranslation();
-  const {
-    resource
-  } = core.useResource();
-  const configs = React.useContext(ConfigsContext);
   const [saveButtonProps, setSaveButtonProps] = React.useState({});
   const [isError, setIsError] = React.useState(false);
   const [mode, setMode] = React.useState(FormMode.FORM);
@@ -16857,7 +16875,6 @@ function FormModal(props) {
   const refineFormContainerRef = React.useRef(null);
   const popModal = eagle.usePopModal();
   const pushModal = eagle.usePushModal();
-  const config = configs[resourceFromProps || (resource == null ? void 0 : resource.name) || ""];
   const isDisabledChangeMode = config.formConfig && "isDisabledChangeMode" in config.formConfig && config.formConfig.isDisabledChangeMode;
   const okText = i18n2.t(id ? "dovetail.save" : "dovetail.create");
   const action = id ? "edit" : "create";

package/dist/refine.js

@@ -10564,11 +10564,11 @@ function useOpenForm() {
   const pushModal = usePushModal();
   const go = useGo();
   return function openForm(options) {
-    var _a;
-    const finalResourceName = (options == null ? void 0 : options.resourceName) || (resource == null ? void 0 : resource.name);
-    if (finalResourceName) {
-      const config = configs[finalResourceName];
-      const formType = (_a = config.formConfig) == null ? void 0 : _a.formContainerType;
+    var _a, _b;
+    const finalResourceName = (options == null ? void 0 : options.resourceName) || ((_a = options == null ? void 0 : options.config) == null ? void 0 : _a.name) || (resource == null ? void 0 : resource.name);
+    if (finalResourceName || (options == null ? void 0 : options.config)) {
+      const config = (options == null ? void 0 : options.config) || configs[finalResourceName || ""];
+      const formType = (_b = config.formConfig) == null ? void 0 : _b.formContainerType;
       if (formType === void 0 || formType === FormContainerType.MODAL) {
         pushModal({
           component: () => {
@@ -10577,8 +10577,8 @@ function useOpenForm() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(
               ModalComponent,
               {
-                resource: finalResourceName,
                 id: options == null ? void 0 : options.id,
+                config,
                 yamlFormProps: {
                   config
                 },
@@ -10593,7 +10593,7 @@ function useOpenForm() {
         edit2(options.id);
       } else {
         go({
-          to: navigation.createUrl(finalResourceName),
+          to: navigation.createUrl(finalResourceName || ""),
           options: {
             keepQuery: true
           }
@@ -10819,6 +10819,7 @@ function K8sDropdown(props) {
     record,
     size = "normal",
     resourceName: resourceNameFromProps,
+    config: configFromProps,
     customButton,
     deleteDialogProps,
     displayName,
@@ -10828,7 +10829,7 @@ function K8sDropdown(props) {
   const useResourceResult = useResource();
   const configs = useContext(ConfigsContext);
   const resourceName = resourceNameFromProps || getResourceNameByKind(record.kind || "", configs);
-  const config = configs[resourceName || ""];
+  const config = configFromProps || configs[resourceName || ""];
   const { t: t2, i18n: i18n2 } = useTranslation();
   const { openDeleteConfirmModal } = useDeleteModal({
     resourceName: resourceName || "",
@@ -10836,7 +10837,10 @@ function K8sDropdown(props) {
     displayName,
     meta: record.apiVersion ? {
       kind: record.kind || "",
-      resourceBasePath: (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
+      resourceBasePath: (
+        // k8s 通用规则，apiVersion 包含 / 则使用 apis，否则使用 api
+        (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
+      )
     } : void 0
   });
   const download2 = useDownloadYAML();
@@ -10861,10 +10865,16 @@ function K8sDropdown(props) {
     Dropdown,
     {
       overlay: /* @__PURE__ */ jsxRuntimeExports.jsxs(Menu$1, { children: [
-        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(Menu$1.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { src: EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
-          (config == null ? void 0 : config.displayName) || record.kind || "",
-          i18n2.language
-        )}` : t2("dovetail.edit_yaml") }) }),
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(
+          Menu$1.Item,
+          {
+            onClick: () => openForm({ id: record.id, resourceName, config }),
+            children: /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { src: EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
+              displayName || (config == null ? void 0 : config.displayName) || record.kind || "",
+              i18n2.language
+            )}` : t2("dovetail.edit_yaml") })
+          }
+        ),
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           Menu$1.Item,
           {
@@ -14601,7 +14611,7 @@ function ListPage(props) {
       })]
     }) : void 0, /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
       className: cx_default(ListContentStyle, contentClassName),
-      style: !config.customFilterBar && config.nonNsResource ? {
+      style: !customFilterBar && !config.customFilterBar && config.nonNsResource ? {
         paddingTop: 0
       } : {},
       children: [customFilterBar || config.customFilterBar || !config.nonNsResource && /* @__PURE__ */ jsxRuntimeExports.jsx(NamespacesFilter, {
@@ -15726,14 +15736,14 @@ const useRefineForm = (props) => {
         var _a;
         const formValue = result.getValues();
         return {
-          message: i18n2.t(
-            id ? "dovetail.edit_resource_success" : "dovetail.create_success_toast",
-            {
-              kind: transformResourceKindInSentence(config.displayName || config.kind, i18n2.language),
-              name: (_a = formValue.metadata) == null ? void 0 : _a.name,
-              interpolation: { escapeValue: false }
-            }
-          ).trim(),
+          message: i18n2.t(id ? "dovetail.edit_resource_success" : "dovetail.create_success_toast", {
+            kind: transformResourceKindInSentence(
+              config.displayName || config.kind,
+              i18n2.language
+            ),
+            name: (_a = formValue.metadata) == null ? void 0 : _a.name,
+            interpolation: { escapeValue: false }
+          }).trim(),
           description: "Success",
           type: "success"
         };
@@ -15757,11 +15767,19 @@ const useRefineForm = (props) => {
     if (response && !(response == null ? void 0 : response.bodyUsed)) {
       (_b = response.json) == null ? void 0 : _b.call(response).then((body) => {
         var _a2;
-        setResponseErrorMsgs([].concat(((_a2 = formConfig == null ? void 0 : formConfig.formatError) == null ? void 0 : _a2.call(formConfig, body)) || getCommonErrors(body, i18n2)));
+        setResponseErrorMsgs(
+          [].concat(
+            ((_a2 = formConfig == null ? void 0 : formConfig.formatError) == null ? void 0 : _a2.call(formConfig, body)) || getCommonErrors(body, i18n2)
+          )
+        );
       });
     }
   }, [formConfig, result, i18n2]);
-  return { formResult: result, responseErrorMsgs, beforeSubmitErrors: result.beforeSubmitErrors };
+  return {
+    formResult: result,
+    responseErrorMsgs,
+    beforeSubmitErrors: result.beforeSubmitErrors
+  };
 };
 const index_2ivb33 = "";
 const Style = "s1bsn3us";
@@ -16494,7 +16512,11 @@ function YamlForm(props) {
     transformInitValues,
     transformApplyValues,
     mutationMeta: {
-      updateType: "put"
+      updateType: "put",
+      dataProviderName: config.dataProviderName,
+      resourceBasePath: config.basePath,
+      kind: config.kind,
+      label: `${config.kind}s`
     },
     ...useFormProps
   });
@@ -16816,20 +16838,16 @@ function ConfirmModal({
 function FormModal(props) {
   var _a, _b, _c, _d;
   const {
-    resource: resourceFromProps,
     id,
     yamlFormProps: customYamlFormProps,
     modalProps,
     options,
+    config,
     onSuccess
   } = props;
   const {
     i18n: i18n2
   } = useTranslation();
-  const {
-    resource
-  } = useResource();
-  const configs = useContext(ConfigsContext);
   const [saveButtonProps, setSaveButtonProps] = useState({});
   const [isError, setIsError] = useState(false);
   const [mode, setMode] = useState(FormMode.FORM);
@@ -16838,7 +16856,6 @@ function FormModal(props) {
   const refineFormContainerRef = useRef(null);
   const popModal = usePopModal();
   const pushModal = usePushModal();
-  const config = configs[resourceFromProps || (resource == null ? void 0 : resource.name) || ""];
   const isDisabledChangeMode = config.formConfig && "isDisabledChangeMode" in config.formConfig && config.formConfig.isDisabledChangeMode;
   const okText = i18n2.t(id ? "dovetail.save" : "dovetail.create");
   const action = id ? "edit" : "create";

package/dist/utils/form.d.ts

@@ -1,3 +1,3 @@
 import { ResourceModel } from 'src/models';
 import { ResourceConfig } from 'src/types';
-export declare function getInitialValues<Model extends ResourceModel = ResourceModel>(config: ResourceConfig<Model>): Record<string, unknown>;
+export declare function getInitialValues<Model extends ResourceModel = ResourceModel>(config: Pick<ResourceConfig<Model>, 'apiVersion' | 'kind' | 'initValue'>): Record<string, unknown>;

package/package.json

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