@dovetail-v2/refine 0.3.19-alpha.2 → 0.3.20-alpha.0

package/dist/refine.cjs

@@ -7423,7 +7423,7 @@ const tag_18x9v7m = "";
 const StateTagStyle = "s82411";
 const NameTagStyle = "n9ja9cs";
 function shortenedImage(image2) {
-  return (image2 || "").replace(/^(index\.)?docker.io\/(library\/)?/, "").replace(/:latest$/, "").replace(/^(.*@sha256:)([0-9a-f]{8})[0-9a-f]+$/i, "$1$2…");
+  return (image2 || "").replace(/^(index\.)?docker.io\/(library\/)?/, "").replace(/^(.*@sha256:)([0-9a-f]{8})[0-9a-f]+$/i, "$1$2…");
 }
 function isFirstLetterEnglish(str) {
   return /^[a-zA-Z]/.test(str);
@@ -8555,7 +8555,7 @@ function parseSi(inValue, increment = null, allowFractional = true) {
   return val;
 }
 const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(props, ref) {
-  const { defaultValue, pvc: pvc2 } = props;
+  const { defaultValue, pvc: pvc2, label: label2, onBlur } = props;
   const { resource } = core.useResource();
   const { mutateAsync } = core.useUpdate();
   const { t: t2 } = common.useTranslation();
@@ -8604,13 +8604,17 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
       errorNotification: false
     });
   }, [pvc2, distributeStorage, resource == null ? void 0 : resource.name, validators, mutateAsync, t2]);
-  React.useImperativeHandle(ref, () => ({
-    submit
-  }), [submit]);
+  React.useImperativeHandle(
+    ref,
+    () => ({
+      submit
+    }),
+    [submit]
+  );
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
     eagle.Form.Item,
     {
-      label: /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: t2("dovetail.distributed") }),
+      label: /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: label2 || t2("dovetail.distributed") }),
       colon: false,
       help: validateResult.distributeStorage,
       validateStatus: validateResult.distributeStorage ? "error" : "",
@@ -8628,7 +8632,14 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
                 distributeStorage: validators.distributeStorage(v)
               });
             },
-            onBlur: () => void 0,
+            onBlur: () => {
+              onBlur == null ? void 0 : onBlur(distributeStorage, (newValue) => {
+                setDistributeStorage(newValue);
+                setValidateResult({
+                  distributeStorage: validators.distributeStorage(newValue)
+                });
+              });
+            },
             onFocus: () => void 0
           },
           min: 1,
@@ -8639,7 +8650,12 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
     }
   );
 });
