From 40df3c3b5f03d741ee4cf7305cabcb867b46fb51 Mon Sep 17 00:00:00 2001 From: SwethaKrish4 <110164892+SwethaKrish4@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:04:18 +0530 Subject: [PATCH] MOSIP-35736: Added error message for else (#820) * MOSIP-35736: Added error message for else Signed-off-by: SwethaKrish4 <110164892+SwethaKrish4@users.noreply.github.com> * MOSIP-35736: Added error message for else Signed-off-by: SwethaKrish4 <110164892+SwethaKrish4@users.noreply.github.com> --------- Signed-off-by: SwethaKrish4 <110164892+SwethaKrish4@users.noreply.github.com> --- pmp-reactjs-ui/public/i18n/ara.json | 5 ++--- pmp-reactjs-ui/public/i18n/eng.json | 5 ++--- pmp-reactjs-ui/public/i18n/fra.json | 5 ++--- .../deviceProviderServices/AddDevices.js | 22 ++++++++++++++----- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/pmp-reactjs-ui/public/i18n/ara.json b/pmp-reactjs-ui/public/i18n/ara.json index c2f8dfc1..491c53be 100644 --- a/pmp-reactjs-ui/public/i18n/ara.json +++ b/pmp-reactjs-ui/public/i18n/ara.json @@ -442,10 +442,9 @@ "successMsg": "تم إرسال الجهاز بنجاح وهو معلق لدى المشرف للموافقة.", "errorInDeviceSubType": "أثناء جلب أنواع فرعية للجهاز، واجهنا خطأً.", "errorInDeviceType": "أثناء جلب أنواع الأجهزة، واجهنا خطأً.", - "errorInAddingDevice": "أثناء إضافة الجهاز، واجهنا خطأ.", "limitExceedWarning": "يمكن إضافة 25 جهازًا كحد أقصى في المرة الواحدة. انقر فوق تأكيد لتحديث هذه الصفحة وإضافة المزيد من الأجهزة. يرجى ملاحظة أن جميع الأجهزة التي تم إرسالها مسبقًا لن تكون مرئية عند التحديث ولكن يمكن عرضها في صفحة قائمة الأجهزة", - "inActiveDeviceMappingToSbiError": "لقد واجهنا خطأ، يرجى الاتصال بالمسؤول.", - "errorWhileFetchingDeviceDetails": "أثناء جلب تفاصيل الجهاز، واجهنا خطأً." + "unableToAddDevice": "تعذر إضافة الجهاز، يرجى المحاولة مرة أخرى لاحقًا", + "unableToAddDeviceReason": "تعذر إضافة الجهاز بسبب السبب التالي: " }, "deactivateSbi": { "headerMsg": "هل تريد إلغاء تنشيط إصدار SBI ", diff --git a/pmp-reactjs-ui/public/i18n/eng.json b/pmp-reactjs-ui/public/i18n/eng.json index b738261b..11f4229b 100644 --- a/pmp-reactjs-ui/public/i18n/eng.json +++ b/pmp-reactjs-ui/public/i18n/eng.json @@ -437,10 +437,9 @@ "successMsg": "Device has been successfully submitted and is pending with admin for approval.", "errorInDeviceSubType": "While fetching device sub types, we have encountered with an error.", "errorInDeviceType": "While fetching device types, we have encountered with an error.", - "errorInAddingDevice": "While adding device, we have encountered with an error.", "limitExceedWarning": "Maximum of 25 devices can be added at a time. Click Confirm to refresh this page and add more devices. Please note that all the previously submitted devices will not be visible upon refreshing but can be viewed in List of Devices Page.", - "inActiveDeviceMappingToSbiError": "We have encountered with an error, please contact your administrator.", - "errorWhileFetchingDeviceDetails": "While fetching device details, we have encountered with an error." + "unableToAddDevice": "Unable to add the device, please try again later", + "unableToAddDeviceReason": "Unable to add the device due to the following reason: " }, "deactivateSbi": { "headerMsg": "Do you want to deactivate SBI Version ", diff --git a/pmp-reactjs-ui/public/i18n/fra.json b/pmp-reactjs-ui/public/i18n/fra.json index 4e6bf913..ca40f403 100644 --- a/pmp-reactjs-ui/public/i18n/fra.json +++ b/pmp-reactjs-ui/public/i18n/fra.json @@ -442,10 +442,9 @@ "successMsg": "L'appareil a été soumis avec succès et est en attente de administrateur pour approbation.", "errorInDeviceSubType": "Lors de la récupération des sous-types d'appareils, nous avons rencontré une erreur.", "errorInDeviceType": "Lors de la récupération des types d'appareils, nous avons rencontré une erreur.", - "errorInAddingDevice": "Lors de l'ajout d'un appareil, nous avons rencontré une erreur.", "limitExceedWarning": "Vous pouvez ajouter jusqu'à 25 appareils à la fois. Cliquez sur Confirmer pour actualiser cette page et ajouter d'autres appareils. Veuillez noter que tous les appareils précédemment soumis ne seront pas visibles lors de l'actualisation, mais pourront être consultés dans la page Liste des appareils.", - "inActiveDeviceMappingToSbiError": "Nous avons rencontré une erreur, veuillez contacter votre administrateur.", - "errorWhileFetchingDeviceDetails": "Lors de la récupération des détails de l'appareil, nous avons rencontré une erreur." + "unableToAddDevice": "Impossible d'ajouter l'appareil, veuillez réessayer plus tard", + "unableToAddDeviceReason": "Impossible d'ajouter l'appareil pour la raison suivante: " }, "deactivateSbi": { "headerMsg": "Voulez-vous désactiver la version SBI ", diff --git a/pmp-reactjs-ui/src/pages/partner/deviceProviderServices/AddDevices.js b/pmp-reactjs-ui/src/pages/partner/deviceProviderServices/AddDevices.js index 58168aba..d1ff1c04 100644 --- a/pmp-reactjs-ui/src/pages/partner/deviceProviderServices/AddDevices.js +++ b/pmp-reactjs-ui/src/pages/partner/deviceProviderServices/AddDevices.js @@ -251,13 +251,16 @@ function AddDevices() { const deviceDetails = await searchDeviceDetails(entry, index); if (deviceDetails) { inactiveMappingDeviceToSbi(deviceDetails[0].id, index); + } else { + newEntries[index].errorMsg = t('addDevices.unableToAddDevice'); + setDeviceEntries(newEntries); } } else { handleError(response.data, index, newEntries); } } } catch (err) { - newEntries[index].errorMsg = t('addDevices.errorInAddingDevice'); + newEntries[index].errorMsg = t('addDevices.unableToAddDevice'); setDeviceEntries(newEntries); console.error("Error fetching data: ", err); } @@ -298,7 +301,7 @@ function AddDevices() { handleError(response.data, index, newEntries); } } catch (err) { - newEntries[index].errorMsg = t('addDevices.errorWhileFetchingDeviceDetails'); + newEntries[index].errorMsg = t('addDevices.unableToAddDevice'); setDeviceEntries(newEntries); console.error("Error fetching data: ", err); } @@ -330,7 +333,7 @@ function AddDevices() { handleError(response.data, index, newEntries); } } catch (err) { - newEntries[index].errorMsg = t('addDevices.inActiveDeviceMappingToSbiError'); + newEntries[index].errorMsg = t('addDevices.unableToAddDevice'); setDeviceEntries(newEntries); console.error('Error fetching data:', err); } @@ -340,8 +343,17 @@ function AddDevices() { const handleError = (responseData, index, newEntries) => { if (responseData && responseData.errors && responseData.errors.length > 0) { const errorCode = responseData.errors[0].errorCode; - const errorMessage = responseData.errors[0].message; - newEntries[index].errorCode = errorCode; + let errorMessage = responseData.errors[0].message; + if (errorCode) { + const serverErrors = t('serverError', { returnObjects: true }); + if (serverErrors[errorCode]) { + errorMessage = t('addDevices.unableToAddDeviceReason') + serverErrors[errorCode]; + } else { + errorMessage = t('addDevices.unableToAddDeviceReason') + errorMessage; + } + } else { + errorMessage = t('addDevices.unableToAddDeviceReason') + errorMessage; + } newEntries[index].errorMsg = errorMessage; setDeviceEntries(newEntries); console.error('Error:', errorMessage);