Make main default again

.github/workflows/l18n-crowdin.yml

@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: main
 
       - name: crowdin action
         uses: crowdin/github-action@v1

apps/photos/public/locales/en/translation.json

@@ -537,5 +537,7 @@
     "NEWEST_FIRST": "Newest first",
     "OLDEST_FIRST": "Oldest first",
     "CONVERSION_FAILED_NOTIFICATION_MESSAGE": "This file could not be previewed. Click here to download the original.",
-    "SELECT_COLLECTION":"Select album"
+    "SELECT_COLLECTION":"Select album",
+    "PIN_ALBUM":"Pin album",
+    "UNPIN_ALBUM":"Unpin album"
 }

apps/photos/src/components/Collections/AllCollections/collectionCard.tsx

@@ -19,7 +19,7 @@ export default function AllCollectionCard({
     return (
         <CollectionCard
             collectionTile={AllCollectionTile}
-            latestFile={collectionSummary.latestFile}
+            coverFile={collectionSummary.coverFile}
             onClick={() => onCollectionClick(collectionSummary.id)}
             isScrolling={isScrolling}>
             <AllCollectionTileText>

apps/photos/src/components/Collections/CollectionCard.tsx

@@ -8,13 +8,13 @@ import { LoadingThumbnail } from 'components/PlaceholderThumbnails';
 
 export default function CollectionCard(props: {
     children?: any;
-    latestFile: EnteFile;
+    coverFile: EnteFile;
     onClick: () => void;
     collectionTile: any;
     isScrolling?: boolean;
 }) {
     const {
-        latestFile: file,
+        coverFile: file,
         onClick,
         children,
         collectionTile: CustomCollectionTile,

apps/photos/src/components/Collections/CollectionInfoWithOptions.tsx

@@ -36,7 +36,8 @@ export default function CollectionInfoWithOptions({
                 return <Favorite />;
             case CollectionSummaryType.archived:
                 return <ArchiveOutlined />;
-            case CollectionSummaryType.incomingShare:
+            case CollectionSummaryType.incomingShareViewer:
+            case CollectionSummaryType.incomingShareCollaborator:
                 return <PeopleIcon />;
             case CollectionSummaryType.outgoingShare:
                 return <PeopleIcon />;

apps/photos/src/components/Collections/CollectionListBar/CollectionCard.tsx

@@ -14,6 +14,7 @@ import ArchiveIcon from '@mui/icons-material/Archive';
 import PeopleIcon from '@mui/icons-material/People';
 import LinkIcon from '@mui/icons-material/Link';
 import { CollectionSummary } from 'types/collection';
+import PushPin from '@mui/icons-material/PushPin';
 
 interface Iprops {
     collectionSummary: CollectionSummary;
@@ -29,7 +30,7 @@ const CollectionListBarCard = (props: Iprops) => {
         <Box>
             <CollectionCard
                 collectionTile={CollectionBarTile}
-                latestFile={collectionSummary.latestFile}
+                coverFile={collectionSummary.coverFile}
                 onClick={() => {
                     onCollectionClick(collectionSummary.id);
                 }}>
@@ -63,12 +64,15 @@ function CollectionCardIcon({ collectionType }) {
             {collectionType === CollectionSummaryType.outgoingShare && (
                 <PeopleIcon />
             )}
-            {collectionType === CollectionSummaryType.incomingShare && (
+            {(collectionType === CollectionSummaryType.incomingShareViewer ||
+                collectionType ===
+                    CollectionSummaryType.incomingShareCollaborator) && (
                 <PeopleIcon />
             )}
             {collectionType === CollectionSummaryType.sharedOnlyViaLink && (
                 <LinkIcon />
             )}
+            {collectionType === CollectionSummaryType.pinned && <PushPin />}
         </CollectionBarTileIcon>
     );
 }

apps/photos/src/components/Collections/CollectionListBar/index.tsx

@@ -76,7 +76,7 @@ const CollectionCardContainer = React.memo(
 );
 
 const getItemKey = (index: number, data: ItemData) => {
-    return `${data.collectionSummaries[index].id}-${data.collectionSummaries[index].latestFile?.id}`;
+    return `${data.collectionSummaries[index].id}-${data.collectionSummaries[index].coverFile?.id}`;
 };
 
 const CollectionListBar = (props: IProps) => {

apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx

@@ -9,17 +9,21 @@ import Unarchive from '@mui/icons-material/Unarchive';
 import ArchiveOutlined from '@mui/icons-material/ArchiveOutlined';
 import SortIcon from '@mui/icons-material/Sort';
 import { t } from 'i18next';
+import PushPinOutlined from '@mui/icons-material/PushPinOutlined';
+import { UnPinIcon } from 'components/icons/UnPinIcon';
 
 interface Iprops {
-    IsArchived: boolean;
+    isArchived: boolean;
+    isPinned: boolean;
     handleCollectionAction: (
         action: CollectionActions,
         loader?: boolean
     ) => (...args: any[]) => Promise<void>;
 }
 
 export function AlbumCollectionOption({
-    IsArchived,
+    isArchived,
+    isPinned,
     handleCollectionAction,
 }: Iprops) {
     return (
@@ -40,7 +44,26 @@ export function AlbumCollectionOption({
                 startIcon={<SortIcon />}>
                 {t('SORT_BY')}
             </OverflowMenuOption>
-            {IsArchived ? (
+            {isPinned ? (
+                <OverflowMenuOption
+                    onClick={handleCollectionAction(
+                        CollectionActions.UNPIN_ALBUM,
+                        false
+                    )}
+                    startIcon={<UnPinIcon />}>
+                    {t('UNPIN_ALBUM')}
+                </OverflowMenuOption>
+            ) : (
+                <OverflowMenuOption
+                    onClick={handleCollectionAction(
+                        CollectionActions.PIN_ALBUM,
+                        false
+                    )}
+                    startIcon={<PushPinOutlined />}>
+                    {t('PIN_ALBUM')}
+                </OverflowMenuOption>
+            )}
+            {isArchived ? (
                 <OverflowMenuOption
                     onClick={handleCollectionAction(
                         CollectionActions.UNARCHIVE

apps/photos/src/components/Collections/CollectionOptions/SharedCollectionOption.tsx

@@ -3,23 +3,46 @@ import React from 'react';
 import LogoutIcon from '@mui/icons-material/Logout';
 import { CollectionActions } from '.';
 import { t } from 'i18next';
+import Unarchive from '@mui/icons-material/Unarchive';
+import ArchiveOutlined from '@mui/icons-material/ArchiveOutlined';
 
 interface Iprops {
+    isArchived: boolean;
     handleCollectionAction: (
         action: CollectionActions,
         loader?: boolean
     ) => (...args: any[]) => Promise<void>;
 }
 
-export function SharedCollectionOption({ handleCollectionAction }: Iprops) {
+export function SharedCollectionOption({
+    isArchived,
+    handleCollectionAction,
+}: Iprops) {
     return (
-        <OverflowMenuOption
-            startIcon={<LogoutIcon />}
-            onClick={handleCollectionAction(
-                CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM,
-                false
-            )}>
-            {t('LEAVE_ALBUM')}
-        </OverflowMenuOption>
+        <>
+            {isArchived ? (
+                <OverflowMenuOption
+                    onClick={handleCollectionAction(
+                        CollectionActions.UNARCHIVE
+                    )}
+                    startIcon={<Unarchive />}>
+                    {t('UNARCHIVE_COLLECTION')}
+                </OverflowMenuOption>
+            ) : (
+                <OverflowMenuOption
+                    onClick={handleCollectionAction(CollectionActions.ARCHIVE)}
+                    startIcon={<ArchiveOutlined />}>
+                    {t('ARCHIVE_COLLECTION')}
+                </OverflowMenuOption>
+            )}
+            <OverflowMenuOption
+                startIcon={<LogoutIcon />}
+                onClick={handleCollectionAction(
+                    CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM,
+                    false
+                )}>
+                {t('LEAVE_ALBUM')}
+            </OverflowMenuOption>
+        </>
     );
 }

apps/photos/src/components/Collections/CollectionOptions/index.tsx

@@ -3,14 +3,15 @@ import React, { useContext, useRef, useState } from 'react';
 import * as CollectionAPI from 'services/collectionService';
 import * as TrashService from 'services/trashService';
 import {
+    changeCollectionOrder,
     changeCollectionSortOrder,
     changeCollectionVisibility,
     downloadAllCollectionFiles,
     downloadHiddenFiles,
 } from 'utils/collection';
 import { SetCollectionNamerAttributes } from '../CollectionNamer';
 import { Collection } from 'types/collection';
-import { IsArchived } from 'utils/magicMetadata';
+import { isArchivedCollection, isPinnedCollection } from 'utils/magicMetadata';
 import { GalleryContext } from 'pages/gallery';
 import { logError } from 'utils/sentry';
 import { VISIBILITY_STATE } from 'types/magicMetadata';
@@ -53,6 +54,8 @@ export enum CollectionActions {
     LEAVE_SHARED_ALBUM,
     SHOW_SORT_ORDER_MENU,
     UPDATE_COLLECTION_SORT_ORDER,
+    PIN_ALBUM,
+    UNPIN_ALBUM,
 }
 
 const CollectionOptions = (props: CollectionOptionsProps) => {
@@ -132,6 +135,12 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
             case CollectionActions.UPDATE_COLLECTION_SORT_ORDER:
                 callback = updateCollectionSortOrder;
                 break;
+            case CollectionActions.PIN_ALBUM:
+                callback = pinAlbum;
+                break;
+            case CollectionActions.UNPIN_ALBUM:
+                callback = unPinAlbum;
+                break;
             default:
                 logError(
                     Error('invalid collection action '),
@@ -290,6 +299,14 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
         await changeCollectionSortOrder(activeCollection, asc);
     };
 
+    const pinAlbum = async () => {
+        await changeCollectionOrder(activeCollection, 1);
+    };
+
+    const unPinAlbum = async () => {
+        await changeCollectionOrder(activeCollection, 0);
+    };
+
     return (
         <HorizontalFlex sx={{ display: 'inline-flex', gap: '16px' }}>
             <QuickOptions
@@ -322,13 +339,17 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
                         downloadOptionText={t('DOWNLOAD_HIDDEN')}
                     />
                 ) : collectionSummaryType ===
-                  CollectionSummaryType.incomingShare ? (
+                      CollectionSummaryType.incomingShareViewer ||
+                  collectionSummaryType ===
+                      CollectionSummaryType.incomingShareCollaborator ? (
                     <SharedCollectionOption
+                        isArchived={isArchivedCollection(activeCollection)}
                         handleCollectionAction={handleCollectionAction}
                     />
                 ) : (
                     <AlbumCollectionOption
-                        IsArchived={IsArchived(activeCollection)}
+                        isArchived={isArchivedCollection(activeCollection)}
+                        isPinned={isPinnedCollection(activeCollection)}
                         handleCollectionAction={handleCollectionAction}
                     />
                 )}

apps/photos/src/components/Collections/CollectionSelector/AddCollectionButton.tsx

@@ -22,7 +22,7 @@ export default function AddCollectionButton({ showNextModal }: Iprops) {
         <CollectionCard
             collectionTile={AllCollectionTile}
             onClick={() => showNextModal()}
-            latestFile={null}>
+            coverFile={null}>
             <AllCollectionTileText>
                 {t('CREATE_COLLECTION')}
             </AllCollectionTileText>

apps/photos/src/components/Collections/CollectionSelector/CollectionCard.tsx

@@ -16,7 +16,7 @@ export default function CollectionSelectorCard({
     return (
         <CollectionCard
             collectionTile={AllCollectionTile}
-            latestFile={collectionSummary.latestFile}
+            coverFile={collectionSummary.coverFile}
             onClick={() => onCollectionClick(collectionSummary.id)}>
             <AllCollectionTileText>
                 <Typography>{collectionSummary.name}</Typography>

apps/photos/src/components/Collections/CollectionSelector/index.tsx

@@ -18,8 +18,11 @@ import {
     DUMMY_UNCATEGORIZED_SECTION,
 } from 'constants/collection';
 import { t } from 'i18next';
-import { isSelectAllowedCollection } from 'utils/collection';
 import { createUnCategorizedCollection } from 'services/collectionService';
+import {
+    isAddToAllowedCollection,
+    isMoveToAllowedCollection,
+} from 'utils/collection';
 
 export interface CollectionSelectorAttributes {
     callback: (collection: Collection) => void;
@@ -56,15 +59,19 @@ function CollectionSelector({
                 ?.filter(({ id, type }) => {
                     if (id === attributes.fromCollection) {
                         return false;
+                    } else if (
+                        attributes.intent === CollectionSelectorIntent.add
+                    ) {
+                        return isAddToAllowedCollection(type);
                     } else if (
                         attributes.intent === CollectionSelectorIntent.upload
                     ) {
                         return (
-                            isSelectAllowedCollection(type) ||
+                            isMoveToAllowedCollection(type) ||
                             type === CollectionSummaryType.uncategorized
                         );
                     } else {
-                        return isSelectAllowedCollection(type);
+                        return isMoveToAllowedCollection(type);
                     }
                 })
                 .sort((a, b) => {

apps/photos/src/components/Collections/CollectionShare/sharees/index.tsx

@@ -4,7 +4,7 @@ import { AppContext } from 'pages/_app';
 import React, { useContext } from 'react';
 import { t } from 'i18next';
 import { unshareCollection } from 'services/collectionService';
-import { Collection } from 'types/collection';
+import { Collection, CollectionUser } from 'types/collection';
 import ShareeRow from './row';
 
 interface Iprops {
@@ -15,7 +15,7 @@ export function CollectionShareSharees({ collection }: Iprops) {
     const appContext = useContext(AppContext);
     const galleryContext = useContext(GalleryContext);
 
-    const collectionUnshare = async (sharee) => {
+    const collectionUnshare = async (sharee: CollectionUser) => {
         try {
             appContext.startLoading();
             await unshareCollection(collection, sharee.email);

apps/photos/src/components/Collections/CollectionShare/sharees/row.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
 import { SpaceBetweenFlex } from 'components/Container';
-import { User } from 'types/user';
 import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
 import OverflowMenu from 'components/OverflowMenu/menu';
 
 import NotInterestedIcon from '@mui/icons-material/NotInterested';
 import { OverflowMenuOption } from 'components/OverflowMenu/option';
 import { t } from 'i18next';
+import { CollectionUser } from 'types/collection';
 
 interface IProps {
-    sharee: User;
-    collectionUnshare: (sharee: User) => void;
+    sharee: CollectionUser;
+    collectionUnshare: (sharee: CollectionUser) => void;
 }
 const ShareeRow = ({ sharee, collectionUnshare }: IProps) => {
     const handleClick = () => collectionUnshare(sharee);

apps/photos/src/components/PhotoFrame.tsx

@@ -45,7 +45,6 @@ interface Props {
     deletedFileIds?: Set<number>;
     setDeletedFileIds?: (value: Set<number>) => void;
     activeCollection: number;
-    isIncomingSharedCollection?: boolean;
     enableDownload?: boolean;
     fileToCollectionsMap: Map<number, number[]>;
     collectionNameMap: Map<number, string>;
@@ -61,7 +60,6 @@ const PhotoFrame = ({
     deletedFileIds,
     setDeletedFileIds,
     activeCollection,
-    isIncomingSharedCollection,
     enableDownload,
     fileToCollectionsMap,
     collectionNameMap,
@@ -529,7 +527,6 @@ const PhotoFrame = ({
                 favItemIds={favItemIds}
                 deletedFileIds={deletedFileIds}
                 setDeletedFileIds={setDeletedFileIds}
-                isIncomingSharedCollection={isIncomingSharedCollection}
                 isTrashCollection={activeCollection === TRASH_SECTION}
                 isHiddenCollection={activeCollection === HIDDEN_SECTION}
                 enableDownload={enableDownload}