π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos):align-filename-sort-metadata-with-mobile
Aswin Asok140753c144d7
diff --git a/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx b/web/apps/albums/src/public-album/page/PublicAlbumPage.tsxindex ed4d6f46fd..0cb68ca3d6 100644--- a/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx+++ b/web/apps/albums/src/public-album/page/PublicAlbumPage.tsx@@ -695,7 +695,7 @@ export default function PublicAlbumPage() {}const disableGrouping =- publicCollection?.pubMagicMetadata?.data.sortBy === "name";+ publicCollection?.pubMagicMetadata?.data.sortBy === "fileName";// Trip sections group by date/location, which would break filename order.const layout =disableGrouping && publicAlbumLayout === "trip"diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsxindex 105ae25de3..1ac1775670 100644--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx@@ -716,8 +716,9 @@ const CollectionHeaderOptions: React.FC<CollectionHeaderProps> = ({overflowMenuIconRef={overflowMenuIconRef}sortAsc={activeCollection?.pubMagicMetadata?.data.asc ?? false}sortBy={- activeCollection?.pubMagicMetadata?.data.sortBy === "name"- ? "name"+ activeCollection?.pubMagicMetadata?.data.sortBy ===+ "fileName"+ ? "fileName": "date"}onSort={changeSortOrder}@@ -1042,8 +1043,8 @@ function CollectionSortOrderMenu({const options: { by: CollectionSortBy; asc: boolean; label: string }[] = [{ by: "date", asc: false, label: t("newest_first") },{ by: "date", asc: true, label: t("oldest_first") },- { by: "name", asc: true, label: t("album_sort_name_asc") },- { by: "name", asc: false, label: t("album_sort_name_desc") },+ { by: "fileName", asc: true, label: t("album_sort_name_asc") },+ { by: "fileName", asc: false, label: t("album_sort_name_desc") },];return (<Menudiff --git a/web/apps/photos/src/components/gallery/reducer.ts b/web/apps/photos/src/components/gallery/reducer.tsindex 23d396df37..7dbd5822ae 100644--- a/web/apps/photos/src/components/gallery/reducer.ts+++ b/web/apps/photos/src/components/gallery/reducer.ts@@ -1762,7 +1762,7 @@ const sortAndUniqueFilteredFiles = ();const metadata = activeCollection?.pubMagicMetadata?.data;// The synced library is already in newest-first order.- return metadata?.asc || metadata?.sortBy === "name"+ return metadata?.asc || metadata?.sortBy === "fileName"? sortCollectionFiles(uniqueFiles, metadata): uniqueFiles;};diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 7f63cf7a99..3a3ee1ea55 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -2071,7 +2071,7 @@ const Page: React.FC = () => {state.searchSuggestion?.type == "clip" ||(!isInSearchMode &&activeCollection?.pubMagicMetadata?.data.sortBy ===- "name")+ "fileName")}enableSelect={true}selected={selected}diff --git a/web/apps/photos/tests/collection-sort-save.test.ts b/web/apps/photos/tests/collection-sort-save.test.tsindex 8266a42e9f..0d14f2607b 100644--- a/web/apps/photos/tests/collection-sort-save.test.ts+++ b/web/apps/photos/tests/collection-sort-save.test.ts@@ -39,7 +39,7 @@ const album = async () =>caption: "Our trip",coverID: 2,layout: "grouped",- sortBy: "name",+ sortBy: "fileName",futureField: "retain",},},@@ -63,10 +63,10 @@ async function savedMetadata(collection: Collection) {test("filename sorting is encrypted with the album key and preserves unrelated metadata", async () => {const collection = await album();- await updateCollectionSortOrder(collection, true, "name");+ await updateCollectionSortOrder(collection, true, "fileName");expect(await savedMetadata(collection)).toEqual({...collection.pubMagicMetadata!.data,- sortBy: "name",+ sortBy: "fileName",asc: true,});});@@ -86,7 +86,7 @@ test("a rejected save propagates the error and leaves the local album unchanged"const before = structuredClone(collection);fetchMock.mockResolvedValueOnce(new Response(null, { status: 409 }));await expect(- updateCollectionSortOrder(collection, false, "name"),+ updateCollectionSortOrder(collection, false, "fileName"),).rejects.toThrow();expect(collection).toEqual(before);});diff --git a/web/apps/photos/tests/collection-sort.test.ts b/web/apps/photos/tests/collection-sort.test.tsindex ca80877840..5f449e6754 100644--- a/web/apps/photos/tests/collection-sort.test.ts+++ b/web/apps/photos/tests/collection-sort.test.ts@@ -51,20 +51,20 @@ describe("album sorting", () => {data: { editedName: "img1.jpg" },};expect(- ids(sortCollectionFiles(files, { sortBy: "name", asc: true })),+ ids(sortCollectionFiles(files, { sortBy: "fileName", asc: true })),).toEqual([3, 2, 1]);expect(- ids(sortCollectionFiles(files, { sortBy: "name", asc: false })),+ ids(sortCollectionFiles(files, { sortBy: "fileName", asc: false })),).toEqual([1, 2, 3]);});test("equal filenames have a deterministic order across syncs", () => {const files = [photo(2, "a.jpg"), photo(1, "A.jpg")];expect(- ids(sortCollectionFiles(files, { sortBy: "name", asc: true })),+ ids(sortCollectionFiles(files, { sortBy: "fileName", asc: true })),).toEqual([1, 2]);expect(- sortCollectionFiles([...files].reverse(), { sortBy: "name" }),- ).toEqual(sortCollectionFiles(files, { sortBy: "name" }));+ sortCollectionFiles([...files].reverse(), { sortBy: "fileName" }),+ ).toEqual(sortCollectionFiles(files, { sortBy: "fileName" }));});test("future sort modes fall back to legacy date ordering", () => {const metadata = { sortBy: "future-mode", asc: true };@@ -75,7 +75,7 @@ describe("album sorting", () => {test("metadata round trips retain ordering and unrelated fields", () => {const metadata = {asc: true,- sortBy: "name",+ sortBy: "fileName",caption: "Trip",coverID: 1,futureField: "preserve",diff --git a/web/packages/media/collection-sort.ts b/web/packages/media/collection-sort.tsindex af274a1f8f..c9d7424762 100644--- a/web/packages/media/collection-sort.ts+++ b/web/packages/media/collection-sort.ts@@ -2,7 +2,7 @@ import type { CollectionPublicMagicMetadataData } from "./collection";import type { EnteFile } from "./file";import { fileCreationPhotoSortTime, fileFileName } from "./file-metadata";-export type CollectionSortBy = "date" | "name";+export type CollectionSortBy = "date" | "fileName";type SortMetadata = Pick<CollectionPublicMagicMetadataData, "sortBy" | "asc">;@@ -16,7 +16,7 @@ export const sortCollectionFiles = (metadata?: SortMetadata,): EnteFile[] => {// ponytail: reuse the date sorter so legacy ordering has one implementation.- if (metadata?.sortBy !== "name")+ if (metadata?.sortBy !== "fileName")return sortFiles([...files], metadata?.asc);const direction = metadata.asc ? 1 : -1;return [...files].sort(