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

refactor CollectionSummaryType determination and fallback to incoming share viewer if not a collab incoming share

Browse source
This commit is contained in:
Abhinav 2023-07-04 11:05:53 +05:30
parent 53b245b21f
commit a69848d819
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/photos/src/services/collectionService.ts
View file

@ -53,8 +53,8 @@ import {
isHiddenCollection, isHiddenCollection,
getNonHiddenCollections, getNonHiddenCollections,
changeCollectionSubType, changeCollectionSubType,
isIncomingViewerShare,
isIncomingCollabShare, isIncomingCollabShare,
isIncomingShare,
} from 'utils/collection'; } from 'utils/collection';
import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker'; import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker';
import { getLocalFiles } from './fileService'; import { getLocalFiles } from './fileService';
@ -1019,25 +1019,32 @@ export async function getCollectionSummaries(
collectionFilesCount.get(collection.id) || collectionFilesCount.get(collection.id) ||
collection.type === CollectionType.uncategorized collection.type === CollectionType.uncategorized
) { ) {
let type: CollectionSummaryType;
if (isIncomingShare(collection, user)) {
if (isIncomingCollabShare(collection, user)) {
type = CollectionSummaryType.incomingShareCollaborator;
} else {
type = CollectionSummaryType.incomingShareViewer;
}
} else if (isOutgoingShare(collection, user)) {
type = CollectionSummaryType.outgoingShare;
} else if (isSharedOnlyViaLink(collection)) {
type = CollectionSummaryType.sharedOnlyViaLink;
} else if (IsArchived(collection)) {
type = CollectionSummaryType.archived;
} else if (isHiddenCollection(collection)) {
type = CollectionSummaryType.hidden;
} else {
type = CollectionSummaryType[collection.type];
}
collectionSummaries.set(collection.id, { collectionSummaries.set(collection.id, {
id: collection.id, id: collection.id,
name: collection.name, name: collection.name,
latestFile: collectionLatestFiles.get(collection.id), latestFile: collectionLatestFiles.get(collection.id),
fileCount: collectionFilesCount.get(collection.id) ?? 0, fileCount: collectionFilesCount.get(collection.id) ?? 0,
updationTime: collection.updationTime, updationTime: collection.updationTime,
type: isIncomingViewerShare(collection, user) type: type,
? CollectionSummaryType.incomingShareViewer
: isIncomingCollabShare(collection, user)
? CollectionSummaryType.incomingShareCollaborator
: isOutgoingShare(collection, user)
? CollectionSummaryType.outgoingShare
: isSharedOnlyViaLink(collection)
? CollectionSummaryType.sharedOnlyViaLink
: IsArchived(collection)
? CollectionSummaryType.archived
: isHiddenCollection(collection)
? CollectionSummaryType.hidden
: CollectionSummaryType[collection.type],
}); });
} }
} }