-function PVCDistributeStorage({ pvc: pvc2, editable }) {
+function PVCDistributeStorage({
+  pvc: pvc2,
+  editable,
+  label: label2,
+  onBlur
+}) {
   var _a, _b;
   const { t: t2 } = common.useTranslation();
   const formRef = React.useRef(null);
@@ -8659,7 +8675,9 @@ function PVCDistributeStorage({ pvc: pvc2, editable }) {
               {
                 ref: formRef,
                 defaultValue: value2 ? transformStorageUnit(value2, StorageUnit.Gi) : 0,
-                pvc: pvc2
+                pvc: pvc2,
+                label: label2,
+                onBlur
               }
             );
           }
@@ -10247,7 +10265,12 @@ const ServiceOutClusterAccessComponent = ({
       });
       break;
     case ServiceTypeEnum.ClusterIP:
-      content = i18n2.t("dovetail.not_support");
+      content = /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
+        style: {
+          color: "#00122e"
+        },
+        children: i18n2.t("dovetail.not_support")
+      });
       break;
     default:
       content = /* @__PURE__ */ common.jsxRuntimeExports.jsx(ValueDisplay, {
@@ -10259,7 +10282,8 @@ const ServiceOutClusterAccessComponent = ({
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
     style: {
       whiteSpace: "pre-wrap",
-      color: "#0080ff"
+      color: "#0080ff",
+      height: "18px"
     },
     children: content || "-"
   });
@@ -10584,22 +10608,22 @@ function useOpenForm() {
   const go = core.useGo();
   return function openForm(options) {
     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;
+    const finalResourceName = (options == null ? void 0 : options.resourceName) || ((_a = options == null ? void 0 : options.resourceConfig) == null ? void 0 : _a.name) || (resource == null ? void 0 : resource.name);
+    if (finalResourceName || (options == null ? void 0 : options.resourceConfig)) {
+      const resourceConfig = (options == null ? void 0 : options.resourceConfig) || configs[finalResourceName || ""];
+      const formType = (_b = resourceConfig.formConfig) == null ? void 0 : _b.formContainerType;
       if (formType === void 0 || formType === FormContainerType.MODAL) {
         pushModal({
           component: () => {
             var _a2;
-            const ModalComponent = ((_a2 = config.formConfig) == null ? void 0 : _a2.CustomFormModal) || FormModal;
+            const ModalComponent = ((_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.CustomFormModal) || FormModal;
             return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
               ModalComponent,
               {
                 id: options == null ? void 0 : options.id,
-                config,
+                resourceConfig,
                 yamlFormProps: {
-                  config
+                  resourceConfig
                 },
                 options,
                 onSuccess: options == null ? void 0 : options.onSuccess
@@ -10837,23 +10861,20 @@ function K8sDropdown(props) {
   const {
     record,
     size = "normal",
-    resourceName: resourceNameFromProps,
-    config: configFromProps,
+    resourceConfig,
     customButton,
-    deleteDialogProps,
-    displayName,
-    hideEdit
+    deleteDialogProps
   } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = core.useResource();
   const configs = React.useContext(ConfigsContext);
-  const resourceName = resourceNameFromProps || getResourceNameByKind(record.kind || "", configs);
-  const config = configFromProps || configs[resourceName || ""];
+  const resourceName = (resourceConfig == null ? void 0 : resourceConfig.name) || getResourceNameByKind(record.kind || "", configs);
+  const config = resourceConfig || configs[resourceName || ""];
   const { t: t2, i18n: i18n2 } = common.useTranslation();
   const { openDeleteConfirmModal } = useDeleteModal({
     resourceName: resourceName || "",
     deleteDialogProps,
-    displayName,
+    displayName: config.displayName,
     meta: record.apiVersion ? {
       kind: record.kind || "",
       resourceBasePath: (
@@ -10884,12 +10905,12 @@ 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(
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           eagle.Menu.Item,
           {
-            onClick: () => openForm({ id: record.id, resourceName, config }),
+            onClick: () => openForm({ id: record.id, resourceName, resourceConfig: 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 || "",
+              config.displayName || record.kind || "",
               i18n2.language
             )}` : t2("dovetail.edit_yaml") })
           }
@@ -11037,6 +11058,12 @@ const useEagleTable = (params) => {
       }
     ]);
   }, []);
+  React.useEffect(() => {
+    if (lodashEs.isEqual(params.filters, table.filters)) {
+      return;
+    }
+    table.setFilters(params.filters || [], "replace");
+  }, [params.filters]);
   return {
     tableProps: finalProps,
     selectedKeys,
@@ -11520,7 +11547,7 @@ const IngressRulesTable = ({ ingress }) => {
     }
   );
 };
-const KeyValue_1cqk7i8 = "";
+const KeyValue_1qasuz9 = "";
 const ContentBlockStyle = "c8jy7dc";
 const KeyStyle = "k2sddxl";
 const ValueStyle$2 = "v16vicsr";
@@ -12935,7 +12962,10 @@ const PVCapacityField = (i18n2) => {
     }
   };
 };
-const PVCStorageField = (i18n2) => {
+const PVCStorageField = ({
+  i18n: i18n2,
+  editProps
+}) => {
   return {
     key: "storage",
     col: 12,
@@ -12944,6 +12974,8 @@ const PVCStorageField = (i18n2) => {
     renderContent(value2, pvc2) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(PVCDistributeStorage, {
         pvc: pvc2,
+        label: editProps == null ? void 0 : editProps.label,
+        onBlur: editProps == null ? void 0 : editProps.onBlur,
         editable: true
       });
     }
@@ -13867,7 +13899,7 @@ function Tabs(props) {
     return /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.TabsTabPane, { tab: tab.title, children: tab.children }, tab.title);
   }) });
 }
-const ShowContentView_196cma3 = "";
+const ShowContentView_1xfhkd = "";
 const ShowContentWrapperStyle = "soapvs9";
 const BackButton = "b13d603q";
 const ToolBarWrapper = "tm8eaia";
@@ -14132,9 +14164,6 @@ const ShowContentView = (props) => {
   const basicInfo = showConfig.basicGroup ? renderGroup(showConfig.basicGroup, true) : null;
   return /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
     className: common.cx_default(ShowContentWrapperStyle, className),
-    style: {
-      background: size === "small" ? "#fff" : void 0
-    },
     children: [hideTopBar ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Space, {
       direction: "vertical",
       className: ShowContentHeaderStyle,
@@ -14657,9 +14686,8 @@ function ResourceList(props) {
   const nameRenderer = noShow ? PlainTextNameColumnRenderer(i18n2) : NameColumnRenderer(i18n2);
   const filters = useRefineFilters();
   const { tableProps, selectedKeys } = useEagleTable({
-    useTableParams: {
-      filters
-    },
+    useTableParams: {},
+    filters,
     columns: [nameRenderer, ...(columns == null ? void 0 : columns()) || []],
     tableProps: {
       defaultSize: 50,
@@ -14684,10 +14712,10 @@ function ResourceShow(props) {
     }
   );
 }
-function getInitialValues(config) {
-  return config.initValue || {
-    apiVersion: config.apiVersion,
-    kind: config.kind,
+function getInitialValues(resourceConfig) {
+  return resourceConfig.initValue || {
+    apiVersion: resourceConfig.apiVersion,
+    kind: resourceConfig.kind,
     ...BASE_INIT_VALUE,
     spec: {}
   };
@@ -14826,19 +14854,19 @@ const SpaceStyle = "sea7f83";
 const VerticalFormItemStyle = "v1jthrhz";
 const IntegerStyle = "i1brpchs";
 const ContentWrapper = "c11mae2d";
-function useFieldsConfig(config, formConfig, resourceId, step, customOptions, transformedInitValues) {
+function useFieldsConfig(resourceConfig, formConfig, resourceId, step, customOptions, transformedInitValues) {
   var _a, _b, _c;
   const action = resourceId ? "edit" : "create";
   const listQuery = core.useList({
-    resource: config == null ? void 0 : config.name,
-    meta: { resourceBasePath: config == null ? void 0 : config.basePath, kind: config == null ? void 0 : config.kind },
+    resource: resourceConfig == null ? void 0 : resourceConfig.name,
+    meta: { resourceBasePath: resourceConfig == null ? void 0 : resourceConfig.basePath, kind: resourceConfig == null ? void 0 : resourceConfig.kind },
     pagination: {
       mode: "off"
     }
   });
   const showQuery = core.useShow({
-    resource: config == null ? void 0 : config.name,
-    meta: { resourceBasePath: config == null ? void 0 : config.basePath, kind: config == null ? void 0 : config.kind },
+    resource: resourceConfig == null ? void 0 : resourceConfig.name,
+    meta: { resourceBasePath: resourceConfig == null ? void 0 : resourceConfig.basePath, kind: resourceConfig == null ? void 0 : resourceConfig.kind },
     id: resourceId
   });
   return (_c = formConfig == null ? void 0 : formConfig.fields) == null ? void 0 : _c.call(formConfig, {
@@ -14934,7 +14962,7 @@ const MemoizedFormField = React.memo(function FormField({
         return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
           eagle.Form.Item,
           {
-            label: fieldConfig.label,
+            label: typeof fieldConfig.label === "function" ? fieldConfig.label(currentFormValue) : fieldConfig.label,
             colon: false,
             labelCol: fieldConfig.layout === FormItemLayout.VERTICAL ? {} : { flex: `0 0 ${(formConfig == null ? void 0 : formConfig.labelWidth) || "216px"}` },
             help: fieldConfig.isHideErrorStatus ? "" : (_a = fieldState.error) == null ? void 0 : _a.message,
@@ -14953,7 +14981,7 @@ const MemoizedFormField = React.memo(function FormField({
 });
 function FieldsContent(props) {
   const {
-    config,
+    resourceConfig,
     formConfig,
     resourceId,
     step,
@@ -14965,7 +14993,7 @@ function FieldsContent(props) {
   const { control, getValues, watch, trigger } = formResult;
   const action = resourceId ? "edit" : "create";
   const formFieldsConfig = useFieldsConfig(
-    config,
+    resourceConfig,
     { fields },
     resourceId,
     step,
@@ -14983,7 +15011,7 @@ function FieldsContent(props) {
           children: /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", { className: ContentWrapper, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(
             FieldsContent,
             {
-              config,
+              resourceConfig,
               formConfig,
               resourceId,
               step,
@@ -15013,7 +15041,7 @@ function FieldsContent(props) {
 }
 const RefineFormContent = (props) => {
   const {
-    config,
+    resourceConfig: config,
     formResult,
     resourceId,
     errorMsgs,
@@ -15027,7 +15055,7 @@ const RefineFormContent = (props) => {
     /* @__PURE__ */ common.jsxRuntimeExports.jsx(
       FieldsContent,
       {
-        config,
+        resourceConfig: config,
         formConfig,
         fields: formConfig == null ? void 0 : formConfig.fields,
         resourceId,
@@ -15738,7 +15766,7 @@ const useForm = ({
   };
 };
 const useRefineForm = (props) => {
-  const { formConfig, config, id, refineProps, options } = props;
+  const { formConfig, resourceConfig, id, refineProps, options } = props;
   const { transformInitValues, transformApplyValues } = usePathMap({
     pathMap: formConfig == null ? void 0 : formConfig.pathMap,
     transformInitValues: formConfig == null ? void 0 : formConfig.transformInitValues,
@@ -15757,7 +15785,7 @@ const useRefineForm = (props) => {
         return {
           message: i18n2.t(id ? "dovetail.edit_resource_success" : "dovetail.create_success_toast", {
             kind: transformResourceKindInSentence(
-              config.displayName || config.kind,
+              resourceConfig.displayName || resourceConfig.kind,
               i18n2.language
             ),
             name: (_a = formValue.metadata) == null ? void 0 : _a.name,
@@ -15767,13 +15795,13 @@ const useRefineForm = (props) => {
           type: "success"
         };
       },
-      resource: config.name,
+      resource: resourceConfig.name,
       action: id ? "edit" : "create",
       id,
       liveMode: "off",
       ...refineProps
     },
-    defaultValues: (options == null ? void 0 : options.initialValues) || (config == null ? void 0 : config.initValue),
+    defaultValues: (options == null ? void 0 : options.initialValues) || (resourceConfig == null ? void 0 : resourceConfig.initValue),
     transformApplyValues,
     transformInitValues,
     beforeSubmit: formConfig == null ? void 0 : formConfig.beforeSubmit,
@@ -16471,7 +16499,7 @@ function YamlForm(props) {
     schemaStrategy = "Optional",
     isShowLayout = true,
     useFormProps,
-    config,
+    resourceConfig,
     transformInitValues,
     transformApplyValues,
     beforeSubmit,
@@ -16515,7 +16543,7 @@ function YamlForm(props) {
     beforeSubmit,
     successNotification(data2) {
       var _a;
-      const displayName = config.displayName || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind);
+      const displayName = resourceConfig.displayName || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind);
       return {
         message: i18n2.t(action === "create" ? "dovetail.create_success_toast" : "dovetail.save_yaml_success_toast", {
           kind: transformResourceKindInSentence(displayName, i18n2.language),
@@ -16532,10 +16560,10 @@ function YamlForm(props) {
     transformApplyValues,
     mutationMeta: {
       updateType: "put",
-      dataProviderName: config.dataProviderName,
-      resourceBasePath: config.basePath,
-      kind: config.kind,
-      label: `${config.kind}s`
+      dataProviderName: resourceConfig.dataProviderName,
+      resourceBasePath: resourceConfig.basePath,
+      kind: resourceConfig.kind,
+      label: `${resourceConfig.kind}s`
     },
     ...useFormProps
   });
@@ -16618,7 +16646,7 @@ function YamlForm(props) {
 }
 const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
   id,
-  config,
+  resourceConfig,
   step,
   customYamlFormProps,
   formConfig,
@@ -16631,7 +16659,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
   var _a, _b;
   const action = id ? "edit" : "create";
   const refineFormResult = useRefineForm({
-    config,
+    resourceConfig,
     id,
     refineProps: {
       onMutationSuccess: (data2) => {
@@ -16657,7 +16685,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     }
   });
   const fieldsConfig = useFieldsConfig(
-    config,
+    resourceConfig,
     { fields: formConfig == null ? void 0 : formConfig.fields },
     id,
     step,
@@ -16673,8 +16701,8 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     if (isYamlMode) {
       return {
         ...customYamlFormProps,
-        resource: config.name,
-        config,
+        resource: resourceConfig.name,
+        resourceConfig,
         transformInitValues: void 0,
         transformApplyValues: void 0,
         initialValuesForCreate: transformApplyValues(
@@ -16690,10 +16718,10 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
           redirect: false
         },
         rules: fieldsConfig == null ? void 0 : fieldsConfig.filter(
-          (config2) => "isSkipValidationInYaml" in config2 && !config2.isSkipValidationInYaml
-        ).map((config2) => ({
-          path: "path" in config2 ? config2.path : [],
-          validators: "validators" in config2 ? config2.validators : void 0
+          (config) => "isSkipValidationInYaml" in config && !config.isSkipValidationInYaml
+        ).map((config) => ({
+          path: "path" in config ? config.path : [],
+          validators: "validators" in config ? config.validators : void 0
         })),
         onSaveButtonPropsChange,
         beforeSubmit: formConfig == null ? void 0 : formConfig.beforeSubmit,
@@ -16706,14 +16734,14 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
       };
     }
     return {
-      config
+      resourceConfig
     };
   }, [
     action,
     isYamlMode,
     customYamlFormProps,
     fieldsConfig,
-    config,
+    resourceConfig,
     id,
     refineFormResult,
     formConfig == null ? void 0 : formConfig.beforeSubmit,
@@ -16755,7 +16783,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
       RefineFormContent,
       {
         formResult: refineFormResult.formResult,
-        config,
+        resourceConfig,
         step,
         formConfig,
         errorMsgs: [
@@ -16772,7 +16800,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
 function YamlFormContainer({
   id,
   customYamlFormProps,
-  config,
+  resourceConfig,
   formConfig,
   onSuccess,
   onError,
@@ -16787,12 +16815,12 @@ function YamlFormContainer({
   const yamlFormProps = React.useMemo(() => {
     return {
       ...customYamlFormProps,
-      resource: config.name,
-      config,
+      resource: resourceConfig.name,
+      resourceConfig,
       transformInitValues,
       transformApplyValues,
       beforeSubmit: formConfig == null ? void 0 : formConfig.beforeSubmit,
-      initialValuesForCreate: (customYamlFormProps == null ? void 0 : customYamlFormProps.initialValuesForCreate) || getInitialValues(config),
+      initialValuesForCreate: (customYamlFormProps == null ? void 0 : customYamlFormProps.initialValuesForCreate) || getInitialValues(resourceConfig),
       initialValuesForEdit: void 0,
       id,
       action,
@@ -16813,7 +16841,7 @@ function YamlFormContainer({
     id,
     action,
     customYamlFormProps,
-    config,
+    resourceConfig,
     formConfig == null ? void 0 : formConfig.beforeSubmit,
     transformInitValues,
     transformApplyValues,
@@ -16861,7 +16889,7 @@ function FormModal(props) {
     yamlFormProps: customYamlFormProps,
     modalProps,
     options,
-    config,
+    resourceConfig,
     onSuccess
   } = props;
   const {
@@ -16875,10 +16903,10 @@ function FormModal(props) {
   const refineFormContainerRef = React.useRef(null);
   const popModal = eagle.usePopModal();
   const pushModal = eagle.usePushModal();
-  const isDisabledChangeMode = config.formConfig && "isDisabledChangeMode" in config.formConfig && config.formConfig.isDisabledChangeMode;
+  const isDisabledChangeMode = resourceConfig.formConfig && "isDisabledChangeMode" in resourceConfig.formConfig && resourceConfig.formConfig.isDisabledChangeMode;
   const okText = i18n2.t(id ? "dovetail.save" : "dovetail.create");
   const action = id ? "edit" : "create";
-  const isYamlForm = ((_a = config.formConfig) == null ? void 0 : _a.formType) === FormType.YAML;
+  const isYamlForm = ((_a = resourceConfig.formConfig) == null ? void 0 : _a.formType) === FormType.YAML;
   const onOk = React.useCallback((e2) => {
     var _a2;
     setIsError(false);
@@ -16906,30 +16934,30 @@ function FormModal(props) {
   }, [isError, id, i18n2]);
   const title = React.useMemo(() => {
     var _a2, _b2, _c2, _d2;
-    if (typeof ((_a2 = config.formConfig) == null ? void 0 : _a2.formTitle) === "string")
-      return (_b2 = config.formConfig) == null ? void 0 : _b2.formTitle;
-    if (typeof ((_c2 = config.formConfig) == null ? void 0 : _c2.formTitle) === "function") {
-      return (_d2 = config.formConfig) == null ? void 0 : _d2.formTitle(action);
+    if (typeof ((_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.formTitle) === "string")
+      return (_b2 = resourceConfig.formConfig) == null ? void 0 : _b2.formTitle;
+    if (typeof ((_c2 = resourceConfig.formConfig) == null ? void 0 : _c2.formTitle) === "function") {
+      return (_d2 = resourceConfig.formConfig) == null ? void 0 : _d2.formTitle(action);
     }
-    const label2 = config.displayName || (config == null ? void 0 : config.kind);
+    const label2 = resourceConfig.displayName || (resourceConfig == null ? void 0 : resourceConfig.kind);
     return i18n2.t(id ? "dovetail.edit_resource" : "dovetail.create_resource", {
       resource: transformResourceKindInSentence(label2, i18n2.language)
     });
-  }, [action, config.formConfig, config.displayName, config == null ? void 0 : config.kind, i18n2, id]);
+  }, [action, resourceConfig.formConfig, resourceConfig.displayName, resourceConfig == null ? void 0 : resourceConfig.kind, i18n2, id]);
   const desc = React.useMemo(() => {
     var _a2, _b2, _c2, _d2;
-    if (typeof ((_a2 = config.formConfig) == null ? void 0 : _a2.formDesc) === "string")
-      return (_b2 = config.formConfig) == null ? void 0 : _b2.formDesc;
-    if (typeof ((_c2 = config.formConfig) == null ? void 0 : _c2.formDesc) === "function") {
-      return (_d2 = config.formConfig) == null ? void 0 : _d2.formDesc(action);
+    if (typeof ((_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.formDesc) === "string")
+      return (_b2 = resourceConfig.formConfig) == null ? void 0 : _b2.formDesc;
+    if (typeof ((_c2 = resourceConfig.formConfig) == null ? void 0 : _c2.formDesc) === "function") {
+      return (_d2 = resourceConfig.formConfig) == null ? void 0 : _d2.formDesc(action);
     }
     return "";
-  }, [action, config.formConfig]);
+  }, [action, resourceConfig.formConfig]);
   const formEle = React.useMemo(() => {
     var _a2;
     const commonFormProps = {
       id,
-      config,
+      resourceConfig,
       customYamlFormProps,
       onSaveButtonPropsChange: setSaveButtonProps,
       onError: () => {
@@ -16941,28 +16969,28 @@ function FormModal(props) {
         onSuccess == null ? void 0 : onSuccess(data2);
       }
     };
-    if (config.formConfig && (((_a2 = config.formConfig) == null ? void 0 : _a2.formType) === FormType.FORM || "fields" in config.formConfig)) {
+    if (resourceConfig.formConfig && (((_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.formType) === FormType.FORM || "fields" in resourceConfig.formConfig)) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(RefineFormContainer, {
         ...commonFormProps,
         ref: refineFormContainerRef,
         step,
         options,
         isYamlMode,
-        formConfig: config.formConfig
+        formConfig: resourceConfig.formConfig
       });
     }
     return /* @__PURE__ */ common.jsxRuntimeExports.jsx(YamlFormContainer, {
       ...commonFormProps,
-      formConfig: config.formConfig
+      formConfig: resourceConfig.formConfig
     });
-  }, [id, customYamlFormProps, config, isYamlMode, step, options, popModal, setSaveButtonProps, onSuccess]);
+  }, [id, customYamlFormProps, resourceConfig, isYamlMode, step, options, popModal, setSaveButtonProps, onSuccess]);
   const steps = React.useMemo(() => {
     var _a2, _b2;
     if (isYamlMode) {
       return void 0;
     }
-    if (config.formConfig && "steps" in config.formConfig) {
-      return (_b2 = (_a2 = config.formConfig) == null ? void 0 : _a2.steps) == null ? void 0 : _b2.map((step2, index2) => ({
+    if (resourceConfig.formConfig && "steps" in resourceConfig.formConfig) {
+      return (_b2 = (_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.steps) == null ? void 0 : _b2.map((step2, index2) => ({
         title: step2.title,
         children: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(common.jsxRuntimeExports.Fragment, {
           children: [desc && index2 === 0 ? /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
@@ -16973,7 +17001,7 @@ function FormModal(props) {
       }));
     }
     return void 0;
-  }, [config.formConfig, desc, formEle, isYamlMode]);
+  }, [resourceConfig.formConfig, desc, formEle, isYamlMode]);
   const handleStepChange = React.useCallback(async (nextStep) => {
     var _a2, _b2;
     const isNextStep = nextStep > step;
@@ -16995,8 +17023,8 @@ function FormModal(props) {
       className: TitleWrapperStyle,
       children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
         children: title
-      }), ((_b = config.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(FormModeSegmentControl, {
-        formConfig: config.formConfig,
+      }), ((_b = resourceConfig.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(FormModeSegmentControl, {
+        formConfig: resourceConfig.formConfig,
         mode,
         onChangeMode
       }) : null]
@@ -17008,9 +17036,9 @@ function FormModal(props) {
     onOk,
     okButtonProps: {
       ...lodashEs.omit(saveButtonProps, "onClick"),
-      children: (_c = config.formConfig) == null ? void 0 : _c.saveButtonText
+      children: (_c = resourceConfig.formConfig) == null ? void 0 : _c.saveButtonText
     },
-    okText: ((_d = config.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
+    okText: ((_d = resourceConfig.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
     destroyOnClose: true,
     destroyOtherStep: true,
     ...modalProps,
@@ -17034,7 +17062,7 @@ const RefineFormPage = (props) => {
   const {
     formResult
   } = useRefineForm({
-    config,
+    resourceConfig: config,
     id
   });
   const action = id ? "edit" : "create";
@@ -17053,7 +17081,7 @@ const RefineFormPage = (props) => {
     direction: "vertical",
     className: "c1pvtlkp",
     children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx(RefineFormContent, {
-      config,
+      resourceConfig: config,
       formResult,
       resourceId: id,
       transformedInitValues: formResult.transformedInitValues
@@ -17066,18 +17094,18 @@ const RefineFormPage = (props) => {
 };
 function ResourceForm(props) {
   var _a;
-  const { config } = props;
+  const { resourceConfig } = props;
   const formProps = React.useMemo(() => {
     var _a2, _b;
     return {
-      initialValues: getInitialValues(config),
-      transformInitValues: (_a2 = config.formConfig) == null ? void 0 : _a2.transformInitValues,
-      transformApplyValues: (_b = config.formConfig) == null ? void 0 : _b.transformApplyValues,
-      config
+      initialValues: getInitialValues(resourceConfig),
+      transformInitValues: (_a2 = resourceConfig.formConfig) == null ? void 0 : _a2.transformInitValues,
+      transformApplyValues: (_b = resourceConfig.formConfig) == null ? void 0 : _b.transformApplyValues,
+      resourceConfig
     };
-  }, [config]);
-  if (((_a = config.formConfig) == null ? void 0 : _a.formType) === FormType.FORM) {
-    return /* @__PURE__ */ common.jsxRuntimeExports.jsx(RefineFormPage, { config });
+  }, [resourceConfig]);
+  if (((_a = resourceConfig.formConfig) == null ? void 0 : _a.formType) === FormType.FORM) {
+    return /* @__PURE__ */ common.jsxRuntimeExports.jsx(RefineFormPage, { config: resourceConfig });
   }
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx(YamlForm, { ...formProps });
 }
@@ -17090,8 +17118,8 @@ function ResourceCRUD(props) {
       !config.noShow ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(reactRouterDom.Route, { path: `${urlPrefix}/${config.name}/show`, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceShow, { config }) }) : null,
       // the modals would render in ModalStack
       ((_a = config.formConfig) == null ? void 0 : _a.formContainerType) === FormContainerType.PAGE ? /* @__PURE__ */ common.jsxRuntimeExports.jsxs(common.jsxRuntimeExports.Fragment, { children: [
-        /* @__PURE__ */ common.jsxRuntimeExports.jsx(reactRouterDom.Route, { path: `${urlPrefix}/${config.name}/create`, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceForm, { config }) }),
-        /* @__PURE__ */ common.jsxRuntimeExports.jsx(reactRouterDom.Route, { path: `${urlPrefix}/${config.name}/edit`, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceForm, { config }) })
+        /* @__PURE__ */ common.jsxRuntimeExports.jsx(reactRouterDom.Route, { path: `${urlPrefix}/${config.name}/create`, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceForm, { resourceConfig: config }) }),
+        /* @__PURE__ */ common.jsxRuntimeExports.jsx(reactRouterDom.Route, { path: `${urlPrefix}/${config.name}/edit`, children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(ResourceForm, { resourceConfig: config }) })
       ] }) : null
     ] }, config.name);
   }) });
@@ -19849,27 +19877,18 @@ function useNamespaceRefineFilter() {
 }
 const NAME_KEYWORD_PARAM = "name_keyword";
 function useRefineFilters(options = {}) {
-  const {
-    disableNamespaceFilter = false,
-    disableNameKeywordFilter = false
-  } = options;
+  const { disableNamespaceFilter = false, disableNameKeywordFilter = false } = options;
   const { value: nsFilters = [] } = useNamespacesFilter();
   const namespaceFilters = React.useMemo(() => {
-    if (disableNamespaceFilter) {
-      return [];
-    }
     const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
-    if (filters2.length === 0) {
+    if (disableNamespaceFilter || filters2.length === 0) {
       return [];
     }
     return [
       {
-        operator: "or",
-        value: filters2.map((filter) => ({
-          field: "metadata.namespace",
-          operator: "eq",
-          value: filter
-        }))
+        field: "metadata.namespace",
+        operator: "in",
+        value: filters2
       }
     ];
   }, [nsFilters, disableNamespaceFilter]);
@@ -19888,9 +19907,7 @@ function useRefineFilters(options = {}) {
     ];
   }, [nameKeyword, disableNameKeywordFilter]);
   const filters = React.useMemo(
-    () => ({
-      permanent: [...namespaceFilters, ...nameKeywordFilters]
-    }),
+    () => [...namespaceFilters, ...nameKeywordFilters],
     [namespaceFilters, nameKeywordFilters]
   );
   return filters;