beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix collection option for non album user collections

Browse source
This commit is contained in:
Abhinav 2022-06-29 02:03:06 +05:30
parent af82ca1dd5
commit 61325a4a6c
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/Collections/CollectionInfoWithOptions.tsx
View file

@ -58,7 +58,12 @@ export default function CollectionInfoWithOptions({
fileCount={fileCount} fileCount={fileCount}
endIcon={<EndIcon type={type} />} endIcon={<EndIcon type={type} />}
/> />
{shouldShowOptions(type) && <CollectionOptions {...props} />} {shouldShowOptions(type) && (
<CollectionOptions
{...props}
collectionSummaryType={type}
/>
)}
</SpaceBetweenFlex> </SpaceBetweenFlex>
</CollectionInfoBarWrapper> </CollectionInfoBarWrapper>
); );

22
src/components/Collections/CollectionOptions/index.tsx
View file

@ -16,13 +16,13 @@ import { VISIBILITY_STATE } from 'types/magicMetadata';
import { AppContext } from 'pages/_app'; import { AppContext } from 'pages/_app';
import OverflowMenu from 'components/OverflowMenu/menu'; import OverflowMenu from 'components/OverflowMenu/menu';
import MoreVertIcon from '@mui/icons-material/MoreVert'; import MoreVertIcon from '@mui/icons-material/MoreVert';
import { CollectionType, TRASH_SECTION } from 'constants/collection'; import { CollectionSummaryType } from 'constants/collection';
import { TrashCollectionOption } from './TrashCollectionOption'; import { TrashCollectionOption } from './TrashCollectionOption';
interface CollectionOptionsProps { interface CollectionOptionsProps {
setCollectionNamerAttributes: SetCollectionNamerAttributes; setCollectionNamerAttributes: SetCollectionNamerAttributes;
activeCollection: Collection; activeCollection: Collection;
activeCollectionID: number; collectionSummaryType: CollectionSummaryType;
showCollectionShareModal: () => void; showCollectionShareModal: () => void;
redirectToAll: () => void; redirectToAll: () => void;
} }
@ -44,15 +44,12 @@ export enum CollectionActions {
const CollectionOptions = (props: CollectionOptionsProps) => { const CollectionOptions = (props: CollectionOptionsProps) => {
const { const {
activeCollection, activeCollection,
activeCollectionID, collectionSummaryType,
redirectToAll, redirectToAll,
setCollectionNamerAttributes, setCollectionNamerAttributes,
showCollectionShareModal, showCollectionShareModal,
} = props; } = props;
if (!activeCollectionID) {
return <></>;
}
const { startLoading, finishLoading, setDialogMessage } = const { startLoading, finishLoading, setDialogMessage } =
useContext(AppContext); useContext(AppContext);
const { syncWithRemote } = useContext(GalleryContext); const { syncWithRemote } = useContext(GalleryContext);
@ -205,21 +202,20 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
return ( return (
<OverflowMenu <OverflowMenu
ariaControls={`collection-options-${activeCollectionID}`} ariaControls={'collection-options'}
triggerButtonIcon={<MoreVertIcon />} triggerButtonIcon={<MoreVertIcon />}
triggerButtonProps={{ triggerButtonProps={{
sx: { sx: {
background: (theme) => theme.palette.fill.dark, background: (theme) => theme.palette.fill.dark,
}, },
}}> }}>
{activeCollection?.type === CollectionType.album && ( {collectionSummaryType === CollectionSummaryType.trash ? (
<AlbumCollectionOption <TrashCollectionOption
IsArchived={IsArchived(activeCollection)}
handleCollectionAction={handleCollectionAction} handleCollectionAction={handleCollectionAction}
/> />
)} ) : (
{activeCollectionID === TRASH_SECTION && ( <AlbumCollectionOption
<TrashCollectionOption IsArchived={IsArchived(activeCollection)}
handleCollectionAction={handleCollectionAction} handleCollectionAction={handleCollectionAction}
/> />
)} )}