Merge branch 'main' into album-header-change

src/components/Collections/CollectionListBar/CollectionCard.tsx

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

src/components/Collections/CollectionOptions/index.tsx

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

src/components/PhotoList.tsx

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

src/constants/collection/index.ts

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

src/services/collectionService.ts

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