π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[photos][web] Share one album list between sidebar and overview
AswinAsokefab9ade68f8
diff --git a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsxindex af982b2233..99b4846869 100644--- a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx+++ b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx@@ -12,6 +12,10 @@ import {type GalleryBarImplProps,} from "@/components/gallery/BarImpl";import { PeopleHeader } from "@/components/gallery/PeopleHeader";+import {+ filterAlbumSummaries,+ visibleAlbumFilters as getVisibleAlbumFilters,+} from "@/utils/album-filters";import { sortPeople } from "@/utils/people-sort";import { useModalVisibility } from "ente-base/components/utils/modal";import {@@ -30,6 +34,7 @@ import {sortCollectionSummaries,type CollectionsSortBy,type CollectionSummaries,+ type CollectionSummary,} from "ente-new/photos/services/collection-summary";import type { Person } from "ente-new/photos/services/ml/people";import { includes } from "ente-utils/type-guards";@@ -43,13 +48,14 @@ import {export type GalleryBarAndListHeaderProps = Omit<GalleryBarImplProps,| "collectionSummaries"+ | "visibleAlbumFilters"| "onSelectCollectionID"| "collectionsSortBy"| "onChangeCollectionsSortBy"| "onShowAllAlbums"| "onShowAllPeople"> & {- onCollectionsSortByChange: (by: CollectionsSortBy) => void;+ onAlbumSummariesChange: (albums: CollectionSummary[]) => void;shouldHide: boolean;barCollectionSummaries: CollectionSummaries;allPeople: Person[];@@ -90,7 +96,7 @@ export const GalleryBarAndListHeader: React.FC<people,peopleSortBy,onChangePeopleSortBy,- onCollectionsSortByChange,+ onAlbumSummariesChange,albumFilter,albumSearchQuery,onAlbumSearchQueryChange,@@ -141,10 +147,6 @@ export const GalleryBarAndListHeader: React.FC<const [collectionsSortBy, setCollectionsSortBy] =useCollectionsSortByLocalState("updation-time-desc");- useEffect(() => {- onCollectionsSortByChange(collectionsSortBy);- }, [collectionsSortBy, onCollectionsSortByChange]);-const sortedCollectionSummaries = useMemo(() =>sortCollectionSummaries(@@ -153,6 +155,43 @@ export const GalleryBarAndListHeader: React.FC<).sort((a, b) => b.sortPriority - a.sortPriority),[collectionsSortBy, toShowCollectionSummaries],);+ const eligibleCollectionSummaries = useMemo(+ () =>+ sortedCollectionSummaries.filter(+ (cs) =>+ cs.id !== uncategorizedCollectionSummaryID &&+ cs.id !== PseudoCollectionID.hiddenItems &&+ cs.id !== PseudoCollectionID.archiveItems &&+ cs.id !== PseudoCollectionID.trash &&+ (mode == "albums"+ ? !cs.attributes.has("system") ||+ (cs.id > 0 && cs.type == "uncategorized")+ : !cs.attributes.has("hideFromCollectionBar") &&+ !cs.attributes.has("quickLink")),+ ),+ [sortedCollectionSummaries, uncategorizedCollectionSummaryID, mode],+ );+ const visibleAlbumFilters = useMemo(+ () => getVisibleAlbumFilters(eligibleCollectionSummaries),+ [eligibleCollectionSummaries],+ );+ const visibleCollectionSummaries = useMemo(+ () =>+ mode == "albums"+ ? filterAlbumSummaries(+ eligibleCollectionSummaries,+ albumFilter,+ albumSearchQuery,+ )+ : eligibleCollectionSummaries,+ [eligibleCollectionSummaries, mode, albumFilter, albumSearchQuery],+ );++ useEffect(() => {+ if (mode == "albums")+ onAlbumSummariesChange(visibleCollectionSummaries);+ }, [mode, visibleCollectionSummaries, onAlbumSummariesChange]);+const sortedPeople = useMemo(() => sortPeople(people, peopleSortBy),[people, peopleSortBy],@@ -291,18 +330,8 @@ export const GalleryBarAndListHeader: React.FC<onChangePeopleSortBy={onChangePeopleSortBy}onShowAllAlbums={showAllAlbums}onShowAllPeople={showAllPeople}- collectionSummaries={sortedCollectionSummaries.filter(- (cs) =>- cs.id !== uncategorizedCollectionSummaryID &&- cs.id !== PseudoCollectionID.hiddenItems &&- cs.id !== PseudoCollectionID.archiveItems &&- cs.id !== PseudoCollectionID.trash &&- (mode == "albums"- ? !cs.attributes.has("system") ||- (cs.id > 0 && cs.type == "uncategorized")- : !cs.attributes.has("hideFromCollectionBar") &&- !cs.attributes.has("quickLink")),- )}+ collectionSummaries={visibleCollectionSummaries}+ visibleAlbumFilters={visibleAlbumFilters}/><AllAlbumsdiff --git a/web/apps/photos/src/components/gallery/BarImpl.tsx b/web/apps/photos/src/components/gallery/BarImpl.tsxindex b2459fdc33..c135ff586c 100644--- a/web/apps/photos/src/components/gallery/BarImpl.tsx+++ b/web/apps/photos/src/components/gallery/BarImpl.tsx@@ -1,10 +1,6 @@import { CollectionsSortOptions } from "@/components/CollectionsSortOptions";import { PeopleSortOptions } from "@/components/PeopleSortOptions";-import {- filterAlbumSummaries,- visibleAlbumFilters as getVisibleAlbumFilters,- type AlbumFilter,-} from "@/utils/album-filters";+import type { AlbumFilter, albumFilters } from "@/utils/album-filters";import type { PeopleSortBy } from "@/utils/people-sort";import {Delete02Icon,@@ -76,6 +72,7 @@ export interface GalleryBarImplProps extends GalleryBarPresentationProps {onAlbumSearchQueryChange: (query: string) => void;onShowAlbumOverview: (filter: AlbumFilter) => void;collectionSummaries: CollectionSummary[];+ visibleAlbumFilters: typeof albumFilters;normalCollectionSummaries: CollectionSummaries;uncategorizedCollectionSummaryID: number;onShowCollectionSummary: (@@ -102,6 +99,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({onAlbumSearchQueryChange,onShowAlbumOverview,collectionSummaries,+ visibleAlbumFilters,normalCollectionSummaries,uncategorizedCollectionSummaryID,onShowCollectionSummary,@@ -149,22 +147,6 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({useEffect(() => {setExpandedAlbumFilter(albumFilter);}, [albumFilter]);- const visibleAlbumFilters = useMemo(- () => getVisibleAlbumFilters(collectionSummaries),- [collectionSummaries],- );- const visibleCollectionSummaries = useMemo(- () =>- mode == "albums"- ? filterAlbumSummaries(- collectionSummaries,- albumFilter,- albumSearchQuery,- )- : collectionSummaries,- [mode, collectionSummaries, albumFilter, albumSearchQuery],- );-useEffect(() => {setPeopleSearchQuery("");}, [mode]);@@ -189,7 +171,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({case "albums":case "hidden-albums":case "archive-albums":- i = visibleCollectionSummaries.findIndex(+ i = collectionSummaries.findIndex(({ id }) => id == activeCollectionID,);break;@@ -202,7 +184,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({if (i != -1) listRef.current.scrollToItem(i, "smart");}, [mode,- visibleCollectionSummaries,+ collectionSummaries,activeCollectionID,matchingPeople,activePerson,@@ -220,7 +202,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({mode == "archive-albums"? {type: "collections",- collectionSummaries: visibleCollectionSummaries,+ collectionSummaries: collectionSummaries,indented: mode == "albums",activeCollectionID: activeCollectionID!,onSelectCollectionID,@@ -233,7 +215,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({},[mode,- visibleCollectionSummaries,+ collectionSummaries,activeCollectionID,onSelectCollectionID,matchingPeople,diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 6740cdc06b..7c4d5eb988 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -61,7 +61,6 @@ import exportService from "@/services/export";import { processPendingAlbumJoin } from "@/services/join-album";import {albumFilters,- filterAlbumSummaries,visibleAlbumFilters,type AlbumFilter,} from "@/utils/album-filters";@@ -130,8 +129,7 @@ import {import {haveOnlySystemCollections,PseudoCollectionID,- sortCollectionSummaries,- type CollectionsSortBy,+ type CollectionSummary,} from "ente-new/photos/services/collection-summary";import {updateFilesLocation,@@ -224,8 +222,9 @@ const Page: React.FC = () => {});const [albumFilter, setAlbumFilter] = useState<AlbumFilter>("ente");const [albumSearchQuery, setAlbumSearchQuery] = useState("");- const [collectionsSortBy, setCollectionsSortBy] =- useState<CollectionsSortBy>("updation-time-desc");+ const [overviewAlbums, setOverviewAlbums] = useState<CollectionSummary[]>(+ [],+ );const createForAlbumOverview = useRef(false);const [blockingLoad, setBlockingLoad] = useState(false);const [peopleSortBy, setPeopleSortBy] =@@ -571,26 +570,6 @@ const Page: React.FC = () => {? state.archivedCollectionSummaries: state.normalCollectionSummaries;- const overviewAlbums = useMemo(() => {- const sorted = sortCollectionSummaries(- [...normalCollectionSummaries.values()].filter(- (cs) => !cs.attributes.has("system"),- ),- collectionsSortBy,- ).sort((a, b) => b.sortPriority - a.sortPriority);- return filterAlbumSummaries(- sorted,- overviewFilter ?? albumFilter,- albumSearchQuery,- );- }, [- normalCollectionSummaries,- collectionsSortBy,- overviewFilter,- albumFilter,- albumSearchQuery,- ]);-useEffect(() => {if (barMode != "albums") setAlbumSearchQuery("");}, [barMode]);@@ -2126,7 +2105,7 @@ const Page: React.FC = () => {albumSearchQuery,onAlbumSearchQueryChange: setAlbumSearchQuery,onShowAlbumOverview: handleShowAlbumOverview,- onCollectionsSortByChange: setCollectionsSortBy,+ onAlbumSummariesChange: setOverviewAlbums,peopleSortBy,onChangePeopleSortBy: setPeopleSortBy,setFileListHeader,