From 28a89ddb8605832d4ff8147dfbc2ccf30c2daf53 Mon Sep 17 00:00:00 2001
From: aj-rosado <109146700+aj-rosado@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:19:06 +0100
Subject: [PATCH] [PM-7304] Add missing i18n keys for import errors (#8743)

* Add static error message when import fails

* Adding missing string on CLI for unassigned items

* Added missing string on setImportTarget

* fixed tests
---
 apps/browser/src/_locales/en/messages.json        | 6 ++++++
 apps/cli/src/locales/en/messages.json             | 9 +++++++++
 apps/desktop/src/locales/en/messages.json         | 6 ++++++
 apps/web/src/locales/en/messages.json             | 6 ++++++
 libs/importer/src/services/import.service.spec.ts | 4 ++--
 libs/importer/src/services/import.service.ts      | 4 ++--
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 5e941083dfa..f599df470bd 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -3011,5 +3011,11 @@
   },
   "unassignedItemsBannerSelfHost": {
     "message": "Notice: On May 2, 2024, unassigned organization items will no longer be visible in the All Vaults view and will only be accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible."
+  },
+  "errorAssigningTargetCollection": {
+    "message": "Error assigning target collection."
+  },
+  "errorAssigningTargetFolder": {
+    "message": "Error assigning target folder."
   }
 }
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index e12b30af2c0..8364e0b3280 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -49,5 +49,14 @@
   },
   "unsupportedEncryptedImport": {
     "message": "Importing encrypted files is currently not supported."
+  },
+  "importUnassignedItemsError": {
+    "message": "File contains unassigned items."
+  },
+  "errorAssigningTargetCollection": {
+    "message": "Error assigning target collection."
+  },
+  "errorAssigningTargetFolder": {
+    "message": "Error assigning target folder."
   }
 }
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index a0d34e40755..00eace54e2c 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2705,5 +2705,11 @@
   },
   "passkeyRemoved": {
     "message": "Passkey removed"
+  },
+  "errorAssigningTargetCollection": {
+    "message": "Error assigning target collection."
+  },
+  "errorAssigningTargetFolder": {
+    "message": "Error assigning target folder."
   }
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index c8dfa14c8ba..680014f1f06 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7944,5 +7944,11 @@
   },
  "deleteProviderWarning": {
     "message": "Deleting your provider is permanent. It cannot be undone."
+  },
+  "errorAssigningTargetCollection": {
+    "message": "Error assigning target collection."
+  },
+  "errorAssigningTargetFolder": {
+    "message": "Error assigning target folder."
   }
 }
diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index eb21f384b56..7bbcd3287ab 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -196,7 +196,7 @@ describe("ImportService", () => {
         new Object() as FolderView,
       );
 
-      await expect(setImportTargetMethod).rejects.toThrow("Error assigning target collection");
+      await expect(setImportTargetMethod).rejects.toThrow();
     });
 
     it("passing importTarget as null on setImportTarget throws error", async () => {
@@ -206,7 +206,7 @@ describe("ImportService", () => {
         new Object() as CollectionView,
       );
 
-      await expect(setImportTargetMethod).rejects.toThrow("Error assigning target folder");
+      await expect(setImportTargetMethod).rejects.toThrow();
     });
 
     it("passing importTarget, collectionRelationship has the expected values", async () => {
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index 62961a77c4c..f5cab933f38 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -432,7 +432,7 @@ export class ImportService implements ImportServiceAbstraction {
 
     if (organizationId) {
       if (!(importTarget instanceof CollectionView)) {
-        throw new Error("Error assigning target collection");
+        throw new Error(this.i18nService.t("errorAssigningTargetCollection"));
       }
 
       const noCollectionRelationShips: [number, number][] = [];
@@ -463,7 +463,7 @@ export class ImportService implements ImportServiceAbstraction {
     }
 
     if (!(importTarget instanceof FolderView)) {
-      throw new Error("Error assigning target folder");
+      throw new Error(this.i18nService.t("errorAssigningTargetFolder"));
     }
 
     const noFolderRelationShips: [number, number][] = [];