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

Fixes #7108

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-07-22 09:30:06 +02:00
parent fa46dd4f4c
commit cf762e9bf8
4 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js
View File

@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useDebounce } from '@buffetjs/hooks'; import { useDebounce } from '@buffetjs/hooks';
import { HeaderSearch, useGlobalContext, useQuery } from 'strapi-helper-plugin'; import { HeaderSearch, useGlobalContext, useQuery, LoadingIndicator } from 'strapi-helper-plugin';
import { useAppContext } from '../../../hooks'; import { useAppContext } from '../../../hooks';
import { getTrad, getFileModelTimestamps } from '../../../utils'; import { getTrad, getFileModelTimestamps } from '../../../utils';
@ -15,6 +15,7 @@ const HomePageSettings = ({
areAllCheckboxesSelected, areAllCheckboxesSelected,
filters, filters,
hasSomeCheckboxSelected, hasSomeCheckboxSelected,
isLoading,
onChange, onChange,
onFilterDelete, onFilterDelete,
onSelectAll, onSelectAll,
@ -53,6 +54,12 @@ const HomePageSettings = ({
name="_q" name="_q"
value={searchValue} value={searchValue}
/> />
{isLoading ? (
<>
<Padded top bottom size="lg" />
<LoadingIndicator />
</>
) : (
<ControlsWrapper> <ControlsWrapper>
{canUpdate && ( {canUpdate && (
<> <>
@ -68,6 +75,7 @@ const HomePageSettings = ({
<Padded right /> <Padded right />
<Filters onChange={onChange} filters={filters} onClick={onFilterDelete} /> <Filters onChange={onChange} filters={filters} onClick={onFilterDelete} />
</ControlsWrapper> </ControlsWrapper>
)}
</> </>
); );
}; };
@ -85,6 +93,7 @@ HomePageSettings.propTypes = {
areAllCheckboxesSelected: PropTypes.bool, areAllCheckboxesSelected: PropTypes.bool,
filters: PropTypes.array, filters: PropTypes.array,
hasSomeCheckboxSelected: PropTypes.bool, hasSomeCheckboxSelected: PropTypes.bool,
isLoading: PropTypes.bool.isRequired,
onChange: PropTypes.func, onChange: PropTypes.func,
onFilterDelete: PropTypes.func, onFilterDelete: PropTypes.func,
onSelectAll: PropTypes.func, onSelectAll: PropTypes.func,

4
packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/index.js
View File

@ -11,6 +11,7 @@ const HomePageContent = ({
data, data,
dataCount, dataCount,
dataToDelete, dataToDelete,
isLoading,
onCardCheck, onCardCheck,
onCardClick, onCardClick,
onClick, onClick,
@ -41,6 +42,7 @@ const HomePageContent = ({
areAllCheckboxesSelected={areAllCheckboxesSelected} areAllCheckboxesSelected={areAllCheckboxesSelected}
filters={filters} filters={filters}
hasSomeCheckboxSelected={hasSomeCheckboxSelected} hasSomeCheckboxSelected={hasSomeCheckboxSelected}
isLoading={isLoading}
onChange={onParamsChange} onChange={onParamsChange}
onFilterDelete={onFilterDelete} onFilterDelete={onFilterDelete}
onSelectAll={onSelectAll} onSelectAll={onSelectAll}
@ -63,6 +65,7 @@ HomePageContent.defaultProps = {
data: [], data: [],
dataCount: 0, dataCount: 0,
dataToDelete: [], dataToDelete: [],
isLoading: false,
onCardCheck: () => {}, onCardCheck: () => {},
onCardClick: () => {}, onCardClick: () => {},
onClick: () => {}, onClick: () => {},
@ -75,6 +78,7 @@ HomePageContent.propTypes = {
data: PropTypes.array, data: PropTypes.array,
dataCount: PropTypes.number, dataCount: PropTypes.number,
dataToDelete: PropTypes.array, dataToDelete: PropTypes.array,
isLoading: PropTypes.bool,
onCardCheck: PropTypes.func, onCardCheck: PropTypes.func,
onCardClick: PropTypes.func, onCardClick: PropTypes.func,
onClick: PropTypes.func, onClick: PropTypes.func,

11
packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js
View File

@ -5,7 +5,6 @@ import { Header } from '@buffetjs/custom';
import { Button } from '@buffetjs/core'; import { Button } from '@buffetjs/core';
import { import {
PopUpWarning, PopUpWarning,
LoadingIndicator,
useGlobalContext, useGlobalContext,
generateFiltersFromSearch, generateFiltersFromSearch,
generateSearchFromFilters, generateSearchFromFilters,
@ -326,6 +325,7 @@ const HomePage = () => {
data={data} data={data}
dataCount={dataCount} dataCount={dataCount}
dataToDelete={dataToDelete} dataToDelete={dataToDelete}
isLoading={isLoading}
onCardCheck={handleChangeCheck} onCardCheck={handleChangeCheck}
onCardClick={handleClickEditFile} onCardClick={handleClickEditFile}
onClick={handleClickToggleModal} onClick={handleClickToggleModal}
@ -338,14 +338,7 @@ const HomePage = () => {
return ( return (
<Container> <Container>
<Header {...headerProps} isLoading={isLoading} /> <Header {...headerProps} isLoading={isLoading} />
{isLoading ? ( {content}
<>
<Padded top bottom size="lg" />
<LoadingIndicator />
</>
) : (
content
)}
<ModalStepper <ModalStepper
initialFileToEdit={fileToEdit} initialFileToEdit={fileToEdit}
initialStep={modalInitialStep} initialStep={modalInitialStep}

33
yarn.lock
View File

@ -2759,26 +2759,18 @@
"@sentry/types" "5.13.2" "@sentry/types" "5.13.2"
tslib "^1.9.3" tslib "^1.9.3"
"@sindresorhus/slugify@0.9.1": "@sindresorhus/slugify@1.1.0":
version "0.9.1" version "1.1.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-0.9.1.tgz#892ad24d70b442c0a14fe519cb4019d59bc5069f" resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-1.1.0.tgz#2f195365d9b953384305b62664b44b4036c49430"
integrity sha512-b6heYM9dzZD13t2GOiEQTDE0qX+I1GyOotMwKh9VQqzuNiVdPVT8dM43fe9HNb/3ul+Qwd5oKSEDrDIfhq3bnQ== integrity sha512-ujZRbmmizX26yS/HnB3P9QNlNa4+UvHh+rIse3RbOXLp8yl6n1TxB4t7NHggtVgS8QmmOtzXo48kCxZGACpkPw==
dependencies: dependencies:
escape-string-regexp "^1.0.5" "@sindresorhus/transliterate" "^0.1.1"
lodash.deburr "^4.1.0" escape-string-regexp "^4.0.0"
"@sindresorhus/slugify@^0.11.0": "@sindresorhus/transliterate@^0.1.1":
version "0.11.0" version "0.1.1"
resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-0.11.0.tgz#642acb99adefa4187285fd17de88745afc161de8" resolved "https://registry.yarnpkg.com/@sindresorhus/transliterate/-/transliterate-0.1.1.tgz#779b31244781d3c898f185b61d58c89e7c782674"
integrity sha512-ECTZT6z1hYDsopRh8GECaQ5L6hoJHVd4uq5hPi8se9GB31tgtZfnlM8G64hZVhJNmtJ9eIK0SuNhtsaPQStXEQ== integrity sha512-QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ==
dependencies:
"@sindresorhus/transliterate" "^0.1.0"
escape-string-regexp "^2.0.0"
"@sindresorhus/transliterate@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/transliterate/-/transliterate-0.1.0.tgz#c063bfc4102783fb19c91c2f8c1efb3adfb754be"
integrity sha512-bO6v0M0EuJPjm5Ntfow4nk+r3EZQ41n0ahvAmh766FzPqlm6V/2uDc01vZI3gLeI/1lgV2BTMb6QvxOk9z73ng==
dependencies: dependencies:
escape-string-regexp "^2.0.0" escape-string-regexp "^2.0.0"
lodash.deburr "^4.1.0" lodash.deburr "^4.1.0"
@ -7334,6 +7326,11 @@ escape-string-regexp@^2.0.0:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
escape-string-regexp@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
escodegen@1.8.x: escodegen@1.8.x:
version "1.8.1" version "1.8.1"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"