change collectionSummary to searchResultSummary
This commit is contained in:
parent
fa0f903ba0
commit
5652811918
|
@ -7,14 +7,14 @@ import { EnteFile } from 'types/file';
|
|||
import { SearchBarWrapper, SearchButtonWrapper } from './styledComponents';
|
||||
import SearchInput from './input';
|
||||
import { Search } from 'types/search';
|
||||
import { SetSearchResultInfo } from 'types/gallery';
|
||||
import { SetSearchResultSummary } from 'types/gallery';
|
||||
|
||||
interface Props {
|
||||
isOpen: boolean;
|
||||
isFirstFetch: boolean;
|
||||
setOpen: (value: boolean) => void;
|
||||
setSearch: (search: Search) => void;
|
||||
setSearchResultInfo: SetSearchResultInfo;
|
||||
setSearchResultInfo: SetSearchResultSummary;
|
||||
collections: Collection[];
|
||||
setActiveCollection: (id: number) => void;
|
||||
files: EnteFile[];
|
||||
|
|
|
@ -10,11 +10,10 @@ import { SearchInputWrapper } from './styledComponents';
|
|||
import { SelectStyles } from './styles';
|
||||
import AsyncSelect from 'react-select/async';
|
||||
import CloseIcon from '@mui/icons-material/Close';
|
||||
import { SetSearch, SetSearchResultInfo } from 'types/gallery';
|
||||
import { SetSearch, SetSearchResultSummary } from 'types/gallery';
|
||||
import { EnteFile } from 'types/file';
|
||||
import { Collection } from 'types/collection';
|
||||
import { OptionWithInfo } from './optionWithInfo';
|
||||
import { CollectionType } from 'constants/collection';
|
||||
|
||||
interface Iprops {
|
||||
isOpen: boolean;
|
||||
|
@ -23,7 +22,7 @@ interface Iprops {
|
|||
files: EnteFile[];
|
||||
collections: Collection[];
|
||||
setActiveCollection: (id: number) => void;
|
||||
setSearchResultInfo: SetSearchResultInfo;
|
||||
setSearchResultInfo: SetSearchResultSummary;
|
||||
}
|
||||
|
||||
export default function SearchInput(props: Iprops) {
|
||||
|
@ -80,9 +79,8 @@ export default function SearchInput(props: Iprops) {
|
|||
break;
|
||||
}
|
||||
props.setSearchResultInfo({
|
||||
name: selectedOption.label,
|
||||
optionName: selectedOption.label,
|
||||
fileCount: selectedOption.fileCount,
|
||||
type: CollectionType.system,
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ export default function Gallery() {
|
|||
});
|
||||
|
||||
const [isInSearchMode, setIsInSearchMode] = useState(false);
|
||||
const [searchResultInfo, setSearchResultInfo] =
|
||||
const [searchResultSummary, setSetSearchResultSummary] =
|
||||
useState<CollectionSummary>(null);
|
||||
const syncInProgress = useRef(true);
|
||||
const resync = useRef(false);
|
||||
|
@ -630,7 +630,7 @@ export default function Gallery() {
|
|||
files={getNonTrashedUniqueUserFiles(files)}
|
||||
setActiveCollection={setActiveCollection}
|
||||
updateSearch={updateSearch}
|
||||
setSearchResultInfo={setSearchResultInfo}
|
||||
setSearchResultInfo={setSetSearchResultSummary}
|
||||
/>
|
||||
|
||||
<Collections
|
||||
|
@ -642,7 +642,7 @@ export default function Gallery() {
|
|||
setCollectionNamerAttributes={setCollectionNamerAttributes}
|
||||
/>
|
||||
{isInSearchMode && (
|
||||
<SearchResultInfo searchResult={searchResultInfo} />
|
||||
<SearchResultInfo searchResult={searchResultSummary} />
|
||||
)}
|
||||
|
||||
<Upload
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Collection, CollectionSummary } from 'types/collection';
|
||||
import { Collection } from 'types/collection';
|
||||
import { EnteFile } from 'types/file';
|
||||
import { Search } from 'types/search';
|
||||
import { Search, SearchResultSummary } from 'types/search';
|
||||
|
||||
export type SelectedState = {
|
||||
[k: number]: boolean;
|
||||
|
@ -10,8 +10,8 @@ export type SelectedState = {
|
|||
export type SetFiles = React.Dispatch<React.SetStateAction<EnteFile[]>>;
|
||||
export type SetCollections = React.Dispatch<React.SetStateAction<Collection[]>>;
|
||||
export type SetLoading = React.Dispatch<React.SetStateAction<Boolean>>;
|
||||
export type SetSearchResultInfo = React.Dispatch<
|
||||
React.SetStateAction<CollectionSummary>
|
||||
export type SetSearchResultSummary = React.Dispatch<
|
||||
React.SetStateAction<SearchResultSummary>
|
||||
>;
|
||||
export type SetSearch = React.Dispatch<React.SetStateAction<Search>>;
|
||||
|
||||
|
|
|
@ -34,6 +34,11 @@ export type Search = {
|
|||
file?: number;
|
||||
};
|
||||
|
||||
export type SearchResultSummary = {
|
||||
optionName: string;
|
||||
fileCount: number;
|
||||
};
|
||||
|
||||
export interface SearchOption extends Suggestion {
|
||||
fileCount: number;
|
||||
previewFiles: EnteFile[];
|
||||
|
|
Loading…
Reference in a new issue