Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix resource propType definitions in components using ResourceContext #5929

Merged
merged 2 commits into from Feb 17, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/button/BulkDeleteButton.tsx
Expand Up @@ -25,7 +25,7 @@ export type BulkDeleteButtonProps = Props &
BulkDeleteButton.propTypes = {
basePath: PropTypes.string,
label: PropTypes.string,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
selectedIds: PropTypes.arrayOf(PropTypes.any).isRequired,
undoable: PropTypes.bool,
icon: PropTypes.element,
Expand Down
Expand Up @@ -164,7 +164,7 @@ BulkDeleteWithConfirmButton.propTypes = {
confirmTitle: PropTypes.string,
confirmContent: PropTypes.string,
label: PropTypes.string,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
selectedIds: PropTypes.arrayOf(PropTypes.any).isRequired,
icon: PropTypes.element,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/button/BulkExportButton.tsx
Expand Up @@ -91,7 +91,7 @@ BulkExportButton.propTypes = {
basePath: PropTypes.string,
exporter: PropTypes.func,
label: PropTypes.string,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
selectedIds: PropTypes.arrayOf(PropTypes.any).isRequired,
icon: PropTypes.element,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/detail/Edit.tsx
Expand Up @@ -90,7 +90,7 @@ Edit.propTypes = {
mutationMode: PropTypes.oneOf(['pessimistic', 'optimistic', 'undoable']),
onSuccess: PropTypes.func,
onFailure: PropTypes.func,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
successMessage: PropTypes.string,
title: PropTypes.node,
transform: PropTypes.func,
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/detail/Show.tsx
Expand Up @@ -85,6 +85,6 @@ Show.propTypes = {
hasList: PropTypes.bool,
hasShow: PropTypes.bool,
id: PropTypes.any.isRequired,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
title: PropTypes.node,
};
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/list/BulkDeleteAction.tsx
Expand Up @@ -35,7 +35,7 @@ BulkDeleteAction.propTypes = {
basePath: PropTypes.string,
label: PropTypes.string,
onExit: PropTypes.func.isRequired,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
selectedIds: PropTypes.arrayOf(PropTypes.any).isRequired,
translate: PropTypes.func.isRequired,
undoable: PropTypes.bool,
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/list/List.tsx
Expand Up @@ -103,7 +103,7 @@ List.propTypes = {
location: PropTypes.any,
match: PropTypes.any,
path: PropTypes.string,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
syncWithLocation: PropTypes.bool,
};

Expand Down
6 changes: 4 additions & 2 deletions packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
Expand Up @@ -16,6 +16,7 @@ import lodashGet from 'lodash/get';
import { FilterButtonMenuItem } from './FilterButtonMenuItem';
import Button from '../../button/Button';
import { ClassesOverride } from '../../types';
import { useResourceContext } from 'ra-core';

const useStyles = makeStyles(
{
Expand All @@ -32,9 +33,10 @@ const FilterButton = (props: FilterButtonProps): JSX.Element => {
showFilter,
classes: classesOverride,
className,
resource,
resource: propsResource,
WiXSL marked this conversation as resolved.
Show resolved Hide resolved
...rest
} = props;
const resource = useResourceContext(props);
const [open, setOpen] = useState(false);
const anchorEl = useRef();
const classes = useStyles(props);
Expand Down Expand Up @@ -98,7 +100,7 @@ const FilterButton = (props: FilterButtonProps): JSX.Element => {
};

FilterButton.propTypes = {
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
filters: PropTypes.arrayOf(PropTypes.node).isRequired,
displayedFilters: PropTypes.object,
filterValues: PropTypes.object.isRequired,
Expand Down
Expand Up @@ -37,7 +37,7 @@ export const FilterButtonMenuItem = forwardRef<any, FilterButtonMenuItemProps>(
FilterButtonMenuItem.propTypes = {
filter: PropTypes.element.isRequired,
onShow: PropTypes.func.isRequired,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
};

export interface FilterButtonMenuItemProps {
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
Expand Up @@ -137,7 +137,7 @@ const handleSubmit = event => {
};

FilterForm.propTypes = {
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
filters: PropTypes.arrayOf(PropTypes.node).isRequired,
displayedFilters: PropTypes.object,
hideFilter: PropTypes.func.isRequired,
Expand Down