Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import { Resource } from 'ra-core';
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import fakeRestDataProvider from 'ra-data-fakerest';

import { AdminContext } from '../AdminContext';
import { BulkDeleteButton } from './BulkDeleteButton';
import { defaultLightTheme } from '../theme';
import { Datagrid, List } from '../list';
import { NumberField, TextField } from '../field';
import { DataTable, List } from '../list';
import { AdminUI } from '../AdminUI';

export default { title: 'ra-ui-materialui/button/BulkDeleteButton' };
Expand Down Expand Up @@ -104,12 +102,12 @@ const Wrapper = ({ children, ...props }) => {
name="books"
list={() => (
<List>
<Datagrid bulkActionButtons={children}>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<NumberField source="reads" />
</Datagrid>
<DataTable bulkActionButtons={children}>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.NumberCol source="reads" />
</DataTable>
</List>
)}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import { Resource } from 'ra-core';
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import fakeRestDataProvider from 'ra-data-fakerest';

import { AdminContext } from '../AdminContext';
import { BulkExportButton } from './BulkExportButton';
import { defaultLightTheme } from '../theme';
import { Datagrid, List } from '../list';
import { NumberField, TextField } from '../field';
import { DataTable, List } from '../list';
import { AdminUI } from '../AdminUI';

export default { title: 'ra-ui-materialui/button/BulkExportButton' };
Expand Down Expand Up @@ -104,12 +102,12 @@ const Wrapper = ({ children, ...props }) => {
name="books"
list={() => (
<List>
<Datagrid bulkActionButtons={children}>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<NumberField source="reads" />
</Datagrid>
<DataTable bulkActionButtons={children}>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.NumberCol source="reads" />
</DataTable>
</List>
)}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import { Resource, TestMemoryRouter } from 'ra-core';
import fakeRestDataProvider from 'ra-data-fakerest';

import { BulkUpdateButton } from './BulkUpdateButton';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List, Datagrid } from '../list';
import { TextField, NumberField } from '../field';
import { List, DataTable } from '../list';
import { deepmerge } from '@mui/utils';
import { defaultLightTheme } from '../theme';
import { ThemeOptions } from '@mui/material';
Expand Down Expand Up @@ -104,12 +102,12 @@ const Wrapper = ({ bulkActionButtons, theme = undefined }) => (
name="books"
list={() => (
<List>
<Datagrid bulkActionButtons={bulkActionButtons}>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<NumberField source="reads" />
</Datagrid>
<DataTable bulkActionButtons={bulkActionButtons}>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.NumberCol source="reads" />
</DataTable>
</List>
)}
/>
Expand Down
17 changes: 9 additions & 8 deletions packages/ra-ui-materialui/src/button/CreateButton.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import frenchMessages from 'ra-language-french';

import {
AuthProvider,
I18nProvider,
Expand All @@ -10,13 +11,13 @@ import {
ResourceContextProvider,
TestMemoryRouter,
} from 'ra-core';

import fakeRestDataProvider from 'ra-data-fakerest';
import { QueryClient } from '@tanstack/react-query';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List } from '../list/List';
import { Datagrid } from '../list/datagrid/Datagrid';
import { TextField } from '../field/TextField';
import { DataTable } from '../list';
import { Create } from '../detail/Create';
import { SimpleForm } from '../form/SimpleForm';
import { TextInput } from '../input/TextInput';
Expand Down Expand Up @@ -202,12 +203,12 @@ const AccessControlLayout = ({
const BookList = () => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
</DataTable>
</List>
);
};
Expand Down
21 changes: 12 additions & 9 deletions packages/ra-ui-materialui/src/button/DeleteButton.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import englishMessages from 'ra-language-english';
import frenchMessages from 'ra-language-french';
import { QueryClient } from '@tanstack/react-query';
import fakeRestDataProvider from 'ra-data-fakerest';

import {
AuthProvider,
I18nProvider,
Expand All @@ -16,12 +17,12 @@ import {
ResourceContextProvider,
TestMemoryRouter,
} from 'ra-core';

import { deepmerge } from '@mui/utils';
import { AdminContext } from '../AdminContext';
import { DeleteButton } from './DeleteButton';
import { List } from '../list/List';
import { Datagrid } from '../list/datagrid/Datagrid';
import { TextField } from '../field/TextField';
import { DataTable } from '../list';
import { AdminUI } from '../AdminUI';
import { Notification } from '../layout';
import { LocalesMenuButton } from './LocalesMenuButton';
Expand Down Expand Up @@ -397,13 +398,15 @@ const AccessControlLayout = ({

const BookList = ({ mutationMode = 'undoable' as const }) => (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
<DeleteButton mutationMode={mutationMode} />
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
<DataTable.Col>
<DeleteButton mutationMode={mutationMode} />
</DataTable.Col>
</DataTable>
</List>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import frenchMessages from 'ra-language-french';
import { Resource, TestMemoryRouter } from 'ra-core';
import fakeRestDataProvider from 'ra-data-fakerest';
import { Alert, createTheme, ThemeOptions } from '@mui/material';

import { DeleteWithConfirmButton } from './DeleteWithConfirmButton';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List, Datagrid } from '../list';
import { TextField } from '../field';
import { List, DataTable } from '../list';
import { deepmerge } from '@mui/utils';

export default { title: 'ra-ui-materialui/button/DeleteWithConfirmButton' };
Expand Down Expand Up @@ -172,25 +170,25 @@ const dataProvider = fakeRestDataProvider({
const BookList = ({ children }) => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
{children}
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
<DataTable.Col>{children}</DataTable.Col>
</DataTable>
</List>
);
};

const AuthorList = ({ children }) => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="fullName" />
{children}
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="fullName" />
<DataTable.Col>{children}</DataTable.Col>
</DataTable>
</List>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import polyglotI18nProvider from 'ra-i18n-polyglot';
import frenchMessages from 'ra-language-french';
import englishMessages from 'ra-language-english';
import fakeRestDataProvider from 'ra-data-fakerest';
import { Datagrid, List } from '../list';
import { TextField } from '../field';
import { DataTable, List } from '../list';

export default { title: 'ra-ui-materialui/button/DeleteWithUndoButton' };

Expand Down Expand Up @@ -145,13 +144,13 @@ const dataProvider = fakeRestDataProvider({
const BookList = ({ children }) => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
{children}
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
<DataTable.Col>{children}</DataTable.Col>
</DataTable>
</List>
);
};
Expand Down
21 changes: 12 additions & 9 deletions packages/ra-ui-materialui/src/button/EditButton.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import frenchMessages from 'ra-language-french';

import {
AuthProvider,
I18nProvider,
Expand All @@ -12,13 +13,13 @@ import {
ResourceContextProvider,
TestMemoryRouter,
} from 'ra-core';

import fakeRestDataProvider from 'ra-data-fakerest';
import { QueryClient } from '@tanstack/react-query';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List } from '../list/List';
import { Datagrid } from '../list/datagrid/Datagrid';
import { TextField } from '../field/TextField';
import { DataTable } from '../list';
import { SimpleForm } from '../form/SimpleForm';
import { TextInput } from '../input/TextInput';
import { EditButton } from './EditButton';
Expand Down Expand Up @@ -238,13 +239,15 @@ const AccessControlLayout = ({
const BookList = () => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
<EditButton />
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
<DataTable.Col>
<EditButton />
</DataTable.Col>
</DataTable>
</List>
);
};
Expand Down
17 changes: 9 additions & 8 deletions packages/ra-ui-materialui/src/button/ListButton.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from 'ra-language-english';
import frenchMessages from 'ra-language-french';

import {
AuthProvider,
I18nProvider,
Expand All @@ -11,15 +12,15 @@ import {
ResourceContextProvider,
TestMemoryRouter,
} from 'ra-core';

import fakeRestDataProvider from 'ra-data-fakerest';
import { QueryClient } from '@tanstack/react-query';
import { deepmerge } from '@mui/utils';
import { ThemeOptions } from '@mui/material';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List } from '../list/List';
import { Datagrid } from '../list/datagrid/Datagrid';
import { TextField } from '../field/TextField';
import { DataTable } from '../list';
import { SimpleForm } from '../form/SimpleForm';
import { TextInput } from '../input/TextInput';
import { ListButton } from './ListButton';
Expand Down Expand Up @@ -208,12 +209,12 @@ const AccessControlLayout = ({
const BookList = () => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
</DataTable>
</List>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import { useTranslate, Resource, TestMemoryRouter } from 'ra-core';
import fakeRestDataProvider from 'ra-data-fakerest';
import { Typography } from '@mui/material';
import LanguageIcon from '@mui/icons-material/Language';

import { LocalesMenuButton } from './LocalesMenuButton';
import { AdminContext } from '../AdminContext';
import { AdminUI } from '../AdminUI';
import { List, Datagrid } from '../list';
import { TextField } from '../field';
import { List, DataTable } from '../list';
import { AppBar, Layout, TitlePortal } from '../layout';

export default { title: 'ra-ui-materialui/button/LocalesMenuButton' };
Expand Down Expand Up @@ -143,12 +141,12 @@ const dataProvider = fakeRestDataProvider({
const BookList = () => {
return (
<List>
<Datagrid>
<TextField source="id" />
<TextField source="title" />
<TextField source="author" />
<TextField source="year" />
</Datagrid>
<DataTable>
<DataTable.Col source="id" />
<DataTable.Col source="title" />
<DataTable.Col source="author" />
<DataTable.Col source="year" />
</DataTable>
</List>
);
};
Expand Down
Loading