yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-16 10:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of CustomContentLayout component

Browse Source 
Signed-off-by: soupette <cyril@strapi.io>
This commit is contained in:
soupette 2021-09-13 06:36:08 +02:00
parent 0518e7aa15
commit c6c071a30b
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/admin/admin/src/content-manager/pages/ListView/index.js
View File

@ -12,8 +12,8 @@ import { useHistory, useLocation } from 'react-router-dom';
import isEqual from 'react-fast-compare'; import isEqual from 'react-fast-compare';
import { stringify } from 'qs'; import { stringify } from 'qs';
import { import {
CustomContentLayout,
DynamicTable, DynamicTable,
NoPermissions,
// CheckPermissions, // CheckPermissions,
// PopUpWarning, // PopUpWarning,
useFocusWhenNavigate, useFocusWhenNavigate,
@ -24,7 +24,7 @@ import {
useTracking, useTracking,
} from '@strapi/helper-plugin'; } from '@strapi/helper-plugin';
import { Main } from '@strapi/parts/Main'; import { Main } from '@strapi/parts/Main';
import { HeaderLayout } from '@strapi/parts/Layout'; import { ContentLayout, HeaderLayout } from '@strapi/parts/Layout';
import { useNotifyAT } from '@strapi/parts/LiveRegions'; import { useNotifyAT } from '@strapi/parts/LiveRegions';
import { Button } from '@strapi/parts/Button'; import { Button } from '@strapi/parts/Button';
import Add from '@strapi/icons/Add'; import Add from '@strapi/icons/Add';
@ -396,7 +396,8 @@ function ListView({
subtitle={subtitle} subtitle={subtitle}
title={headerLayoutTitle} title={headerLayoutTitle}
/> />
<CustomContentLayout canRead={canRead}> <ContentLayout>
{canRead ? (
<DynamicTable <DynamicTable
contentType={headerLayoutTitle} contentType={headerLayoutTitle}
isLoading={isLoading} isLoading={isLoading}
@ -408,7 +409,10 @@ function ListView({
> >
{/* TODO */} {/* TODO */}
</DynamicTable> </DynamicTable>
</CustomContentLayout> ) : (
<NoPermissions />
)}
</ContentLayout>
</Main> </Main>
); );

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js
View File

@ -54,7 +54,7 @@ const ListPage = () => {
formatMessage( formatMessage(
{ {
id: 'app.utils.notify.data-loaded', id: 'app.utils.notify.data-loaded',
defaultMessage: 'The {label} has loaded', defaultMessage: 'The {target} has loaded',
}, },
{ target: title } { target: title }
) )