From b40aa45cf53447808e115ea54fba8200e7256aaa Mon Sep 17 00:00:00 2001 From: ronronscelestes Date: Fri, 5 Nov 2021 11:34:53 +0100 Subject: [PATCH] init search in ML CM --- .../AssetDialog/BrowseStep/index.js | 60 ++++++++++++------- .../MediaLibraryInput/AssetDialog/index.js | 4 +- .../src/components/MediaLibraryInput/index.js | 20 +++---- .../useModalAssets/useModalQueryParams.js | 13 ++++ 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/AssetDialog/BrowseStep/index.js b/packages/core/upload/admin/src/components/MediaLibraryInput/AssetDialog/BrowseStep/index.js index 4f1331d12c..c91925863a 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/AssetDialog/BrowseStep/index.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/AssetDialog/BrowseStep/index.js @@ -4,6 +4,7 @@ import { useIntl } from 'react-intl'; import { Flex } from '@strapi/design-system/Flex'; import { Stack } from '@strapi/design-system/Stack'; import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox'; +import { Searchbar, SearchForm } from '@strapi/design-system/Searchbar'; import { AssetList } from '../../../AssetList'; import getTrad from '../../../../utils/getTrad'; import PaginationFooter from './PaginationFooter'; @@ -14,10 +15,12 @@ export const BrowseStep = ({ assets, onChangePage, onChangePageSize, + onChangeSearch, onChangeSort, onEditAsset, onSelectAllAsset, onSelectAsset, + onSubmitSearch, pagination, queryObject, selectedAssets, @@ -28,26 +31,39 @@ export const BrowseStep = ({ <> {onSelectAllAsset && ( - - - 0 && selectedAssets.length === assets?.length} - onChange={onSelectAllAsset} - /> - - - + + + + 0 && selectedAssets.length === assets?.length} + onChange={onSelectAllAsset} + /> + + + + + {}} + onChange={onChangeSearch} + clearLabel="Clearing the asset search" + size="S" + > + Searching for an asset + + + )} diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js index 55c3484b23..b2a9d6b6e6 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js @@ -145,16 +145,16 @@ export const MediaLibraryInput = ({ selectedAssetIndex={selectedIndex} /> - {step === Steps.SelectAsset && ( - setStep(undefined)} - onValidate={handleValidation} - multiple={multiple} - onAddAsset={() => setStep(Steps.UploadAsset)} - uploadedFiles={uploadedFiles} - /> - )} + {/* {step === Steps.SelectAsset && ( */} + setStep(undefined)} + onValidate={handleValidation} + multiple={multiple} + onAddAsset={() => setStep(Steps.UploadAsset)} + uploadedFiles={uploadedFiles} + /> + {/* )} */} {step === Steps.UploadAsset && ( { setQueryObject(prev => ({ ...prev, sort })); }; + const handleChangeSearch = () => { + console.log('change search'); + }; + + const handleSubmitSearch = e => { + e.preventDefault(); + e.stopPropagation(); + + console.log('submit search'); + }; + return [ { queryObject, rawQuery: stringify(queryObject, { encode: false }) }, { onChangePage: handeChangePage, onChangePageSize: handleChangePageSize, onChangeSort: handleChangeSort, + onChangeSearch: handleChangeSearch, + onSubmitSearch: handleSubmitSearch, }, ]; };