From 47dc5d3db3daa6ebd978655b59af95325399b9f8 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 21 Jun 2023 08:49:25 +0530 Subject: [PATCH 01/19] removed outgoingShare from SELECT_NOT_ALLOWED_COLLECTION list --- apps/photos/src/constants/collection.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/photos/src/constants/collection.ts b/apps/photos/src/constants/collection.ts index 9da83fa4c..e2e106a03 100644 --- a/apps/photos/src/constants/collection.ts +++ b/apps/photos/src/constants/collection.ts @@ -61,7 +61,6 @@ export const SELECT_NOT_ALLOWED_COLLECTION = new Set([ CollectionSummaryType.all, CollectionSummaryType.archive, CollectionSummaryType.incomingShare, - CollectionSummaryType.outgoingShare, CollectionSummaryType.trash, CollectionSummaryType.uncategorized, CollectionSummaryType.hidden, From 1c1a17587bd83662db00c459ae5fc0392f5eab84 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 30 Jun 2023 08:47:19 +0000 Subject: [PATCH 02/19] New Crowdin translations by GitHub Action --- apps/photos/public/locales/de/translation.json | 9 ++++----- apps/photos/public/locales/es/translation.json | 9 ++++----- apps/photos/public/locales/fa/translation.json | 9 ++++----- apps/photos/public/locales/fi/translation.json | 9 ++++----- apps/photos/public/locales/fr/translation.json | 9 ++++----- apps/photos/public/locales/it/translation.json | 9 ++++----- apps/photos/public/locales/nl/translation.json | 9 ++++----- apps/photos/public/locales/pt/translation.json | 9 ++++----- apps/photos/public/locales/ru/translation.json | 9 ++++----- apps/photos/public/locales/tr/translation.json | 9 ++++----- apps/photos/public/locales/zh/translation.json | 9 ++++----- 11 files changed, 44 insertions(+), 55 deletions(-) diff --git a/apps/photos/public/locales/de/translation.json b/apps/photos/public/locales/de/translation.json index 9338e8393..244e19a97 100644 --- a/apps/photos/public/locales/de/translation.json +++ b/apps/photos/public/locales/de/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/es/translation.json b/apps/photos/public/locales/es/translation.json index 0ad60d303..6a8947db6 100644 --- a/apps/photos/public/locales/es/translation.json +++ b/apps/photos/public/locales/es/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Detalles", "VIEW_EXIF": "Ver todos los datos de EXIF", "NO_EXIF": "No hay datos EXIF", diff --git a/apps/photos/public/locales/fa/translation.json b/apps/photos/public/locales/fa/translation.json index ee7296875..4c138ed41 100644 --- a/apps/photos/public/locales/fa/translation.json +++ b/apps/photos/public/locales/fa/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fi/translation.json b/apps/photos/public/locales/fi/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/fi/translation.json +++ b/apps/photos/public/locales/fi/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fr/translation.json b/apps/photos/public/locales/fr/translation.json index e132cb9ed..7e47e36e2 100644 --- a/apps/photos/public/locales/fr/translation.json +++ b/apps/photos/public/locales/fr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Détails", "VIEW_EXIF": "Visualiser toutes les données EXIF", "NO_EXIF": "Aucune donnée EXIF", diff --git a/apps/photos/public/locales/it/translation.json b/apps/photos/public/locales/it/translation.json index d178f7d53..2c47acf78 100644 --- a/apps/photos/public/locales/it/translation.json +++ b/apps/photos/public/locales/it/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/nl/translation.json b/apps/photos/public/locales/nl/translation.json index d15c6d794..ccf4a5ad1 100644 --- a/apps/photos/public/locales/nl/translation.json +++ b/apps/photos/public/locales/nl/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Details", "VIEW_EXIF": "Bekijk alle EXIF gegevens", "NO_EXIF": "Geen EXIF gegevens", diff --git a/apps/photos/public/locales/pt/translation.json b/apps/photos/public/locales/pt/translation.json index 93c6ecebe..dcc8d9d2a 100644 --- a/apps/photos/public/locales/pt/translation.json +++ b/apps/photos/public/locales/pt/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/ru/translation.json b/apps/photos/public/locales/ru/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/ru/translation.json +++ b/apps/photos/public/locales/ru/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/tr/translation.json b/apps/photos/public/locales/tr/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/tr/translation.json +++ b/apps/photos/public/locales/tr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/zh/translation.json b/apps/photos/public/locales/zh/translation.json index b68848d3e..a6737c360 100644 --- a/apps/photos/public/locales/zh/translation.json +++ b/apps/photos/public/locales/zh/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "详情", "VIEW_EXIF": "查看所有 EXIF 数据", "NO_EXIF": "无 EXIF 数据", From 81d51be1fc46644eb8d4fdfaaaf4fcb94925eed2 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 30 Jun 2023 15:07:14 +0530 Subject: [PATCH 03/19] remove coep and coop from _headers --- apps/photos/next.config.js | 2 -- apps/photos/public/_headers | 2 -- 2 files changed, 4 deletions(-) diff --git a/apps/photos/next.config.js b/apps/photos/next.config.js index 28441b95d..3d4340556 100644 --- a/apps/photos/next.config.js +++ b/apps/photos/next.config.js @@ -9,7 +9,6 @@ const { getGitSha, convertToNextHeaderFormat, buildCSPHeader, - COOP_COEP_HEADERS, WEB_SECURITY_HEADERS, CSP_DIRECTIVES, ALL_ROUTES, @@ -64,7 +63,6 @@ module.exports = (phase) => // Apply these headers to all routes in your application.... source: ALL_ROUTES, headers: convertToNextHeaderFormat({ - ...COOP_COEP_HEADERS, ...WEB_SECURITY_HEADERS, ...buildCSPHeader(CSP_DIRECTIVES), }), diff --git a/apps/photos/public/_headers b/apps/photos/public/_headers index caa299ea2..72dc5bb5c 100644 --- a/apps/photos/public/_headers +++ b/apps/photos/public/_headers @@ -1,7 +1,5 @@ /* Cache-Control: no-store, must-revalidate - Cross-Origin-Embedder-Policy: require-corp - Cross-Origin-Opener-Policy: same-origin Strict-Transport-Security: max-age=63072000 X-Content-Type-Options: nosniff X-Download-Options: noopen From 42ee1478da1d814506cc97f3496d4cd8da2e5d4f Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Sun, 2 Jul 2023 01:38:11 +0000 Subject: [PATCH 04/19] New Crowdin translations by GitHub Action --- apps/photos/public/locales/de/translation.json | 9 ++++----- apps/photos/public/locales/es/translation.json | 9 ++++----- apps/photos/public/locales/fa/translation.json | 9 ++++----- apps/photos/public/locales/fi/translation.json | 9 ++++----- apps/photos/public/locales/fr/translation.json | 9 ++++----- apps/photos/public/locales/it/translation.json | 9 ++++----- apps/photos/public/locales/nl/translation.json | 9 ++++----- apps/photos/public/locales/pt/translation.json | 9 ++++----- apps/photos/public/locales/ru/translation.json | 9 ++++----- apps/photos/public/locales/tr/translation.json | 9 ++++----- apps/photos/public/locales/zh/translation.json | 9 ++++----- 11 files changed, 44 insertions(+), 55 deletions(-) diff --git a/apps/photos/public/locales/de/translation.json b/apps/photos/public/locales/de/translation.json index 9338e8393..244e19a97 100644 --- a/apps/photos/public/locales/de/translation.json +++ b/apps/photos/public/locales/de/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/es/translation.json b/apps/photos/public/locales/es/translation.json index 0ad60d303..6a8947db6 100644 --- a/apps/photos/public/locales/es/translation.json +++ b/apps/photos/public/locales/es/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Detalles", "VIEW_EXIF": "Ver todos los datos de EXIF", "NO_EXIF": "No hay datos EXIF", diff --git a/apps/photos/public/locales/fa/translation.json b/apps/photos/public/locales/fa/translation.json index ee7296875..4c138ed41 100644 --- a/apps/photos/public/locales/fa/translation.json +++ b/apps/photos/public/locales/fa/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fi/translation.json b/apps/photos/public/locales/fi/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/fi/translation.json +++ b/apps/photos/public/locales/fi/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fr/translation.json b/apps/photos/public/locales/fr/translation.json index e132cb9ed..7e47e36e2 100644 --- a/apps/photos/public/locales/fr/translation.json +++ b/apps/photos/public/locales/fr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Détails", "VIEW_EXIF": "Visualiser toutes les données EXIF", "NO_EXIF": "Aucune donnée EXIF", diff --git a/apps/photos/public/locales/it/translation.json b/apps/photos/public/locales/it/translation.json index d178f7d53..2c47acf78 100644 --- a/apps/photos/public/locales/it/translation.json +++ b/apps/photos/public/locales/it/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/nl/translation.json b/apps/photos/public/locales/nl/translation.json index d15c6d794..ccf4a5ad1 100644 --- a/apps/photos/public/locales/nl/translation.json +++ b/apps/photos/public/locales/nl/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Details", "VIEW_EXIF": "Bekijk alle EXIF gegevens", "NO_EXIF": "Geen EXIF gegevens", diff --git a/apps/photos/public/locales/pt/translation.json b/apps/photos/public/locales/pt/translation.json index 93c6ecebe..dcc8d9d2a 100644 --- a/apps/photos/public/locales/pt/translation.json +++ b/apps/photos/public/locales/pt/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/ru/translation.json b/apps/photos/public/locales/ru/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/ru/translation.json +++ b/apps/photos/public/locales/ru/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/tr/translation.json b/apps/photos/public/locales/tr/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/tr/translation.json +++ b/apps/photos/public/locales/tr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/zh/translation.json b/apps/photos/public/locales/zh/translation.json index b68848d3e..a6737c360 100644 --- a/apps/photos/public/locales/zh/translation.json +++ b/apps/photos/public/locales/zh/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "详情", "VIEW_EXIF": "查看所有 EXIF 数据", "NO_EXIF": "无 EXIF 数据", From 283f76b20131515f5e632f7bcb85f5cae43be8cd Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Mon, 3 Jul 2023 01:26:41 +0000 Subject: [PATCH 05/19] New Crowdin translations by GitHub Action --- apps/photos/public/locales/de/translation.json | 9 ++++----- apps/photos/public/locales/es/translation.json | 9 ++++----- apps/photos/public/locales/fa/translation.json | 9 ++++----- apps/photos/public/locales/fi/translation.json | 9 ++++----- apps/photos/public/locales/fr/translation.json | 9 ++++----- apps/photos/public/locales/it/translation.json | 9 ++++----- apps/photos/public/locales/nl/translation.json | 9 ++++----- apps/photos/public/locales/pt/translation.json | 9 ++++----- apps/photos/public/locales/ru/translation.json | 9 ++++----- apps/photos/public/locales/tr/translation.json | 9 ++++----- apps/photos/public/locales/zh/translation.json | 9 ++++----- 11 files changed, 44 insertions(+), 55 deletions(-) diff --git a/apps/photos/public/locales/de/translation.json b/apps/photos/public/locales/de/translation.json index 9338e8393..244e19a97 100644 --- a/apps/photos/public/locales/de/translation.json +++ b/apps/photos/public/locales/de/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/es/translation.json b/apps/photos/public/locales/es/translation.json index 0ad60d303..6a8947db6 100644 --- a/apps/photos/public/locales/es/translation.json +++ b/apps/photos/public/locales/es/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Detalles", "VIEW_EXIF": "Ver todos los datos de EXIF", "NO_EXIF": "No hay datos EXIF", diff --git a/apps/photos/public/locales/fa/translation.json b/apps/photos/public/locales/fa/translation.json index ee7296875..4c138ed41 100644 --- a/apps/photos/public/locales/fa/translation.json +++ b/apps/photos/public/locales/fa/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fi/translation.json b/apps/photos/public/locales/fi/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/fi/translation.json +++ b/apps/photos/public/locales/fi/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fr/translation.json b/apps/photos/public/locales/fr/translation.json index e132cb9ed..7e47e36e2 100644 --- a/apps/photos/public/locales/fr/translation.json +++ b/apps/photos/public/locales/fr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Détails", "VIEW_EXIF": "Visualiser toutes les données EXIF", "NO_EXIF": "Aucune donnée EXIF", diff --git a/apps/photos/public/locales/it/translation.json b/apps/photos/public/locales/it/translation.json index d178f7d53..2c47acf78 100644 --- a/apps/photos/public/locales/it/translation.json +++ b/apps/photos/public/locales/it/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/nl/translation.json b/apps/photos/public/locales/nl/translation.json index d15c6d794..ccf4a5ad1 100644 --- a/apps/photos/public/locales/nl/translation.json +++ b/apps/photos/public/locales/nl/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Details", "VIEW_EXIF": "Bekijk alle EXIF gegevens", "NO_EXIF": "Geen EXIF gegevens", diff --git a/apps/photos/public/locales/pt/translation.json b/apps/photos/public/locales/pt/translation.json index 93c6ecebe..dcc8d9d2a 100644 --- a/apps/photos/public/locales/pt/translation.json +++ b/apps/photos/public/locales/pt/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/ru/translation.json b/apps/photos/public/locales/ru/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/ru/translation.json +++ b/apps/photos/public/locales/ru/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/tr/translation.json b/apps/photos/public/locales/tr/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/tr/translation.json +++ b/apps/photos/public/locales/tr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/zh/translation.json b/apps/photos/public/locales/zh/translation.json index b68848d3e..a6737c360 100644 --- a/apps/photos/public/locales/zh/translation.json +++ b/apps/photos/public/locales/zh/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "详情", "VIEW_EXIF": "查看所有 EXIF 数据", "NO_EXIF": "无 EXIF 数据", From fe4658202c48149fb8996ff9851777edcf7fca6f Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Tue, 4 Jul 2023 01:25:24 +0000 Subject: [PATCH 06/19] New Crowdin translations by GitHub Action --- apps/photos/public/locales/de/translation.json | 9 ++++----- apps/photos/public/locales/es/translation.json | 9 ++++----- apps/photos/public/locales/fa/translation.json | 9 ++++----- apps/photos/public/locales/fi/translation.json | 9 ++++----- apps/photos/public/locales/fr/translation.json | 9 ++++----- apps/photos/public/locales/it/translation.json | 9 ++++----- apps/photos/public/locales/nl/translation.json | 9 ++++----- apps/photos/public/locales/pt/translation.json | 9 ++++----- apps/photos/public/locales/ru/translation.json | 9 ++++----- apps/photos/public/locales/tr/translation.json | 9 ++++----- apps/photos/public/locales/zh/translation.json | 9 ++++----- 11 files changed, 44 insertions(+), 55 deletions(-) diff --git a/apps/photos/public/locales/de/translation.json b/apps/photos/public/locales/de/translation.json index 9338e8393..244e19a97 100644 --- a/apps/photos/public/locales/de/translation.json +++ b/apps/photos/public/locales/de/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/es/translation.json b/apps/photos/public/locales/es/translation.json index 0ad60d303..6a8947db6 100644 --- a/apps/photos/public/locales/es/translation.json +++ b/apps/photos/public/locales/es/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Detalles", "VIEW_EXIF": "Ver todos los datos de EXIF", "NO_EXIF": "No hay datos EXIF", diff --git a/apps/photos/public/locales/fa/translation.json b/apps/photos/public/locales/fa/translation.json index ee7296875..4c138ed41 100644 --- a/apps/photos/public/locales/fa/translation.json +++ b/apps/photos/public/locales/fa/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fi/translation.json b/apps/photos/public/locales/fi/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/fi/translation.json +++ b/apps/photos/public/locales/fi/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/fr/translation.json b/apps/photos/public/locales/fr/translation.json index e132cb9ed..7e47e36e2 100644 --- a/apps/photos/public/locales/fr/translation.json +++ b/apps/photos/public/locales/fr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Détails", "VIEW_EXIF": "Visualiser toutes les données EXIF", "NO_EXIF": "Aucune donnée EXIF", diff --git a/apps/photos/public/locales/it/translation.json b/apps/photos/public/locales/it/translation.json index d178f7d53..2c47acf78 100644 --- a/apps/photos/public/locales/it/translation.json +++ b/apps/photos/public/locales/it/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/nl/translation.json b/apps/photos/public/locales/nl/translation.json index d15c6d794..ccf4a5ad1 100644 --- a/apps/photos/public/locales/nl/translation.json +++ b/apps/photos/public/locales/nl/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "Details", "VIEW_EXIF": "Bekijk alle EXIF gegevens", "NO_EXIF": "Geen EXIF gegevens", diff --git a/apps/photos/public/locales/pt/translation.json b/apps/photos/public/locales/pt/translation.json index 93c6ecebe..dcc8d9d2a 100644 --- a/apps/photos/public/locales/pt/translation.json +++ b/apps/photos/public/locales/pt/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/ru/translation.json b/apps/photos/public/locales/ru/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/ru/translation.json +++ b/apps/photos/public/locales/ru/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/tr/translation.json b/apps/photos/public/locales/tr/translation.json index 57d1a2e8c..ea08e6ed8 100644 --- a/apps/photos/public/locales/tr/translation.json +++ b/apps/photos/public/locales/tr/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "", "VIEW_EXIF": "", "NO_EXIF": "", diff --git a/apps/photos/public/locales/zh/translation.json b/apps/photos/public/locales/zh/translation.json index b68848d3e..a6737c360 100644 --- a/apps/photos/public/locales/zh/translation.json +++ b/apps/photos/public/locales/zh/translation.json @@ -235,12 +235,11 @@ "MAP": "", "MAP_SETTINGS": "", "ENABLE_MAPS": "", + "ENABLE_MAP": "", "DISABLE_MAPS": "", - "ENABLE_MAP_DESCRIPTION_1": "", - "ENABLE_MAP_DESCRIPTION_2": "", - "ENABLE_MAP_DESCRIPTION_3": "", - "DISABLE_MAP_DESCRIPTION_1": "", - "DISABLE_MAP_DESCRIPTION_2": "", + "ENABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP_DESCRIPTION": "", + "DISABLE_MAP": "", "DETAILS": "详情", "VIEW_EXIF": "查看所有 EXIF 数据", "NO_EXIF": "无 EXIF 数据", From ce289e8f2f83211fb2a83cc0befbbc6527a37375 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Tue, 4 Jul 2023 10:32:18 +0530 Subject: [PATCH 07/19] Fix totalStorage value --- .../SubscriptionCard/contentOverlay/family/index.tsx | 12 ++++-------- .../contentOverlay/individual/index.tsx | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/family/index.tsx b/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/family/index.tsx index 92c28f734..14cd231fe 100644 --- a/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/family/index.tsx +++ b/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/family/index.tsx @@ -18,21 +18,17 @@ export function FamilySubscriptionCardContent({ userDetails }: Iprops) { return userDetails.usage; } }, [userDetails]); + const totalStorage = + userDetails.familyData.storage + (userDetails.storageBonus ?? 0); return ( <> - + ); diff --git a/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/individual/index.tsx b/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/individual/index.tsx index be43c39b4..6a8f9a70e 100644 --- a/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/individual/index.tsx +++ b/apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/individual/index.tsx @@ -8,19 +8,15 @@ interface Iprops { } export function IndividualSubscriptionCardContent({ userDetails }: Iprops) { + const totalStorage = + userDetails.subscription.storage + (userDetails.storageBonus ?? 0); return ( <> - + ); From 677d94380412a42fc7c273890e2f549c994cca5c Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 13:24:43 +0530 Subject: [PATCH 08/19] fix function name casing --- .../CollectionOptions/AlbumCollectionOption.tsx | 6 +++--- .../components/Collections/CollectionOptions/index.tsx | 4 ++-- apps/photos/src/pages/gallery/index.tsx | 4 ++-- apps/photos/src/services/collectionService.ts | 8 ++++---- apps/photos/src/utils/collection/index.ts | 4 ++-- apps/photos/src/utils/file/index.ts | 4 ++-- apps/photos/src/utils/magicMetadata/index.ts | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx b/apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx index 0204398c4..664c2454c 100644 --- a/apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx +++ b/apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx @@ -11,7 +11,7 @@ import SortIcon from '@mui/icons-material/Sort'; import { t } from 'i18next'; interface Iprops { - IsArchived: boolean; + isArchived: boolean; handleCollectionAction: ( action: CollectionActions, loader?: boolean @@ -19,7 +19,7 @@ interface Iprops { } export function AlbumCollectionOption({ - IsArchived, + isArchived, handleCollectionAction, }: Iprops) { return ( @@ -40,7 +40,7 @@ export function AlbumCollectionOption({ startIcon={}> {t('SORT_BY')} - {IsArchived ? ( + {isArchived ? ( { /> ) : ( )} diff --git a/apps/photos/src/pages/gallery/index.tsx b/apps/photos/src/pages/gallery/index.tsx index 99de66625..0d83fa9f4 100644 --- a/apps/photos/src/pages/gallery/index.tsx +++ b/apps/photos/src/pages/gallery/index.tsx @@ -119,7 +119,7 @@ import ExportModal from 'components/ExportModal'; import GalleryEmptyState from 'components/GalleryEmptyState'; import AuthenticateUserModal from 'components/AuthenticateUserModal'; import useMemoSingleThreaded from 'hooks/useMemoSingleThreaded'; -import { IsArchived } from 'utils/magicMetadata'; +import { isArchived } from 'utils/magicMetadata'; import { isSameDayAnyYear, isInsideLocationTag } from 'utils/search'; import { getSessionExpiredMessage } from 'utils/ui'; import { syncEntities } from 'services/entityService'; @@ -497,7 +497,7 @@ export default function Gallery() { } // Archived files can only be seen in archive section or their respective collection - if (IsArchived(item)) { + if (isArchived(item)) { if ( activeCollection === ARCHIVE_SECTION || activeCollection === item.collectionID diff --git a/apps/photos/src/services/collectionService.ts b/apps/photos/src/services/collectionService.ts index 57797a435..fff50682f 100644 --- a/apps/photos/src/services/collectionService.ts +++ b/apps/photos/src/services/collectionService.ts @@ -43,7 +43,7 @@ import { HIDDEN_SECTION, } from 'constants/collection'; import { SUB_TYPE, UpdateMagicMetadataRequest } from 'types/magicMetadata'; -import { IsArchived, updateMagicMetadata } from 'utils/magicMetadata'; +import { isArchived, updateMagicMetadata } from 'utils/magicMetadata'; import { User } from 'types/user'; import { isQuickLinkCollection, @@ -289,7 +289,7 @@ export const getCollectionLatestFiles = ( } if ( !latestFiles.has(ALL_SECTION) && - !IsArchived(file) && + !isArchived(file) && file.ownerID === user.id && !archivedCollections.has(file.collectionID) ) { @@ -1030,7 +1030,7 @@ export async function getCollectionSummaries( ? CollectionSummaryType.outgoingShare : isSharedOnlyViaLink(collection) ? CollectionSummaryType.sharedOnlyViaLink - : IsArchived(collection) + : isArchived(collection) ? CollectionSummaryType.archived : isHiddenCollection(collection) ? CollectionSummaryType.hidden @@ -1107,7 +1107,7 @@ function getCollectionsFileCount( for (const file of files) { if (isSharedFile(user, file)) { continue; - } else if (IsArchived(file)) { + } else if (isArchived(file)) { uniqueArchivedFileIDs.add(file.id); } else if (!archivedCollections.has(file.collectionID)) { uniqueAllSectionFileIDs.add(file.id); diff --git a/apps/photos/src/utils/collection/index.ts b/apps/photos/src/utils/collection/index.ts index 7dbc9a0fd..70b8cad14 100644 --- a/apps/photos/src/utils/collection/index.ts +++ b/apps/photos/src/utils/collection/index.ts @@ -32,7 +32,7 @@ import { } from 'constants/collection'; import { getUnixTimeInMicroSecondsWithDelta } from 'utils/time'; import { SUB_TYPE, VISIBILITY_STATE } from 'types/magicMetadata'; -import { IsArchived, updateMagicMetadata } from 'utils/magicMetadata'; +import { isArchived, updateMagicMetadata } from 'utils/magicMetadata'; import { getAlbumsURL } from 'utils/common/apiUtil'; import bs58 from 'bs58'; import { t } from 'i18next'; @@ -224,7 +224,7 @@ export const changeCollectionSubType = async ( export const getArchivedCollections = (collections: Collection[]) => { return new Set( - collections.filter(IsArchived).map((collection) => collection.id) + collections.filter(isArchived).map((collection) => collection.id) ); }; diff --git a/apps/photos/src/utils/file/index.ts b/apps/photos/src/utils/file/index.ts index d4e2a4335..70ddc69a8 100644 --- a/apps/photos/src/utils/file/index.ts +++ b/apps/photos/src/utils/file/index.ts @@ -28,7 +28,7 @@ import PublicCollectionDownloadManager from 'services/publicCollectionDownloadMa import heicConversionService from 'services/heicConversionService'; import * as ffmpegService from 'services/ffmpeg/ffmpegService'; import { VISIBILITY_STATE } from 'types/magicMetadata'; -import { IsArchived, updateMagicMetadata } from 'utils/magicMetadata'; +import { isArchived, updateMagicMetadata } from 'utils/magicMetadata'; import { addLocalLog, addLogLine } from 'utils/logging'; import { CustomError } from 'utils/error'; @@ -576,7 +576,7 @@ export const isImageOrVideo = (fileType: FILE_TYPE) => [FILE_TYPE.IMAGE, FILE_TYPE.VIDEO].includes(fileType); export const getArchivedFiles = (files: EnteFile[]) => { - return files.filter(IsArchived).map((file) => file.id); + return files.filter(isArchived).map((file) => file.id); }; export const createTypedObjectURL = async (blob: Blob, fileName: string) => { diff --git a/apps/photos/src/utils/magicMetadata/index.ts b/apps/photos/src/utils/magicMetadata/index.ts index 457a451db..6e20b0ffb 100644 --- a/apps/photos/src/utils/magicMetadata/index.ts +++ b/apps/photos/src/utils/magicMetadata/index.ts @@ -3,7 +3,7 @@ import { EnteFile } from 'types/file'; import { MagicMetadataCore, VISIBILITY_STATE } from 'types/magicMetadata'; import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker'; -export function IsArchived(item: Collection | EnteFile) { +export function isArchived(item: Collection | EnteFile) { if ( !item || !item.magicMetadata || From 8d70cdce2427ba119221d8e44a8d49104482f86c Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 13:56:32 +0530 Subject: [PATCH 09/19] add archive/unarchive option to shared album --- .../SharedCollectionOption.tsx | 41 +++++++++++++++---- .../Collections/CollectionOptions/index.tsx | 1 + 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/apps/photos/src/components/Collections/CollectionOptions/SharedCollectionOption.tsx b/apps/photos/src/components/Collections/CollectionOptions/SharedCollectionOption.tsx index f97e36803..7b0fd05f9 100644 --- a/apps/photos/src/components/Collections/CollectionOptions/SharedCollectionOption.tsx +++ b/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; } -export function SharedCollectionOption({ handleCollectionAction }: Iprops) { +export function SharedCollectionOption({ + isArchived, + handleCollectionAction, +}: Iprops) { return ( - } - onClick={handleCollectionAction( - CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM, - false - )}> - {t('LEAVE_ALBUM')} - + <> + {isArchived ? ( + }> + {t('UNARCHIVE_COLLECTION')} + + ) : ( + }> + {t('ARCHIVE_COLLECTION')} + + )} + } + onClick={handleCollectionAction( + CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM, + false + )}> + {t('LEAVE_ALBUM')} + + ); } diff --git a/apps/photos/src/components/Collections/CollectionOptions/index.tsx b/apps/photos/src/components/Collections/CollectionOptions/index.tsx index c9dd48dc7..95c5ca756 100644 --- a/apps/photos/src/components/Collections/CollectionOptions/index.tsx +++ b/apps/photos/src/components/Collections/CollectionOptions/index.tsx @@ -324,6 +324,7 @@ const CollectionOptions = (props: CollectionOptionsProps) => { ) : collectionSummaryType === CollectionSummaryType.incomingShare ? ( ) : ( From 4f3fe6869d0919a33e1853253af7e0837a5de608 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 14:04:21 +0530 Subject: [PATCH 10/19] add sharedMagicMetadata property and type --- apps/photos/src/types/collection/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/photos/src/types/collection/index.ts b/apps/photos/src/types/collection/index.ts index d989a316c..b62fe56ec 100644 --- a/apps/photos/src/types/collection/index.ts +++ b/apps/photos/src/types/collection/index.ts @@ -25,6 +25,7 @@ export interface EncryptedCollection { isDeleted: boolean; magicMetadata: EncryptedMagicMetadata; pubMagicMetadata: EncryptedMagicMetadata; + sharedMagicMetadata: EncryptedMagicMetadata; } export interface Collection @@ -36,11 +37,13 @@ export interface Collection | 'nameDecryptionNonce' | 'magicMetadata' | 'pubMagicMetadata' + | 'sharedMagicMetadata' > { key: string; name: string; magicMetadata: CollectionMagicMetadata; pubMagicMetadata: CollectionPublicMagicMetadata; + sharedMagicMetadata: CollectionShareeMagicMetadata; } export interface PublicURL { @@ -111,6 +114,12 @@ export interface CollectionMagicMetadataProps { export type CollectionMagicMetadata = MagicMetadataCore; +export interface CollectionShareeMetadataProps { + visibility?: VISIBILITY_STATE; +} +export type CollectionShareeMagicMetadata = + MagicMetadataCore; + export interface CollectionPublicMagicMetadataProps { asc?: boolean; coverID?: number; From 9ff8c3ec6954747e4dbe42ab46002e1f06ddae96 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 14:24:21 +0530 Subject: [PATCH 11/19] refactor shouldShowAvatar check --- .../components/pages/gallery/PreviewCard.tsx | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/apps/photos/src/components/pages/gallery/PreviewCard.tsx b/apps/photos/src/components/pages/gallery/PreviewCard.tsx index 3f9fa89f2..b5d1bd7de 100644 --- a/apps/photos/src/components/pages/gallery/PreviewCard.tsx +++ b/apps/photos/src/components/pages/gallery/PreviewCard.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useEffect, useRef, useState } from 'react'; +import React, { useContext, useEffect, useMemo, useRef, useState } from 'react'; import { EnteFile } from 'types/file'; import { styled } from '@mui/material'; import PlayCircleOutlineOutlinedIcon from '@mui/icons-material/PlayCircleOutlineOutlined'; @@ -20,8 +20,6 @@ import { import { FILE_TYPE } from 'constants/file'; import AlbumOutlined from '@mui/icons-material/AlbumOutlined'; import Avatar from './Avatar'; -import { User } from 'types/user'; -import { getData, LS_KEYS } from 'utils/storage/localStorage'; interface IProps { file: EnteFile; @@ -217,7 +215,7 @@ const Cont = styled('div')<{ disabled: boolean }>` `; export default function PreviewCard(props: IProps) { - const { thumbs } = useContext(GalleryContext); + const { thumbs, user } = useContext(GalleryContext); const { file, @@ -242,6 +240,25 @@ export default function PreviewCard(props: IProps) { const isMounted = useRef(true); + const shouldShowAvatar = useMemo(() => { + if (!file || !user) { + return false; + } + // is Shared file + else if (file.ownerID !== user.id) { + return true; + } + // is public collected file + else if ( + file.ownerID === user.id && + file.pubMagicMetadata?.data?.uploaderName + ) { + return true; + } else { + return false; + } + }, [file, user]); + useEffect(() => { return () => { isMounted.current = false; @@ -334,8 +351,6 @@ export default function PreviewCard(props: IProps) { } }; - const user: User = getData(LS_KEYS.USER); - return ( - {(file.ownerID !== user.id || - (file.ownerID === user.id && - file.pubMagicMetadata?.data?.uploaderName)) && ( + {shouldShowAvatar && ( From e6c98b156b5a319a5b576655d5a9fdb2cd81e175 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 14:45:43 +0530 Subject: [PATCH 12/19] remove unnecessary useMemo and refactored shouldShowAvatar to utils --- .../components/pages/gallery/PreviewCard.tsx | 24 +++---------------- apps/photos/src/utils/file/index.ts | 19 +++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apps/photos/src/components/pages/gallery/PreviewCard.tsx b/apps/photos/src/components/pages/gallery/PreviewCard.tsx index b5d1bd7de..2fcf97b77 100644 --- a/apps/photos/src/components/pages/gallery/PreviewCard.tsx +++ b/apps/photos/src/components/pages/gallery/PreviewCard.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useEffect, useMemo, useRef, useState } from 'react'; +import React, { useContext, useEffect, useRef, useState } from 'react'; import { EnteFile } from 'types/file'; import { styled } from '@mui/material'; import PlayCircleOutlineOutlinedIcon from '@mui/icons-material/PlayCircleOutlineOutlined'; @@ -20,6 +20,7 @@ import { import { FILE_TYPE } from 'constants/file'; import AlbumOutlined from '@mui/icons-material/AlbumOutlined'; import Avatar from './Avatar'; +import { shouldShowAvatar } from 'utils/file'; interface IProps { file: EnteFile; @@ -240,25 +241,6 @@ export default function PreviewCard(props: IProps) { const isMounted = useRef(true); - const shouldShowAvatar = useMemo(() => { - if (!file || !user) { - return false; - } - // is Shared file - else if (file.ownerID !== user.id) { - return true; - } - // is public collected file - else if ( - file.ownerID === user.id && - file.pubMagicMetadata?.data?.uploaderName - ) { - return true; - } else { - return false; - } - }, [file, user]); - useEffect(() => { return () => { isMounted.current = false; @@ -386,7 +368,7 @@ export default function PreviewCard(props: IProps) { ) )} - {shouldShowAvatar && ( + {shouldShowAvatar(file, user) && ( diff --git a/apps/photos/src/utils/file/index.ts b/apps/photos/src/utils/file/index.ts index d4e2a4335..ac9da0380 100644 --- a/apps/photos/src/utils/file/index.ts +++ b/apps/photos/src/utils/file/index.ts @@ -672,3 +672,22 @@ export function constructFileToCollectionMap(files: EnteFile[]) { }); return fileToCollectionsMap; } + +export const shouldShowAvatar = (file: EnteFile, user: User) => { + if (!file || !user) { + return false; + } + // is Shared file + else if (file.ownerID !== user.id) { + return true; + } + // is public collected file + else if ( + file.ownerID === user.id && + file.pubMagicMetadata?.data?.uploaderName + ) { + return true; + } else { + return false; + } +}; From d691423f3335a92ea92840bfc3fdd16aa49d7a22 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 4 Jul 2023 14:54:35 +0530 Subject: [PATCH 13/19] hide mapbox on public link --- .../components/PhotoViewer/FileInfo/index.tsx | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx b/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx index 40c476a8e..d5b5cf54f 100644 --- a/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx +++ b/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx @@ -37,6 +37,7 @@ import { getMapDisableConfirmationDialog, getMapEnableConfirmationDialog, } from 'utils/ui'; +import { PublicCollectionGalleryContext } from 'utils/publicCollectionGallery'; export const FileInfoSidebar = styled((props: DialogProps) => ( @@ -97,6 +98,9 @@ export function FileInfo({ }: Iprops) { const appContext = useContext(AppContext); const galleryContext = useContext(GalleryContext); + const publicCollectionGalleryContext = useContext( + PublicCollectionGalleryContext + ); const [parsedExifData, setParsedExifData] = useState>(); const [showExif, setShowExif] = useState(false); @@ -235,7 +239,8 @@ export function FileInfo({ icon={} title={t('LOCATION')} caption={ - !appContext.mapEnabled ? ( + !appContext.mapEnabled || + publicCollectionGalleryContext.accessedThroughSharedURL ? ( } /> - + {!publicCollectionGalleryContext.accessedThroughSharedURL && ( + + )} )} Date: Sat, 8 Jul 2023 10:11:36 +0530 Subject: [PATCH 14/19] update isArchived to handle shared Collection metadata visibility state --- apps/photos/src/utils/magicMetadata/index.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/photos/src/utils/magicMetadata/index.ts b/apps/photos/src/utils/magicMetadata/index.ts index 6e20b0ffb..befe1a7de 100644 --- a/apps/photos/src/utils/magicMetadata/index.ts +++ b/apps/photos/src/utils/magicMetadata/index.ts @@ -8,12 +8,19 @@ export function isArchived(item: Collection | EnteFile) { !item || !item.magicMetadata || !item.magicMetadata.data || + !(item as Collection).sharedMagicMetadata?.data || typeof item.magicMetadata.data === 'string' || - typeof item.magicMetadata.data.visibility === 'undefined' + typeof item.magicMetadata.data.visibility === 'undefined' || + typeof (item as Collection).sharedMagicMetadata?.data.visibility === + 'undefined' ) { return false; } - return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED; + return ( + item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED || + (item as Collection).sharedMagicMetadata.data.visibility === + VISIBILITY_STATE.ARCHIVED + ); } export async function updateMagicMetadata( From 7161bc86739923f1497545f9eff3012928d4d6ab Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 8 Jul 2023 10:13:19 +0530 Subject: [PATCH 15/19] support archiving shared album and handle incoming sharee-metadata property --- apps/photos/src/services/collectionService.ts | 60 +++++++++++++++++++ apps/photos/src/utils/collection/index.ts | 31 ++++++++-- 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/apps/photos/src/services/collectionService.ts b/apps/photos/src/services/collectionService.ts index fff50682f..fe2a3d3f1 100644 --- a/apps/photos/src/services/collectionService.ts +++ b/apps/photos/src/services/collectionService.ts @@ -30,6 +30,7 @@ import { CollectionMagicMetadataProps, CollectionPublicMagicMetadata, RemoveFromCollectionRequest, + CollectionShareeMagicMetadata, } from 'types/collection'; import { COLLECTION_LIST_SORT_BY, @@ -139,12 +140,26 @@ const getCollectionWithSecrets = async ( }; } + let collectionShareeMagicMetadata: CollectionShareeMagicMetadata; + + if (collection.sharedMagicMetadata?.data) { + collectionShareeMagicMetadata = { + ...collection.sharedMagicMetadata, + data: await cryptoWorker.decryptMetadata( + collection.sharedMagicMetadata.data, + collection.sharedMagicMetadata.header, + collectionKey + ), + }; + } + return { ...collection, name: collectionName, key: collectionKey, magicMetadata: collectionMagicMetadata, pubMagicMetadata: collectionPublicMagicMetadata, + sharedMagicMetadata: collectionShareeMagicMetadata, }; }; @@ -359,6 +374,7 @@ const createCollection = async ( isDeleted: false, magicMetadata: encryptedMagicMetadata, pubMagicMetadata: null, + sharedMagicMetadata: null, }; const createdCollection = await postCollection(newCollection, token); const decryptedCreatedCollection = await getCollectionWithSecrets( @@ -738,6 +754,50 @@ export const updateCollectionMagicMetadata = async ( return updatedCollection; }; +export const updateSharedCollectionMagicMetadata = async ( + collection: Collection, + updatedMagicMetadata: CollectionMagicMetadata +) => { + const token = getToken(); + if (!token) { + return; + } + + const cryptoWorker = await ComlinkCryptoWorker.getInstance(); + + const { file: encryptedMagicMetadata } = await cryptoWorker.encryptMetadata( + updatedMagicMetadata.data, + collection.key + ); + + const reqBody: UpdateMagicMetadataRequest = { + id: collection.id, + magicMetadata: { + version: updatedMagicMetadata.version, + count: updatedMagicMetadata.count, + data: encryptedMagicMetadata.encryptedData, + header: encryptedMagicMetadata.decryptionHeader, + }, + }; + + await HTTPService.put( + `${ENDPOINT}/collections/sharee-magic-metadata`, + reqBody, + null, + { + 'X-Auth-Token': token, + } + ); + const updatedCollection: Collection = { + ...collection, + magicMetadata: { + ...updatedMagicMetadata, + version: updatedMagicMetadata.version + 1, + }, + }; + return updatedCollection; +}; + export const updatePublicCollectionMagicMetadata = async ( collection: Collection, updatedPublicMagicMetadata: CollectionPublicMagicMetadata diff --git a/apps/photos/src/utils/collection/index.ts b/apps/photos/src/utils/collection/index.ts index 70b8cad14..27402f586 100644 --- a/apps/photos/src/utils/collection/index.ts +++ b/apps/photos/src/utils/collection/index.ts @@ -8,6 +8,7 @@ import { unhideToCollection, updateCollectionMagicMetadata, updatePublicCollectionMagicMetadata, + updateSharedCollectionMagicMetadata, } from 'services/collectionService'; import { downloadFiles } from 'utils/file'; import { getLocalFiles, getLocalHiddenFiles } from 'services/fileService'; @@ -164,12 +165,30 @@ export const changeCollectionVisibility = async ( visibility, }; - const updatedMagicMetadata = await updateMagicMetadata( - updatedMagicMetadataProps, - collection.magicMetadata, - collection.key - ); - await updateCollectionMagicMetadata(collection, updatedMagicMetadata); + const user: User = getData(LS_KEYS.USER); + + if (collection.owner.id === user.id) { + const updatedMagicMetadata = await updateMagicMetadata( + updatedMagicMetadataProps, + collection.magicMetadata, + collection.key + ); + + await updateCollectionMagicMetadata( + collection, + updatedMagicMetadata + ); + } else { + const updatedMagicMetadata = await updateMagicMetadata( + updatedMagicMetadataProps, + collection.sharedMagicMetadata, + collection.key + ); + await updateSharedCollectionMagicMetadata( + collection, + updatedMagicMetadata + ); + } } catch (e) { logError(e, 'change collection visibility failed'); throw e; From 3a91c72bc01165c922bffa64a47c2991b7eb1d27 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sun, 9 Jul 2023 22:23:58 +0530 Subject: [PATCH 16/19] replace isArchived with separate isArchivedFile and isArchivedCollection --- .../Collections/CollectionOptions/index.tsx | 6 ++-- apps/photos/src/pages/gallery/index.tsx | 4 +-- apps/photos/src/utils/magicMetadata/index.ts | 35 +++++++++++-------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/apps/photos/src/components/Collections/CollectionOptions/index.tsx b/apps/photos/src/components/Collections/CollectionOptions/index.tsx index 95c5ca756..c3c025ed3 100644 --- a/apps/photos/src/components/Collections/CollectionOptions/index.tsx +++ b/apps/photos/src/components/Collections/CollectionOptions/index.tsx @@ -10,7 +10,7 @@ import { } from 'utils/collection'; import { SetCollectionNamerAttributes } from '../CollectionNamer'; import { Collection } from 'types/collection'; -import { isArchived } from 'utils/magicMetadata'; +import { isArchivedCollection } from 'utils/magicMetadata'; import { GalleryContext } from 'pages/gallery'; import { logError } from 'utils/sentry'; import { VISIBILITY_STATE } from 'types/magicMetadata'; @@ -324,12 +324,12 @@ const CollectionOptions = (props: CollectionOptionsProps) => { ) : collectionSummaryType === CollectionSummaryType.incomingShare ? ( ) : ( )} diff --git a/apps/photos/src/pages/gallery/index.tsx b/apps/photos/src/pages/gallery/index.tsx index 0d83fa9f4..e1023d146 100644 --- a/apps/photos/src/pages/gallery/index.tsx +++ b/apps/photos/src/pages/gallery/index.tsx @@ -119,7 +119,7 @@ import ExportModal from 'components/ExportModal'; import GalleryEmptyState from 'components/GalleryEmptyState'; import AuthenticateUserModal from 'components/AuthenticateUserModal'; import useMemoSingleThreaded from 'hooks/useMemoSingleThreaded'; -import { isArchived } from 'utils/magicMetadata'; +import { isArchivedFile } from 'utils/magicMetadata'; import { isSameDayAnyYear, isInsideLocationTag } from 'utils/search'; import { getSessionExpiredMessage } from 'utils/ui'; import { syncEntities } from 'services/entityService'; @@ -497,7 +497,7 @@ export default function Gallery() { } // Archived files can only be seen in archive section or their respective collection - if (isArchived(item)) { + if (isArchivedFile(item)) { if ( activeCollection === ARCHIVE_SECTION || activeCollection === item.collectionID diff --git a/apps/photos/src/utils/magicMetadata/index.ts b/apps/photos/src/utils/magicMetadata/index.ts index befe1a7de..37bce6080 100644 --- a/apps/photos/src/utils/magicMetadata/index.ts +++ b/apps/photos/src/utils/magicMetadata/index.ts @@ -3,24 +3,29 @@ import { EnteFile } from 'types/file'; import { MagicMetadataCore, VISIBILITY_STATE } from 'types/magicMetadata'; import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker'; -export function isArchived(item: Collection | EnteFile) { - if ( - !item || - !item.magicMetadata || - !item.magicMetadata.data || - !(item as Collection).sharedMagicMetadata?.data || - typeof item.magicMetadata.data === 'string' || - typeof item.magicMetadata.data.visibility === 'undefined' || - typeof (item as Collection).sharedMagicMetadata?.data.visibility === - 'undefined' - ) { +export function isArchivedFile(item: EnteFile): boolean { + if (!item || !item.magicMetadata || !item.magicMetadata.data) { return false; } - return ( - item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED || - (item as Collection).sharedMagicMetadata.data.visibility === + return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED; +} + +export function isArchivedCollection(item: Collection): boolean { + if (!item) { + return; + } + + if (item.magicMetadata && item.magicMetadata.data) { + return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED; + } + + if (!item.sharedMagicMetadata && item.sharedMagicMetadata.data) { + return ( + item.sharedMagicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED - ); + ); + } + return false; } export async function updateMagicMetadata( From 14fa47288679180b521c881e74d74e806c432849 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sun, 9 Jul 2023 22:30:28 +0530 Subject: [PATCH 17/19] migrate code --- apps/photos/src/utils/collection/index.ts | 6 ++++-- apps/photos/src/utils/file/index.ts | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/photos/src/utils/collection/index.ts b/apps/photos/src/utils/collection/index.ts index 18c9cab71..461df3c83 100644 --- a/apps/photos/src/utils/collection/index.ts +++ b/apps/photos/src/utils/collection/index.ts @@ -35,7 +35,7 @@ import { } from 'constants/collection'; import { getUnixTimeInMicroSecondsWithDelta } from 'utils/time'; import { SUB_TYPE, VISIBILITY_STATE } from 'types/magicMetadata'; -import { isArchived, updateMagicMetadata } from 'utils/magicMetadata'; +import { isArchivedCollection, updateMagicMetadata } from 'utils/magicMetadata'; import { getAlbumsURL } from 'utils/common/apiUtil'; import bs58 from 'bs58'; import { t } from 'i18next'; @@ -245,7 +245,9 @@ export const changeCollectionSubType = async ( export const getArchivedCollections = (collections: Collection[]) => { return new Set( - collections.filter(isArchived).map((collection) => collection.id) + collections + .filter(isArchivedCollection) + .map((collection) => collection.id) ); }; diff --git a/apps/photos/src/utils/file/index.ts b/apps/photos/src/utils/file/index.ts index 70ddc69a8..ef4dc6e0e 100644 --- a/apps/photos/src/utils/file/index.ts +++ b/apps/photos/src/utils/file/index.ts @@ -28,7 +28,7 @@ import PublicCollectionDownloadManager from 'services/publicCollectionDownloadMa import heicConversionService from 'services/heicConversionService'; import * as ffmpegService from 'services/ffmpeg/ffmpegService'; import { VISIBILITY_STATE } from 'types/magicMetadata'; -import { isArchived, updateMagicMetadata } from 'utils/magicMetadata'; +import { isArchivedFile, updateMagicMetadata } from 'utils/magicMetadata'; import { addLocalLog, addLogLine } from 'utils/logging'; import { CustomError } from 'utils/error'; @@ -576,7 +576,7 @@ export const isImageOrVideo = (fileType: FILE_TYPE) => [FILE_TYPE.IMAGE, FILE_TYPE.VIDEO].includes(fileType); export const getArchivedFiles = (files: EnteFile[]) => { - return files.filter(isArchived).map((file) => file.id); + return files.filter(isArchivedFile).map((file) => file.id); }; export const createTypedObjectURL = async (blob: Blob, fileName: string) => { From 10751ec18609ed50234e9e66f85f4510efea696c Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sun, 9 Jul 2023 22:31:08 +0530 Subject: [PATCH 18/19] fix isArchivedCollection --- apps/photos/src/utils/magicMetadata/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/photos/src/utils/magicMetadata/index.ts b/apps/photos/src/utils/magicMetadata/index.ts index 37bce6080..56c61c208 100644 --- a/apps/photos/src/utils/magicMetadata/index.ts +++ b/apps/photos/src/utils/magicMetadata/index.ts @@ -12,14 +12,14 @@ export function isArchivedFile(item: EnteFile): boolean { export function isArchivedCollection(item: Collection): boolean { if (!item) { - return; + return false; } if (item.magicMetadata && item.magicMetadata.data) { return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED; } - if (!item.sharedMagicMetadata && item.sharedMagicMetadata.data) { + if (item.sharedMagicMetadata && item.sharedMagicMetadata.data) { return ( item.sharedMagicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED From 1bb9d9c2717c0507bb25518d2f12c518868ea470 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sun, 9 Jul 2023 22:40:10 +0530 Subject: [PATCH 19/19] clean up code --- apps/photos/src/services/collectionService.ts | 1 - apps/photos/src/utils/collection/index.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/photos/src/services/collectionService.ts b/apps/photos/src/services/collectionService.ts index a0471f921..555071ce2 100644 --- a/apps/photos/src/services/collectionService.ts +++ b/apps/photos/src/services/collectionService.ts @@ -146,7 +146,6 @@ const getCollectionWithSecrets = async ( } let collectionShareeMagicMetadata: CollectionShareeMagicMetadata; - if (collection.sharedMagicMetadata?.data) { collectionShareeMagicMetadata = { ...collection.sharedMagicMetadata, diff --git a/apps/photos/src/utils/collection/index.ts b/apps/photos/src/utils/collection/index.ts index 461df3c83..5218c97af 100644 --- a/apps/photos/src/utils/collection/index.ts +++ b/apps/photos/src/utils/collection/index.ts @@ -168,7 +168,6 @@ export const changeCollectionVisibility = async ( }; const user: User = getData(LS_KEYS.USER); - if (collection.owner.id === user.id) { const updatedMagicMetadata = await updateMagicMetadata( updatedMagicMetadataProps,