move useSavedQueries to ra-core

Author: slax57

packages/ra-core/src/index.ts

@@ -8,6 +8,7 @@ export * from './export';
 export * from './form';
 export * from './i18n';
 export * from './inference';
+export * from './list';
 export * from './notification';
 export * from './routing';
 export * from './store';

packages/ra-core/src/list/filter/index.ts

@@ -0,0 +1 @@
+export * from './useSavedQueries';

…ialui/src/list/filter/useSavedQueries.ts …-core/src/list/filter/useSavedQueries.tspackages/ra-ui-materialui/src/list/filter/useSavedQueries.ts renamed to packages/ra-core/src/list/filter/useSavedQueries.ts packages/ra-ui-materialui/src/list/filter/useSavedQueries.ts renamed to packages/ra-core/src/list/filter/useSavedQueries.ts

@@ -1,4 +1,5 @@
-import { SortPayload, useStore } from 'ra-core';
+import { useStore } from '../../store/useStore';
+import { SortPayload } from '../../types';
 
 export const useSavedQueries = (resource: string) => {
     return useStore<SavedQuery[]>(`${resource}.savedQueries`, []);

packages/ra-core/src/list/index.ts

@@ -0,0 +1 @@
+export * from './filter';

packages/ra-ui-materialui/src/list/filter/AddSavedQueryDialog.tsx

@@ -1,6 +1,11 @@
 import * as React from 'react';
 import { ChangeEvent, FormEvent, useState } from 'react';
-import { useListContext, useTranslate } from 'ra-core';
+import {
+    useListContext,
+    useTranslate,
+    extractValidSavedQueries,
+    useSavedQueries,
+} from 'ra-core';
 import {
     Button,
     Dialog,
@@ -10,8 +15,6 @@ import {
     TextField,
 } from '@mui/material';
 
-import { extractValidSavedQueries, useSavedQueries } from './useSavedQueries';
-
 export const AddSavedQueryDialog = ({
     open,
     onClose,

packages/ra-ui-materialui/src/list/filter/FilterButton.tsx

@@ -28,13 +28,14 @@ import {
     useListContext,
     useResourceContext,
     useTranslate,
+    extractValidSavedQueries,
+    useSavedQueries,
 } from 'ra-core';
 import { stringify } from 'query-string';
 import { useNavigate } from 'react-router';
 
 import { FilterButtonMenuItem } from './FilterButtonMenuItem';
 import { Button } from '../../button';
-import { extractValidSavedQueries, useSavedQueries } from './useSavedQueries';
 import { AddSavedQueryDialog } from './AddSavedQueryDialog';
 import { RemoveSavedQueryDialog } from './RemoveSavedQueryDialog';
 

packages/ra-ui-materialui/src/list/filter/RemoveSavedQueryDialog.tsx

@@ -1,6 +1,11 @@
 import * as React from 'react';
 import isEqual from 'lodash/isEqual.js';
-import { useListContext, useTranslate } from 'ra-core';
+import {
+    useListContext,
+    useTranslate,
+    useSavedQueries,
+    extractValidSavedQueries,
+} from 'ra-core';
 import {
     Button,
     Dialog,
@@ -10,8 +15,6 @@ import {
     DialogTitle,
 } from '@mui/material';
 
-import { useSavedQueries, extractValidSavedQueries } from './useSavedQueries';
-
 export interface RemoveSavedQueryDialogProps {
     open: boolean;
     onClose: () => void;

packages/ra-ui-materialui/src/list/filter/SavedQueriesList.tsx

@@ -8,10 +8,14 @@ import {
 } from '@mui/material';
 import BookmarkIcon from '@mui/icons-material/BookmarkBorder';
 import HelpIcon from '@mui/icons-material/HelpOutline';
-import { useListContext, useTranslate } from 'ra-core';
+import {
+    useListContext,
+    useTranslate,
+    extractValidSavedQueries,
+    useSavedQueries,
+} from 'ra-core';
 import isEqual from 'lodash/isEqual.js';
 
-import { extractValidSavedQueries, useSavedQueries } from './useSavedQueries';
 import { RemoveSavedQueryIconButton } from './RemoveSavedQueryIconButton';
 import { AddSavedQueryIconButton } from './AddSavedQueryIconButton';
 import { SavedQueryFilterListItem } from './SavedQueryFilterListItem';

packages/ra-ui-materialui/src/list/filter/SavedQueryFilterListItem.tsx

@@ -14,9 +14,7 @@ import CancelIcon from '@mui/icons-material/CancelOutlined';
 import isEqual from 'lodash/isEqual.js';
 import { useNavigate } from 'react-router-dom';
 import { stringify } from 'query-string';
-import { useListContext } from 'ra-core';
-
-import { SavedQuery } from './useSavedQueries';
+import { useListContext, SavedQuery } from 'ra-core';
 
 const arePropsEqual = (
     prevProps: SavedQueryFilterListItemProps,

packages/ra-ui-materialui/src/list/filter/index.ts

@@ -13,9 +13,15 @@ export * from './RemoveSavedQueryDialog';
 export * from './RemoveSavedQueryIconButton';
 export * from './SavedQueriesList';
 export * from './SavedQueryFilterListItem';
-export * from './useSavedQueries';
 /**
  * @deprecated Import from `ra-core` or `react-admin` instead
  * FIXME: remove the re-export in v6
  */
-export { FilterContext } from 'ra-core';
+export {
+    FilterContext,
+    useSavedQueries,
+    SavedQuery,
+    extractValidSavedQueries,
+    areValidSavedQueries,
+    isValidSavedQuery,
+} from 'ra-core';