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

Merge pull request #15243 from strapi/fix/ML-header-tooltip-and-asset-count

Browse Source 
[fix] ML table headers and asset count
This commit is contained in:
Julie Plantey 2022-12-22 14:25:15 +01:00 committed by GitHub
commit f488558cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js
View File

@ -250,11 +250,11 @@ describe('BrowseStep', () => {
it('should render the table headers', () => { it('should render the table headers', () => {
usePersistentState.mockReturnValueOnce([viewOptions.LIST]); usePersistentState.mockReturnValueOnce([viewOptions.LIST]);
const { getByText } = setup(); const { getByText, getByRole } = setup();
expect(getByText('preview')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'preview' })).toBeInTheDocument();
expect(getByText('name')).toBeInTheDocument(); expect(getByText('name')).toBeInTheDocument();
expect(getByText('extension')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'extension' })).toBeInTheDocument();
expect(getByText('size')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'size' })).toBeInTheDocument();
expect(getByText('created')).toBeInTheDocument(); expect(getByText('created')).toBeInTheDocument();
expect(getByText('last update')).toBeInTheDocument(); expect(getByText('last update')).toBeInTheDocument();
}); });

4
packages/core/upload/admin/src/components/TableList/index.js
View File

@ -80,8 +80,8 @@ export const TableList = ({
} }
key={key} key={key}
> >
<Tooltip label={isSortable ? sortLabel : tableHeaderLabel}>
{isSortable ? ( {isSortable ? (
<Tooltip label={sortLabel}>
<Typography <Typography
onClick={() => handleClickSort(isSorted, name)} onClick={() => handleClickSort(isSorted, name)}
as={isSorted ? 'span' : 'button'} as={isSorted ? 'span' : 'button'}
@ -91,12 +91,12 @@ export const TableList = ({
> >
{tableHeaderLabel} {tableHeaderLabel}
</Typography> </Typography>
</Tooltip>
) : ( ) : (
<Typography textColor="neutral600" variant="sigma"> <Typography textColor="neutral600" variant="sigma">
{tableHeaderLabel} {tableHeaderLabel}
</Typography> </Typography>
)} )}
</Tooltip>
</Th> </Th>
); );
})} })}

10
packages/core/upload/admin/src/components/TableList/tests/TableList.test.js
View File

@ -61,13 +61,13 @@ const ComponentFixture = (props) => {
const setup = (props) => render(<ComponentFixture {...props} />); const setup = (props) => render(<ComponentFixture {...props} />);
describe('TableList', () => { describe('TableList', () => {
it('should render table headers labels', () => { it.only('should render table headers labels', () => {
const { getByText } = setup(); const { getByText, getByRole } = setup();
expect(getByText('preview')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'preview' })).toBeInTheDocument();
expect(getByText('name')).toBeInTheDocument(); expect(getByText('name')).toBeInTheDocument();
expect(getByText('extension')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'extension' })).toBeInTheDocument();
expect(getByText('size')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'size' })).toBeInTheDocument();
expect(getByText('created')).toBeInTheDocument(); expect(getByText('created')).toBeInTheDocument();
expect(getByText('last update')).toBeInTheDocument(); expect(getByText('last update')).toBeInTheDocument();
}); });

3
packages/core/upload/admin/src/pages/App/MediaLibrary/index.js
View File

@ -136,6 +136,7 @@ export const MediaLibrary = () => {
assetsData?.results?.map((asset) => ({ ...asset, type: 'asset', isSelectable: canUpdate })) || assetsData?.results?.map((asset) => ({ ...asset, type: 'asset', isSelectable: canUpdate })) ||
[]; [];
const assetCount = assets?.length ?? 0; const assetCount = assets?.length ?? 0;
const totalAssetCount = assetsData?.pagination?.total;
const isLoading = isCurrentFolderLoading || foldersLoading || permissionsLoading || assetsLoading; const isLoading = isCurrentFolderLoading || foldersLoading || permissionsLoading || assetsLoading;
const [showUploadAssetDialog, setShowUploadAssetDialog] = useState(false); const [showUploadAssetDialog, setShowUploadAssetDialog] = useState(false);
@ -458,7 +459,7 @@ export const MediaLibrary = () => {
id: getTrad('list.assets.title'), id: getTrad('list.assets.title'),
defaultMessage: 'Assets ({count})', defaultMessage: 'Assets ({count})',
}, },
{ count: assetCount } { count: totalAssetCount }
)) || )) ||
'' ''
} }

8
packages/core/upload/admin/src/pages/App/MediaLibrary/tests/MediaLibrary.test.js
View File

@ -559,11 +559,11 @@ describe('Media library homepage', () => {
it('should render the table headers', () => { it('should render the table headers', () => {
usePersistentState.mockReturnValueOnce([viewOptions.LIST]); usePersistentState.mockReturnValueOnce([viewOptions.LIST]);
const { getByText } = renderML(); const { getByText, getByRole } = renderML();
expect(getByText('preview')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'preview' })).toBeInTheDocument();
expect(getByText('name')).toBeInTheDocument(); expect(getByText('name')).toBeInTheDocument();
expect(getByText('extension')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'extension' })).toBeInTheDocument();
expect(getByText('size')).toBeInTheDocument(); expect(getByRole('gridcell', { name: 'size' })).toBeInTheDocument();
expect(getByText('created')).toBeInTheDocument(); expect(getByText('created')).toBeInTheDocument();
expect(getByText('last update')).toBeInTheDocument(); expect(getByText('last update')).toBeInTheDocument();
}); });