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

Merge branch 'main' into album-header-change

Browse source
This commit is contained in:
Ananddubey01 2023-01-19 15:43:54 +05:30
parent ff660811b5 6e9d874737
commit 63fcaa987c
5 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/Collections/CollectionListBar/CollectionCard.tsx
View file

@ -58,7 +58,12 @@ function CollectionCardIcon({ collectionType }) {
})} })}
/> />
)} )}
{collectionType === CollectionSummaryType.shared && <PeopleIcon />} {collectionType === CollectionSummaryType.outgoingShare && (
<PeopleIcon />
)}
{collectionType === CollectionSummaryType.incomingShare && (
<PeopleIcon />
)}
{collectionType === CollectionSummaryType.sharedOnlyViaLink && ( {collectionType === CollectionSummaryType.sharedOnlyViaLink && (
<LinkIcon /> <LinkIcon />
)} )}

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

@ -244,7 +244,8 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
<TrashCollectionOption <TrashCollectionOption
handleCollectionAction={handleCollectionAction} handleCollectionAction={handleCollectionAction}
/> />
) : collectionSummaryType === CollectionSummaryType.shared ? ( ) : collectionSummaryType ===
CollectionSummaryType.incomingShare ? (
<SharedCollectionOption <SharedCollectionOption
handleCollectionAction={handleCollectionAction} handleCollectionAction={handleCollectionAction}
/> />

13
src/components/PhotoList.tsx
View file

@ -563,11 +563,14 @@ export function PhotoList({
switch (listItem.itemType) { switch (listItem.itemType) {
case ITEM_TYPE.TIME: case ITEM_TYPE.TIME:
return listItem.dates ? ( return listItem.dates ? (
listItem.dates.map((item) => ( listItem.dates
<DateContainer key={item.date} span={item.span}> .map((item) => [
{item.date} <DateContainer key={item.date} span={item.span}>
</DateContainer> {item.date}
)) </DateContainer>,
<div key={`${item.date}-gap`} />,
])
.flat()
) : ( ) : (
<DateContainer span={columns}> <DateContainer span={columns}>
{listItem.date} {listItem.date}

9
src/constants/collection/index.ts
View file

@ -15,7 +15,8 @@ export enum CollectionSummaryType {
archive = 'archive', archive = 'archive',
trash = 'trash', trash = 'trash',
all = 'all', all = 'all',
shared = 'shared', outgoingShare = 'outgoingShare',
incomingShare = 'incomingShare',
sharedOnlyViaLink = 'sharedOnlyViaLink', sharedOnlyViaLink = 'sharedOnlyViaLink',
archived = 'archived', archived = 'archived',
} }
@ -34,7 +35,8 @@ export const COLLECTION_SORT_ORDER = new Map([
[CollectionSummaryType.favorites, 1], [CollectionSummaryType.favorites, 1],
[CollectionSummaryType.album, 2], [CollectionSummaryType.album, 2],
[CollectionSummaryType.folder, 2], [CollectionSummaryType.folder, 2],
[CollectionSummaryType.shared, 2], [CollectionSummaryType.incomingShare, 2],
[CollectionSummaryType.outgoingShare, 2],
[CollectionSummaryType.sharedOnlyViaLink, 2], [CollectionSummaryType.sharedOnlyViaLink, 2],
[CollectionSummaryType.archived, 2], [CollectionSummaryType.archived, 2],
[CollectionSummaryType.archive, 3], [CollectionSummaryType.archive, 3],
@ -50,7 +52,8 @@ export const SYSTEM_COLLECTION_TYPES = new Set([
export const UPLOAD_NOT_ALLOWED_COLLECTION_TYPES = new Set([ export const UPLOAD_NOT_ALLOWED_COLLECTION_TYPES = new Set([
CollectionSummaryType.all, CollectionSummaryType.all,
CollectionSummaryType.archive, CollectionSummaryType.archive,
CollectionSummaryType.shared, CollectionSummaryType.incomingShare,
CollectionSummaryType.outgoingShare,
CollectionSummaryType.sharedOnlyViaLink, CollectionSummaryType.sharedOnlyViaLink,
CollectionSummaryType.trash, CollectionSummaryType.trash,
]); ]);

17
src/services/collectionService.ts
View file

@ -827,14 +827,15 @@ export function getCollectionSummaries(
latestFile: collectionLatestFiles.get(collection.id), latestFile: collectionLatestFiles.get(collection.id),
fileCount: collectionFilesCount.get(collection.id), fileCount: collectionFilesCount.get(collection.id),
updationTime: collection.updationTime, updationTime: collection.updationTime,
type: type: isSharedWithMe(collection, user)
isSharedWithMe(collection, user) || isSharedByMe(collection) ? CollectionSummaryType.incomingShare
? CollectionSummaryType.shared : isSharedByMe(collection)
: isSharedOnlyViaLink(collection) ? CollectionSummaryType.outgoingShare
? CollectionSummaryType.sharedOnlyViaLink : isSharedOnlyViaLink(collection)
: IsArchived(collection) ? CollectionSummaryType.sharedOnlyViaLink
? CollectionSummaryType.archived : IsArchived(collection)
: CollectionSummaryType[collection.type], ? CollectionSummaryType.archived
: CollectionSummaryType[collection.type],
}); });
} }
} }