@dovetail-v2/refine 0.3.13-alpha.0 → 0.3.13-alpha.1

package/dist/components/InternalBaseTable/index.d.ts

@@ -38,6 +38,7 @@ export type InternalTableProps<Data extends {
     showMenuColumn?: boolean;
     hideNamespacesFilter?: boolean;
     customNamespaceFilter?: React.ReactNode;
+    onClearSearchKeyword?: () => void;
 };
 declare function Table<Data extends {
     id: string;

package/dist/hooks/index.d.ts

@@ -7,3 +7,4 @@ export * from './useEdit';
 export * from './useGlobalStore';
 export * from './useOpenForm';
 export { default as useNamespaceRefineFilter } from './useNamespaceRefineFilter';
+export * from './useRefineFilters';

package/dist/hooks/useRefineFilters.d.ts

@@ -0,0 +1,9 @@
+export declare const NAME_KEYWORD_PARAM = "name_keyword";
+interface UseRefineFiltersOptions {
+    disableNamespaceFilter?: boolean;
+    disableNameKeywordFilter?: boolean;
+}
+export declare function useRefineFilters(options?: UseRefineFiltersOptions): {
+    permanent: import("@refinedev/core").CrudFilter[];
+};
+export {};

package/dist/i18n.d.ts

@@ -524,6 +524,8 @@ export declare const resources: {
             target_service: string;
             target_service_port: string;
             select_workload: string;
+            no_search_result: string;
+            clear_search_condition: string;
         };
     };
 };

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

@@ -268,6 +268,8 @@ declare const _default: {
         target_service: string;
         target_service_port: string;
         select_workload: string;
+        no_search_result: string;
+        clear_search_condition: string;
     };
 };
 export default _default;

package/dist/refine.cjs

@@ -1225,6 +1225,8 @@ const label_annotations = "标签与注解";
 const target_service = "目标服务";
 const target_service_port = "目标服务端口";
 const select_workload = "选择工作负载";
