@refinedev/antd 5.41.0 → 5.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@refinedev/antd",
-  "version": "5.41.0",
+  "version": "5.43.0",
   "private": false,
   "description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
   "repository": {
@@ -46,9 +46,9 @@
   },
   "devDependencies": {
     "@esbuild-plugins/node-resolve": "^0.1.4",
-    "@refinedev/cli": "^2.16.35",
-    "@refinedev/core": "^4.52.0",
-    "@refinedev/ui-tests": "^1.14.8",
+    "@refinedev/cli": "^2.16.37",
+    "@refinedev/core": "^4.54.0",
+    "@refinedev/ui-tests": "^1.14.9",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.1.1",
     "@testing-library/react-hooks": "^8.0.0",

package/src/components/fields/date/index.tsx

@@ -23,9 +23,11 @@ export const DateField: React.FC<DateFieldProps> = ({
 
   return (
     <Typography.Text {...rest}>
-      {dayjs(value)
-        .locale(locales || defaultLocale)
-        .format(dateFormat)}
+      {value
+        ? dayjs(value)
+            .locale(locales || defaultLocale)
+            .format(dateFormat)
+        : ""}
     </Typography.Text>
   );
 };

package/src/components/pages/auth/components/forgotPassword/index.tsx

@@ -151,8 +151,11 @@ export const ForgotPasswordPage: React.FC<ResetPassworProps> = ({
               }}
             >
               {translate(
-                "pages.register.buttons.haveAccount",
-                "Have an account? ",
+                "pages.forgotPassword.buttons.haveAccount",
+                translate(
+                  "pages.register.buttons.haveAccount",
+                  "Have an account? ",
+                ),
               )}{" "}
               <ActiveLink
                 style={{
@@ -161,7 +164,10 @@ export const ForgotPasswordPage: React.FC<ResetPassworProps> = ({
                 }}
                 to="/login"
               >
-                {translate("pages.login.signin", "Sign in")}
+                {translate(
+                  "pages.forgotPassword.signin",
+                  translate("pages.login.signin", "Sign in"),
+                )}
               </ActiveLink>
             </Typography.Text>
           )}

package/src/components/pages/auth/components/register/index.tsx

@@ -123,7 +123,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
                   color: token.colorTextLabel,
                 }}
               >
-                {translate("pages.login.divider", "or")}
+                {translate(
+                  "pages.register.divider",
+                  translate("pages.login.divider", "or"),
+                )}
               </Typography.Text>
             </Divider>
           )}
@@ -208,8 +211,11 @@ export const RegisterPage: React.FC<RegisterProps> = ({
                 }}
               >
                 {translate(
-                  "pages.login.buttons.haveAccount",
-                  "Have an account?",
+                  "pages.register.buttons.haveAccount",
+                  translate(
+                    "pages.login.buttons.haveAccount",
+                    "Have an account?",
+                  ),
                 )}{" "}
                 <ActiveLink
                   style={{
@@ -218,7 +224,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
                   }}
                   to="/login"
                 >
-                  {translate("pages.login.signin", "Sign in")}
+                  {translate(
+                    "pages.register.signin",
+                    translate("pages.login.signin", "Sign in"),
+                  )}
                 </ActiveLink>
               </Typography.Text>
             )}
@@ -251,7 +260,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
               fontSize: 12,
             }}
           >
-            {translate("pages.login.buttons.haveAccount", "Have an account?")}{" "}
+            {translate(
+              "pages.register.buttons.haveAccount",
+              translate("pages.login.buttons.haveAccount", "Have an account?"),
+            )}{" "}
             <ActiveLink
               style={{
                 fontWeight: "bold",
@@ -259,7 +271,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
               }}
               to="/login"
             >
-              {translate("pages.login.signin", "Sign in")}
+              {translate(
+                "pages.register.signin",
+                translate("pages.login.signin", "Sign in"),
+              )}
             </ActiveLink>
           </Typography.Text>
         </div>

package/src/hooks/fields/useCheckboxGroup/index.ts

@@ -22,6 +22,10 @@ export type UseCheckboxGroupReturnType<
   > & {
     options: TOption[];
   };
+  query: QueryObserverResult<GetListResponse<TData>>;
+  /**
+   * @deprecated Use `query` instead
+   */
   queryResult: QueryObserverResult<GetListResponse<TData>>;
 };
 
