Merge pull request #231 from GOKULRAJ136/MOSIP-23036

MOSIP-23036 : Added error message for invalid JSON format in policies data
mosip · Feb 23, 2024 · 48268fc · 48268fc
2 parents 3be6d70 + cd3bac1
commit 48268fc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/.../app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts b/.../app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts
@@ -591,7 +591,11 @@ export class MaterDataCommonBodyComponent implements OnInit {
         url = url;
     }
     else if(url === "policymanager/policies"){
-      this.primaryData["policies"] =  JSON.parse(this.primaryData["policies"]);
+      try {
+        this.primaryData["policies"] = JSON.parse(this.primaryData["policies"]);
+      } catch (error) {
+        this.showErrorPopup(this.popupMessages.genericerror.invalidJson);
+    }
     }
     if(this.primaryData.id || this.primaryData.ftpChipDetailId){ 
       this.primaryData["isItForRegistrationDevice"] = true;

diff --git a/pmp-ui/src/assets/i18n/ara.json b/pmp-ui/src/assets/i18n/ara.json
@@ -474,7 +474,8 @@
   },
   "genericerror": {
     "fieldValidation": "هذه الخانة مطلوبه",
-    "fieldNameValidation": " مطلوب"
+    "fieldNameValidation": " مطلوب",
+    "invalidJson": "تنسيق JSON غير صالح لبيانات السياسات"
   },
   "serverError": {
     "PMS_COR_001": "معلمة الإدخال مفقود",

diff --git a/pmp-ui/src/assets/i18n/eng.json b/pmp-ui/src/assets/i18n/eng.json
@@ -453,14 +453,6 @@
     "button": "Upload",
     "cancel": "Cancel"
   },
-  "filters": {
-    "titleTxt": "Map Policy Group",
-    "footerButtons": {
-      "resetTxt": "Reset",
-      "cancelTxt": "Cancel",
-      "applyTxt": "Save"
-    }
-  },
   "filters": {
     "titleTxt": "Add Filters",
     "footerButtons": {
@@ -475,7 +467,8 @@
   },
   "genericerror": {
     "fieldValidation": "This field is required",
-    "fieldNameValidation": " is required"
+    "fieldNameValidation": " is required",
+    "invalidJson": "Invalid JSON format for policies data"
   },
   "serverError": {
     "PMS_COR_001": "Missing Input Parameter",

diff --git a/pmp-ui/src/assets/i18n/fra.json b/pmp-ui/src/assets/i18n/fra.json
@@ -470,7 +470,8 @@
   },
   "genericerror": {
     "fieldValidation": "Ce champ est requis",
-    "fieldNameValidation": " est requis"
+    "fieldNameValidation": " est requis",
+    "invalidJson": "Format JSON non valide pour les données des règles"
   },
   "serverError": {
     "PMS_COR_001": "Paramètre d'entrée manquant",

diff --git a/pmp-ui/src/assets/i18n/hin.json b/pmp-ui/src/assets/i18n/hin.json
@@ -470,7 +470,8 @@
   },
   "genericerror": {
     "fieldValidation": "यह फ़ील्ड आवश्यक है",
-    "fieldNameValidation": " आवश्यक है"
+    "fieldNameValidation": " आवश्यक है",
+    "invalidJson": "नीतियों के डेटा के लिए अमान्य JSON प्रारूप"
   },
   "serverError": {
     "PMS_COR_001": "गुम इनपुट पैरामीटर",

diff --git a/pmp-ui/src/assets/i18n/kan.json b/pmp-ui/src/assets/i18n/kan.json
@@ -470,7 +470,8 @@
   },
   "genericerror": {
     "fieldValidation": "ಈ ಜಾಗ ಬೇಕಾಗಿದೆ",
-    "fieldNameValidation": " ಅಗತ್ಯವಿದೆ"
+    "fieldNameValidation": " ಅಗತ್ಯವಿದೆ",
+    "invalidJson": "ನೀತಿಗಳ ಡೇಟಾಕ್ಕಾಗಿ ಅಮಾನ್ಯ JSON ಫಾರ್ಮ್ಯಾಟ್"
   },
   "serverError": {
     "PMS_COR_001": "ಇನ್‌ಪುಟ್ ಪ್ಯಾರಾಮೀಟರ್ ಕಾಣೆಯಾಗಿದೆ",

diff --git a/pmp-ui/src/assets/i18n/tam.json b/pmp-ui/src/assets/i18n/tam.json
@@ -470,7 +470,8 @@
   },
   "genericerror": {
     "fieldValidation": "இந்த புலம் தேவை",
-    "fieldNameValidation": "தேவைப்படுகிறது"
+    "fieldNameValidation": "தேவைப்படுகிறது",
+    "invalidJson": "கொள்கைகள் தரவிற்கான தவறான JSON வடிவம்"
   },
   "serverError": {
   	"PMS_COR_001": "உள்ளீட்டு அளவுரு இல்லை",