+const no_search_result = "无搜索结果";
+const clear_search_condition = "清空搜索条件";
 const dovetail = {
   copy,
   reset_arguments,
@@ -1493,7 +1495,9 @@ const dovetail = {
   label_annotations,
   target_service,
   target_service_port,
-  select_workload
+  select_workload,
+  no_search_result,
+  clear_search_condition
 };
 const ZH = {
   dovetail
@@ -7995,7 +7999,7 @@ const WidgetErrorContent = (props) => {
       children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("p", {
         className: common.cx_default(fontMap[type2], "title", `${type2}-title`),
         children: errorText || t2("dovetail.obtain_data_error")
-      }), !refetch ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(kit.button, {
+      }), props.children, !refetch ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(kit.button, {
         size: type2 === "list" ? "middle" : "small",
         type: "ordinary",
         onClick: (e2) => {
@@ -10659,6 +10663,9 @@ function validateLabelKey(key2) {
   if (prefix2 && prefix2.length > 253) {
     return { isValid: false };
   }
+  if (!labelRegex.test(name2)) {
+    return { isValid: false };
+  }
   if (name2 && name2.length > 63) {
     return { isValid: false };
   }
@@ -10977,7 +10984,6 @@ const TableToolBar = ({
   selectedKeys,
   hideCreate
 }) => {
-  var _a;
   const {
     resource
   } = core.useResource();
@@ -10987,7 +10993,7 @@ const TableToolBar = ({
       className: ToolbarStyle$1,
       children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
         className: common.cx_default(eagle.Typo.Display.d2_regular_title, TitleStyle$2),
-        children: title || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind)
+        children: title
       }), /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Space, {
         children: [selectedKeys.length > 0 ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(DeleteManyButton, {
           ids: selectedKeys
@@ -12071,9 +12077,18 @@ function Table(props) {
   const { tableProps, displayName, errorContentProps } = props;
   const { Table: TableComponent } = React.useContext(ComponentContext);
   const Table2 = TableComponent || Table$1;
+  const { params } = core.useParsed();
   const { i18n: i18n2 } = common.useTranslation();
   const resourceType = transformResourceKindInSentence(displayName, i18n2.language);
   if (!((_a = tableProps.data) == null ? void 0 : _a.length) && !tableProps.loading) {
+    const nameKeyword = (params == null ? void 0 : params[NAME_KEYWORD_PARAM]) || "";
+    if (nameKeyword) {
+      const onClear = () => {
+        var _a2;
+        (_a2 = tableProps.onClearSearchKeyword) == null ? void 0 : _a2.call(tableProps);
+      };
+      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(WidgetErrorContent, { errorText: i18n2.t("dovetail.no_search_result"), children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Button, { onClick: onClear, type: "ordinary", children: i18n2.t("dovetail.clear_search_condition") }) });
+    }
     return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
       WidgetErrorContent,
       {
@@ -14427,30 +14442,6 @@ const NamespacesFilter = ({
     })
   });
 };
-function useNamespaceRefineFilter() {
-  const { value: nsFilters = [] } = useNamespacesFilter();
-  const filters = React.useMemo(() => {
-    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
-    if (filters2.length === 0) {
-      return {
-        permanent: []
-      };
-    }
-    return {
-      permanent: [
-        {
-          operator: "or",
-          value: filters2.map((filter) => ({
-            field: "metadata.namespace",
-            operator: "eq",
-            value: filter
-          }))
-        }
-      ]
-    };
-  }, [nsFilters]);
-  return filters;
-}
 const index_1l2xllo = "";
 const ListPageStyle = "laykzsq";
 const ListContentStyle = "l1ng0psc";
@@ -14473,7 +14464,7 @@ function ListPage(props) {
     children: [!config.hideListToolBar ? /* @__PURE__ */ common.jsxRuntimeExports.jsxs(common.jsxRuntimeExports.Fragment, {
       children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx(TableToolBar, {
         selectedKeys,
-        title: config == null ? void 0 : config.displayName,
+        title: (config == null ? void 0 : config.customListTitle) || (config == null ? void 0 : config.displayName) || config.kind,
         description: config == null ? void 0 : config.description,
         hideCreate: config == null ? void 0 : config.hideCreate
       }), belowToolBarContent, /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Divider, {
@@ -14510,7 +14501,7 @@ function ResourceList(props) {
   const { formatter, columns, Dropdown, noShow } = props.config;
   const { i18n: i18n2 } = common.useTranslation();
   const nameRenderer = noShow ? PlainTextNameColumnRenderer(i18n2) : NameColumnRenderer(i18n2);
-  const filters = useNamespaceRefineFilter();
+  const filters = useRefineFilters();
   const { tableProps, selectedKeys } = useEagleTable({
     useTableParams: {
       filters
@@ -19537,6 +19528,78 @@ const SCAllowExpandColumnRenderer = (i18n2) => {
     }
   };
 };
+function useNamespaceRefineFilter() {
+  const { value: nsFilters = [] } = useNamespacesFilter();
+  const filters = React.useMemo(() => {
+    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
+    if (filters2.length === 0) {
+      return {
+        permanent: []
+      };
+    }
+    return {
+      permanent: [
+        {
+          operator: "or",
+          value: filters2.map((filter) => ({
+            field: "metadata.namespace",
+            operator: "eq",
+            value: filter
+          }))
+        }
+      ]
+    };
+  }, [nsFilters]);
+  return filters;
+}
+const NAME_KEYWORD_PARAM = "name_keyword";
+function useRefineFilters(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) {
+      return [];
+    }
+    return [
+      {
+        operator: "or",
+        value: filters2.map((filter) => ({
+          field: "metadata.namespace",
+          operator: "eq",
+          value: filter
+        }))
+      }
+    ];
+  }, [nsFilters, disableNamespaceFilter]);
+  const { params } = core.useParsed();
+  const nameKeyword = params == null ? void 0 : params[NAME_KEYWORD_PARAM];
+  const nameKeywordFilters = React.useMemo(() => {
+    if (disableNameKeywordFilter || !nameKeyword || nameKeyword.trim() === "") {
+      return [];
+    }
+    return [
+      {
+        field: "metadata.name",
+        operator: "contains",
+        value: nameKeyword.trim()
+      }
+    ];
+  }, [nameKeyword, disableNameKeywordFilter]);
+  const filters = React.useMemo(
+    () => ({
+      permanent: [...namespaceFilters, ...nameKeywordFilters]
+    }),
+    [namespaceFilters, nameKeywordFilters]
+  );
+  return filters;
+}
 const styles = "";
 const Dovetail = (props) => {
   const {
@@ -19868,6 +19931,7 @@ exports.MetadataForm = MetadataForm;
 exports.ModelPlugin = ModelPlugin;
 exports.MonacoYamlDiffEditor = MonacoYamlDiffEditor;
 exports.MonacoYamlEditor = MonacoYamlEditor;
+exports.NAME_KEYWORD_PARAM = NAME_KEYWORD_PARAM;
 exports.NETWORK_POLICY_INIT_VALUE = NETWORK_POLICY_INIT_VALUE;
 exports.NODE_INIT_VALUE = NODE_INIT_VALUE;
 exports.NS_STORE_KEY = NS_STORE_KEY;
@@ -20035,6 +20099,7 @@ exports.generateSchemaTypeValue = generateSchemaTypeValue;
 exports.generateValueFromSchema = generateValueFromSchema;
 exports.getApiVersion = getApiVersion;
 exports.getResourceNameByKind = getResourceNameByKind;
+exports.isFirstLetterEnglish = isFirstLetterEnglish;
 exports.matchSelector = matchSelector;
 exports.modelPlugin = modelPlugin;
 exports.namespaceRules = namespaceRules;
@@ -20045,6 +20110,8 @@ exports.resolveRef = resolveRef;
 exports.rfc1035LabelRules = rfc1035LabelRules;
 exports.rfc1123LabelRules = rfc1123LabelRules;
 exports.routerProvider = routerProvider;
+exports.shortenedImage = shortenedImage;
+exports.transformResourceKindInSentence = transformResourceKindInSentence;
 exports.useApiGroupSchema = useApiGroupSchema;
 exports.useDeleteModal = useDeleteModal;
 exports.useDeleteModalOnly = useDeleteModalOnly;
@@ -20056,6 +20123,7 @@ exports.useGlobalStore = useGlobalStore;
 exports.useNamespaceRefineFilter = useNamespaceRefineFilter;
 exports.useNamespacesFilter = useNamespacesFilter;
 exports.useOpenForm = useOpenForm;
+exports.useRefineFilters = useRefineFilters;
 exports.useRefineForm = useRefineForm;
 exports.useSchema = useSchema;
 exports.validateDataKey = validateDataKey;

package/dist/refine.js

@@ -1206,6 +1206,8 @@ const label_annotations = "标签与注解";
 const target_service = "目标服务";
 const target_service_port = "目标服务端口";
 const select_workload = "选择工作负载";
+const no_search_result = "无搜索结果";
+const clear_search_condition = "清空搜索条件";
 const dovetail = {
   copy,
   reset_arguments,
@@ -1474,7 +1476,9 @@ const dovetail = {
   label_annotations,
   target_service,
   target_service_port,
-  select_workload
+  select_workload,
+  no_search_result,
+  clear_search_condition
 };
 const ZH = {
   dovetail
@@ -7976,7 +7980,7 @@ const WidgetErrorContent = (props) => {
       children: [/* @__PURE__ */ jsxRuntimeExports.jsx("p", {
         className: cx_default(fontMap[type2], "title", `${type2}-title`),
         children: errorText || t2("dovetail.obtain_data_error")
-      }), !refetch ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(kit.button, {
+      }), props.children, !refetch ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(kit.button, {
         size: type2 === "list" ? "middle" : "small",
         type: "ordinary",
         onClick: (e2) => {
@@ -10640,6 +10644,9 @@ function validateLabelKey(key2) {
   if (prefix2 && prefix2.length > 253) {
     return { isValid: false };
   }
+  if (!labelRegex.test(name2)) {
+    return { isValid: false };
+  }
   if (name2 && name2.length > 63) {
     return { isValid: false };
   }
@@ -10958,7 +10965,6 @@ const TableToolBar = ({
   selectedKeys,
   hideCreate
 }) => {
-  var _a;
   const {
     resource
   } = useResource();
@@ -10968,7 +10974,7 @@ const TableToolBar = ({
       className: ToolbarStyle$1,
       children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
         className: cx_default(Typo.Display.d2_regular_title, TitleStyle$2),
-        children: title || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind)
+        children: title
       }), /* @__PURE__ */ jsxRuntimeExports.jsxs(Space, {
         children: [selectedKeys.length > 0 ? /* @__PURE__ */ jsxRuntimeExports.jsx(DeleteManyButton, {
           ids: selectedKeys
@@ -12052,9 +12058,18 @@ function Table(props) {
   const { tableProps, displayName, errorContentProps } = props;
   const { Table: TableComponent } = useContext(ComponentContext);
   const Table2 = TableComponent || Table$1;
+  const { params } = useParsed();
   const { i18n: i18n2 } = useTranslation();
   const resourceType = transformResourceKindInSentence(displayName, i18n2.language);
   if (!((_a = tableProps.data) == null ? void 0 : _a.length) && !tableProps.loading) {
+    const nameKeyword = (params == null ? void 0 : params[NAME_KEYWORD_PARAM]) || "";
+    if (nameKeyword) {
+      const onClear = () => {
+        var _a2;
+        (_a2 = tableProps.onClearSearchKeyword) == null ? void 0 : _a2.call(tableProps);
+      };
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(WidgetErrorContent, { errorText: i18n2.t("dovetail.no_search_result"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { onClick: onClear, type: "ordinary", children: i18n2.t("dovetail.clear_search_condition") }) });
+    }
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       WidgetErrorContent,
       {
@@ -14408,30 +14423,6 @@ const NamespacesFilter = ({
     })
   });
 };
-function useNamespaceRefineFilter() {
-  const { value: nsFilters = [] } = useNamespacesFilter();
-  const filters = useMemo(() => {
-    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
-    if (filters2.length === 0) {
-      return {
-        permanent: []
-      };
-    }
-    return {
-      permanent: [
-        {
-          operator: "or",
-          value: filters2.map((filter) => ({
-            field: "metadata.namespace",
-            operator: "eq",
-            value: filter
-          }))
-        }
-      ]
-    };
-  }, [nsFilters]);
-  return filters;
-}
 const index_1l2xllo = "";
 const ListPageStyle = "laykzsq";
 const ListContentStyle = "l1ng0psc";
@@ -14454,7 +14445,7 @@ function ListPage(props) {
     children: [!config.hideListToolBar ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, {
       children: [/* @__PURE__ */ jsxRuntimeExports.jsx(TableToolBar, {
         selectedKeys,
-        title: config == null ? void 0 : config.displayName,
+        title: (config == null ? void 0 : config.customListTitle) || (config == null ? void 0 : config.displayName) || config.kind,
         description: config == null ? void 0 : config.description,
         hideCreate: config == null ? void 0 : config.hideCreate
       }), belowToolBarContent, /* @__PURE__ */ jsxRuntimeExports.jsx(Divider, {
@@ -14491,7 +14482,7 @@ function ResourceList(props) {
   const { formatter, columns, Dropdown: Dropdown2, noShow } = props.config;
   const { i18n: i18n2 } = useTranslation();
   const nameRenderer = noShow ? PlainTextNameColumnRenderer(i18n2) : NameColumnRenderer(i18n2);
-  const filters = useNamespaceRefineFilter();
+  const filters = useRefineFilters();
   const { tableProps, selectedKeys } = useEagleTable({
     useTableParams: {
       filters
@@ -19518,6 +19509,78 @@ const SCAllowExpandColumnRenderer = (i18n2) => {
     }
   };
 };
+function useNamespaceRefineFilter() {
+  const { value: nsFilters = [] } = useNamespacesFilter();
+  const filters = useMemo(() => {
+    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
+    if (filters2.length === 0) {
+      return {
+        permanent: []
+      };
+    }
+    return {
+      permanent: [
+        {
+          operator: "or",
+          value: filters2.map((filter) => ({
+            field: "metadata.namespace",
+            operator: "eq",
+            value: filter
+          }))
+        }
+      ]
+    };
+  }, [nsFilters]);
+  return filters;
+}
+const NAME_KEYWORD_PARAM = "name_keyword";
+function useRefineFilters(options = {}) {
+  const {
+    disableNamespaceFilter = false,
+    disableNameKeywordFilter = false
+  } = options;
+  const { value: nsFilters = [] } = useNamespacesFilter();
+  const namespaceFilters = useMemo(() => {
+    if (disableNamespaceFilter) {
+      return [];
+    }
+    const filters2 = nsFilters.filter((filter) => filter !== ALL_NS);
+    if (filters2.length === 0) {
+      return [];
+    }
+    return [
+      {
+        operator: "or",
+        value: filters2.map((filter) => ({
+          field: "metadata.namespace",
+          operator: "eq",
+          value: filter
+        }))
+      }
+    ];
+  }, [nsFilters, disableNamespaceFilter]);
+  const { params } = useParsed();
+  const nameKeyword = params == null ? void 0 : params[NAME_KEYWORD_PARAM];
+  const nameKeywordFilters = useMemo(() => {
+    if (disableNameKeywordFilter || !nameKeyword || nameKeyword.trim() === "") {
+      return [];
+    }
+    return [
+      {
+        field: "metadata.name",
+        operator: "contains",
+        value: nameKeyword.trim()
+      }
+    ];
+  }, [nameKeyword, disableNameKeywordFilter]);
+  const filters = useMemo(
+    () => ({
+      permanent: [...namespaceFilters, ...nameKeywordFilters]
+    }),
+    [namespaceFilters, nameKeywordFilters]
+  );
+  return filters;
+}
 const styles = "";
 const Dovetail = (props) => {
   const {
@@ -19850,6 +19913,7 @@ export {
   ModelPlugin,
   MonacoYamlDiffEditor,
   MonacoYamlEditor,
+  NAME_KEYWORD_PARAM,
   NETWORK_POLICY_INIT_VALUE,
   NODE_INIT_VALUE,
   NS_STORE_KEY,
@@ -20017,6 +20081,7 @@ export {
   generateValueFromSchema,
   getApiVersion,
   getResourceNameByKind,
+  isFirstLetterEnglish,
   matchSelector,
   modelPlugin,
   namespaceRules,
@@ -20027,6 +20092,8 @@ export {
   rfc1035LabelRules,
   rfc1123LabelRules,
   routerProvider,
+  shortenedImage,
+  transformResourceKindInSentence,
   useApiGroupSchema,
   useDeleteModal,
   useDeleteModalOnly,
@@ -20038,6 +20105,7 @@ export {
   useNamespaceRefineFilter,
   useNamespacesFilter,
   useOpenForm,
+  useRefineFilters,
   useRefineForm,
   useSchema,
   validateDataKey,

package/dist/types/resource.d.ts

@@ -174,6 +174,8 @@ export type ResourceConfig<Model extends ResourceModel = ResourceModel> = {
     hideCreate?: boolean;
     /** 资源的描述信息 */
     description?: React.ReactNode;
+    /** 自定义资源列表标题 */
+    customListTitle?: string;
     /** 父级资源名称，用于建立资源层级关系。在 Dovetail2 中用不到这个 */
     parent?: string;
     /** 格式化数据参数，目前暂未完全实现，可能会删除 */

package/dist/utils/index.d.ts

@@ -3,3 +3,4 @@ export * from './k8s';
 export * from './match-selector';
 export * from './getResourceNameByKind';
 export * from './validation';
+export * from './string';

package/package.json

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