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.

Sign up for GitHub

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

Jump to bottom

fix: react router v6 catch no resource error #1918

Merged
merged 7 commits into from
Jun 13, 2022
Merged

fix: react router v6 catch no resource error #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73e998f
fix: catching no resource error for error component
biskuvit Jun 10, 2022
2994bbd
chore: add changeset
biskuvit Jun 10, 2022
f427626
chore: fix changeset
biskuvit Jun 10, 2022
b8996c4
fix: mui error component handle undefined params action
biskuvit Jun 13, 2022
78537b5
fix(react-location): handle undefined resources
biskuvit Jun 13, 2022
28a038c
chore: add @pankod/refine-react-location to changeset
biskuvit Jun 13, 2022
e72ab12
refactor(mui-error-component): add params resource variable
biskuvit Jun 13, 2022
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
6 changes: 6 additions & 0 deletions .changeset/mean-colts-check.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@pankod/refine-react-router-v6": patch
"@pankod/refine-react-location": patch
---

Fixed a bug that caused `<ErrorComponent/>` to does not appear in the `404` state
24 changes: 13 additions & 11 deletions packages/mui/src/components/pages/error/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,33 @@ export const ErrorComponent: React.FC = () => {
const resource = useResourceWithRoute();

useEffect(() => {
const action = params.action ?? "list";
const resourceName = params.resource;
setErrorMessage(
translate(
"pages.error.info",
{
action: params.action,
resource: params.resource,
action,
resource: resourceName,
},
`You may have forgotten to add the "${params.action}" component to "${params.resource}" resource.`,
`You may have forgotten to add the "${action}" component to "${resourceName}" resource.`,
),
);
if (params.resource) {
const resourceFromRoute = resource(params.resource);
if (resourceName) {
const resourceFromRoute = resource(resourceName);
if (
params.action &&
actionTypes.includes(params.action) &&
!resourceFromRoute[params.action]
action &&
actionTypes.includes(action) &&
!resourceFromRoute[action]
) {
setErrorMessage(
translate(
"pages.error.info",
{
action: params.action,
resource: params.resource,
action,
resource: resourceName,
},
`You may have forgotten to add the "${params.action}" component to "${params.resource}" resource.`,
`You may have forgotten to add the "${action}" component to "${resourceName}" resource.`,
),
);
}
Expand Down
80 changes: 48 additions & 32 deletions packages/react-location/src/resourceComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,18 @@ export const ResourceComponentWrapper: React.FC<{ route: string }> = ({
action="list"
fallback={catchAll ?? <ErrorComponent />}
>
<List
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!list ? (
catchAll ?? <ErrorComponent />
) : (
<List
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);

Expand All @@ -71,14 +75,18 @@ export const ResourceComponentWrapper: React.FC<{ route: string }> = ({
id: id ? decodeURIComponent(id) : undefined,
}}
>
<Create
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!create ? (
catchAll ?? <ErrorComponent />
) : (
<Create
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);

Expand All @@ -92,14 +100,18 @@ export const ResourceComponentWrapper: React.FC<{ route: string }> = ({
}}
fallback={catchAll ?? <ErrorComponent />}
>
<Edit
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!edit ? (
catchAll ?? <ErrorComponent />
) : (
<Edit
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);

Expand All @@ -113,14 +125,18 @@ export const ResourceComponentWrapper: React.FC<{ route: string }> = ({
}}
fallback={catchAll ?? <ErrorComponent />}
>
<Show
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!show ? (
catchAll ?? <ErrorComponent />
) : (
<Show
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);
}
Expand Down
80 changes: 48 additions & 32 deletions packages/react-router-v6/src/routeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,18 @@ const ResourceComponent: React.FC<{ route: string }> = ({ route }) => {
action="list"
fallback={catchAll ?? <ErrorComponent />}
>
<List
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!list ? (
catchAll ?? <ErrorComponent />
) : (
<List
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);
case "create":
Expand All @@ -73,14 +77,18 @@ const ResourceComponent: React.FC<{ route: string }> = ({ route }) => {
id: id ? decodeURIComponent(id) : undefined,
}}
>
<Create
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!create ? (
catchAll ?? <ErrorComponent />
) : (
<Create
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);

Expand All @@ -94,14 +102,18 @@ const ResourceComponent: React.FC<{ route: string }> = ({ route }) => {
}}
fallback={catchAll ?? <ErrorComponent />}
>
<Edit
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!edit ? (
catchAll ?? <ErrorComponent />
) : (
<Edit
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);

Expand All @@ -115,14 +127,18 @@ const ResourceComponent: React.FC<{ route: string }> = ({ route }) => {
}}
fallback={catchAll ?? <ErrorComponent />}
>
<Show
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
{!show ? (
catchAll ?? <ErrorComponent />
) : (
<Show
name={name}
canCreate={canCreate}
canEdit={canEdit}
canDelete={canDelete}
canShow={canShow}
options={options}
/>
)}
</CanAccess>
);
default:
Expand Down