@@ -74,12 +78,7 @@ export const useCheckboxGroup = <
   TError,
   TData
 >): UseCheckboxGroupReturnType<TData, TOption> => {
-  const { queryResult, options } = useSelect<
-    TQueryFnData,
-    TError,
-    TData,
-    TOption
-  >({
+  const { query, options } = useSelect<TQueryFnData, TError, TData, TOption>({
     resource,
     sort,
     sorters,
@@ -103,6 +102,7 @@ export const useCheckboxGroup = <
       options,
       defaultValue,
     },
-    queryResult,
+    query,
+    queryResult: query,
   };
 };

package/src/hooks/fields/useRadioGroup/index.ts

@@ -19,6 +19,10 @@ export type UseRadioGroupReturnType<
   radioGroupProps: Omit<React.ComponentProps<typeof Radio.Group>, "options"> & {
     options: TOption[];
   };
+  query: QueryObserverResult<GetListResponse<TData>>;
+  /**
+   * @deprecated Use `query` instead
+   */
   queryResult: QueryObserverResult<GetListResponse<TData>>;
 };
 
@@ -70,12 +74,7 @@ export const useRadioGroup = <
   TData,
   TOption
 > => {
-  const { queryResult, options } = useSelect<
-    TQueryFnData,
-    TError,
-    TData,
-    TOption
-  >({
+  const { query, options } = useSelect<TQueryFnData, TError, TData, TOption>({
     resource,
     sort,
     sorters,
@@ -100,6 +99,7 @@ export const useRadioGroup = <
       options,
       defaultValue,
     },
-    queryResult,
+    query,
+    queryResult: query,
   };
 };

package/src/hooks/fields/useSelect/index.ts

@@ -16,7 +16,15 @@ export type UseSelectReturnType<
   TOption extends BaseOption = BaseOption,
 > = {
   selectProps: SelectProps<TOption>;
+  query: QueryObserverResult<GetListResponse<TData>>;
+  defaultValueQuery: QueryObserverResult<GetManyResponse<TData>>;
+  /**
+   * @deprecated Use `query` instead
+   */
   queryResult: QueryObserverResult<GetListResponse<TData>>;
+  /**
+   * @deprecated Use `defaultValueQuery` instead
+   */
   defaultValueQueryResult: QueryObserverResult<GetManyResponse<TData>>;
 };
 
@@ -39,18 +47,24 @@ export const useSelect = <
 >(
   props: UseSelectProps<TQueryFnData, TError, TData>,
 ): UseSelectReturnType<TData, TOption> => {
-  const { queryResult, defaultValueQueryResult, onSearch, options } =
-    useSelectCore<TQueryFnData, TError, TData, TOption>(props);
+  const { query, defaultValueQuery, onSearch, options } = useSelectCore<
+    TQueryFnData,
+    TError,
+    TData,
+    TOption
+  >(props);
 
   return {
     selectProps: {
       options,
       onSearch,
-      loading: defaultValueQueryResult.isFetching,
+      loading: defaultValueQuery.isFetching,
       showSearch: true,
       filterOption: false,
     },
-    queryResult,
-    defaultValueQueryResult,
+    query,
+    defaultValueQuery,
+    queryResult: query,
+    defaultValueQueryResult: defaultValueQuery,
   };
 };

package/src/hooks/form/useForm.ts

@@ -262,7 +262,7 @@ export const useForm = <
     autoSave,
   });
 
-  const { formLoading, onFinish, queryResult, id, onFinishAutoSave } =
+  const { formLoading, onFinish, query, id, onFinishAutoSave } =
     useFormCoreResult;
 
   const { warnWhenUnsavedChanges: warnWhenUnsavedChangesRefine, setWarnWhen } =
@@ -270,11 +270,11 @@ export const useForm = <
   const warnWhenUnsavedChanges =
     warnWhenUnsavedChangesProp ?? warnWhenUnsavedChangesRefine;
 
-  // populate form with data when queryResult is ready or id changes
+  // populate form with data when query is ready or id changes
   // form populated via initialValues prop
   React.useEffect(() => {
     form.resetFields();
-  }, [queryResult?.data?.data, id]);
+  }, [query?.data?.data, id]);
 
   const onKeyUp = (event: React.KeyboardEvent<HTMLFormElement>) => {
     if (submitOnEnter && event.key === "Enter") {
@@ -315,7 +315,7 @@ export const useForm = <
         onFinish(values).catch((error) => error),
       onKeyUp,
       onValuesChange,
-      initialValues: queryResult?.data?.data,
+      initialValues: query?.data?.data,
     },
     saveButtonProps,
     defaultFormValuesLoading: formSF.defaultFormValuesLoading,

package/src/hooks/list/useSimpleList/useSimpleList.ts

@@ -23,9 +23,13 @@ export type useSimpleListReturnType<
   TQueryFnData extends BaseRecord = BaseRecord,
   TSearchVariables = unknown,
   TData extends BaseRecord = TQueryFnData,
-> = Omit<useTableReturnType<TData>, "tableQueryResult"> & {
+> = Omit<useTableReturnType<TData>, "tableQueryResult" | "tableQuery"> & {
   listProps: ListProps<TData>;
+  /**
+   * @deprecated Use `query` instead
+   */
   queryResult: useTableReturnType["tableQueryResult"];
+  query: useTableReturnType["tableQuery"];
   searchFormProps: FormProps<TSearchVariables>;
 };
 
@@ -91,6 +95,7 @@ export const useSimpleList = <
     setSorters,
     createLinkForSyncWithLocation,
     tableQueryResult: queryResult,
+    tableQuery: query,
     overtime,
   } = useTableCore({
     resource,
@@ -208,6 +213,7 @@ export const useSimpleList = <
       loading: liveMode === "auto" ? isLoading : !isFetched,
       pagination: antdPagination(),
     },
+    query,
     queryResult,
     filters,
     setFilters,

package/src/hooks/table/useTable/useTable.ts

@@ -92,6 +92,7 @@ export const useTable = <
 > = {}): useTableReturnType<TData, TError, TSearchVariables> => {
   const {
     tableQueryResult,
+    tableQuery,
     current,
     setCurrent,
     pageSize,
@@ -279,6 +280,7 @@ export const useTable = <
       scroll: { x: true },
     },
     tableQueryResult,
+    tableQuery,
     sorters,
     sorter,
     filters,