Merge branch 'develop' into develop

Signed-off-by: Anil_Kumar_Majji <[email protected]>
mosip · Oct 17, 2024 · f860a91 · f860a91
2 parents 8178ff6 + bf02174
commit f860a91
Show file tree

Hide file tree

Showing 7 changed files with 399 additions and 241 deletions.
diff --git a/pmp-reactjs-ui/public/i18n/ara.json b/pmp-reactjs-ui/public/i18n/ara.json
@@ -519,7 +519,7 @@
         "uploadFtmCertificate": "تحميل شهادة شريحة FTM",
         "certificateFormatMsg": "يُسمح فقط بصيغة الشهادة .cer أو .pem الموقعة من قبل هيئة الشهادات المعتمدة للتحميل"
     },
-    "rootTrustCertificate":{
+    "rootTrustCertificate": {
         "organisation": "منظمة",
         "partnerDomain": "مجال الشريك",
         "issuedTo": "صدر ل",
@@ -569,6 +569,12 @@
         "selectPolicyGroup":"حدد مجموعة السياسات",
         "selectStatus":"حدد الحالة"
      },
+     "viewPartnerDetails": {
+         "viewPartnerDetails": "عرض تفاصيل الشريك",
+         "organizationName": "اسم المنظمة",
+         "createdOn":"تم الإنشاء بتاريخ",
+         "emailId": "معرف البريد الإلكتروني"
+     },
     "deactivateFtmPopup": {
         "headerMsg": "هل تريد إلغاء تنشيط شريحة FTM؟ ",
         "description": "عند النقر فوق تأكيد، سيتم إلغاء تنشيط تفاصيل شريحة FTM الخاصة بك."

diff --git a/pmp-reactjs-ui/public/i18n/eng.json b/pmp-reactjs-ui/public/i18n/eng.json
@@ -463,7 +463,7 @@
         "addDeviceBtn": "Add a Device",
         "ftmChipProviderServices": "FTM Chip Provider Services",
         "addFtmBtn": "Add FTM Chip",
-        "partnerId":"Partner ID",
+        "partnerId": "Partner ID",
         "listOfFtm": "List of FTM Chip details",
         "make": "Make",
         "model": "Model",
@@ -478,7 +478,7 @@
         "view": "View",
         "manageCertificate": "Manage Certificate",
         "deActivate": "Deactivate",
-        "selectPartnerId":"Select Partner ID",
+        "selectPartnerId": "Select Partner ID",
         "selectMakeName": "Select Make Name",
         "selectModelName": "Select Model Name",
         "selectStatus": "Select Status",
@@ -514,7 +514,7 @@
         "uploadFtmCertificate": "Upload FTM Chip Certificate",
         "certificateFormatMsg": "Only .cer or .pem certificate formats signed by authorised Certificate Authority are allowed for upload"
     },
-    "rootTrustCertificate":{
+    "rootTrustCertificate": {
         "organisation": "Organisation",
         "partnerDomain": "Partner Domain",
         "issuedTo": "Issued To",
@@ -533,8 +533,9 @@
         "view": "View"
     },
     "uploadRootofTrustCertificate": {
-        "uploadRootofTrustCertificate":"Upload Root of Trust Certificate",
-        "uploadRootofTrustCertificateDesc": "Please select the partner domain and upload root / intermediate root certificate",
+        "uploadRootofTrustCertificate": "Upload Root of Trust Certificate",
+        "rootTrustCertificate": "Root of Trust Certificate",
+        "uploadRootofTrustCertificateDesc": "Please select the fields and upload certifiate",
         "partnerDomain": "Partner Domain",
         "dropdownPlaceholder": "Select partner domain",
         "successMsg": "Root of Trust Certificate for {{partnerDomain}} is uploaded successfully"
@@ -543,26 +544,32 @@
         "viewRootOfTrustCertificate": "View Root of Trust Certificate",
         "caCertificates": "Ca Certificates"
     },
-    "partnerList":{
-       "partnerTitle": "Partner",
-       "listOfPartnerTitle": "List of Partners",
-       "partnerId": "Partner ID",
-       "organisation": "Organisation Name",
-       "partnerType": "Partner Type",
-       "policyGroup": "Policy Group",
-       "email": "Email Address",
-       "certUploadStatus": "Cert. Upload Status",
-       "status": "Status",
-       "action": "Action",
-       "noData": "No Data",
-       "deActivate": "Deactivate",
-       "view": "View",
-       "selectPartnerId": "Select Partner ID",
-       "selectOrganisation":"Select Organisation",
-       "selectPartnerType":"Select Partner Type",
-       "selectEmailAddress": "Select Email Address",
-       "selectPolicyGroup":"Select Policy Group",
-       "selectStatus":"Select Status"
+    "partnerList": {
+        "partnerTitle": "Partner",
+        "listOfPartnerTitle": "List of Partners",
+        "partnerId": "Partner ID",
+        "organisation": "Organisation Name",
+        "partnerType": "Partner Type",
+        "policyGroup": "Policy Group",
+        "email": "Email Address",
+        "certUploadStatus": "Cert. Upload Status",
+        "status": "Status",
+        "action": "Action",
+        "noData": "No Data",
+        "deActivate": "Deactivate",
+        "view": "View",
+        "selectPartnerId": "Select Partner ID",
+        "selectOrganisation": "Select Organisation",
+        "selectPartnerType": "Select Partner Type",
+        "selectEmailAddress": "Select Email Address",
+        "selectPolicyGroup": "Select Policy Group",
+        "selectStatus": "Select Status"
+    },
+    "viewPartnerDetails": {
+        "viewPartnerDetails": "View Partner Details",
+        "organizationName": "Organization Name",
+        "createdOn":"Created On",
+        "emailId": "Email ID"
     },
     "deactivateFtmPopup": {
         "headerMsg": "Do you want to deactivate FTM Chip ",

diff --git a/pmp-reactjs-ui/public/i18n/fra.json b/pmp-reactjs-ui/public/i18n/fra.json
@@ -519,7 +519,7 @@
         "uploadFtmCertificate": "Télécharger le certificat de la puce FTM",
         "certificateFormatMsg": "Seuls les certificats au format .cer ou .pem signés par une autorité de certification autorisée sont autorisés pour le téléchargement."
     },
-    "rootTrustCertificate":{
+    "rootTrustCertificate": {
         "organisation": "Organisation",
         "partnerDomain": "Domaine partenaire",
         "issuedTo": "Délivré à",
@@ -569,6 +569,12 @@
         "selectPolicyGroup":"Sélectionnez un groupe de stratégies",
         "selectStatus":"Sélectionnez le statut"
      },
+     "viewPartnerDetails": {
+         "viewPartnerDetails": "Afficher les détails du partenaire",
+         "organizationName": "Nom de l'Organisation",
+         "createdOn":"Créé le",
+         "emailId": "Identifiant de courrier électronique"
+     },
     "deactivateFtmPopup": {
         "headerMsg": "Voulez-vous désactiver la puce FTM ",
         "description": "En cliquant sur Confirmer, les détails de votre puce FTM seront désactivés."

diff --git a/pmp-reactjs-ui/src/AppRoutes.js b/pmp-reactjs-ui/src/AppRoutes.js
@@ -26,6 +26,7 @@ import ViewFtmChipDetails from './pages/partner/ftmProviderServices/ViewFtmChipD
 import RootTrustCertificateList from './pages/admin/certificates/RootTrustCertificateList.js';
 import UploadRootTrustCertificate from './pages/admin/certificates/UploadRootTrustCertificate.js';
 import PartnersList from './pages/admin/partners/PartnersList.js';
+import ViewPartnerDetails from './pages/admin/partners/ViewPartnerDetails.js';
 
 
 function AppRoutes() {
@@ -41,108 +42,111 @@ function AppRoutes() {
         { path: '', loader: () => redirect('/partnermanagement/dashboard') },
         {
           path: 'dashboard',
-          element: <GuardedRoute><MainLayout><Dashboard/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><Dashboard /></MainLayout></GuardedRoute>,
         },
         {
           path: 'userProfile',
-          element: <GuardedRoute><MainLayout><UserProfile/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><UserProfile /></MainLayout></GuardedRoute>,
         },
         {
           path: 'certificates/partnerCertificate',
-          element: <GuardedRoute><MainLayout><PartnerCertificatesList/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><PartnerCertificatesList /></MainLayout></GuardedRoute>,
         },
         {
           path: 'policies/policiesList',
-          element: <GuardedRoute><MainLayout><PoliciesList/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><PoliciesList /></MainLayout></GuardedRoute>,
         },
         {
           path: 'policies/viewPolicyDetails',
-          element: <GuardedRoute><MainLayout><ViewPolicyDetails/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><ViewPolicyDetails /></MainLayout></GuardedRoute>,
         },
         {
           path: 'policies/requestPolicy',
-          element: <GuardedRoute><MainLayout><RequestPolicy/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><RequestPolicy /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/oidcClientsList',
-          element: <GuardedRoute><MainLayout><OidcClientsList/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><OidcClientsList /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/createOidcClient',
-          element: <GuardedRoute><MainLayout><CreateOidcClient/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><CreateOidcClient /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/viewOidcClienDetails',
-          element: <GuardedRoute><MainLayout><ViewOidcClientDetails/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><ViewOidcClientDetails /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/editOidcClient',
-          element: <GuardedRoute><MainLayout><EditOidcClient/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><EditOidcClient /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/apiKeysList',
-          element: <GuardedRoute><MainLayout><ApiKeysList/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><ApiKeysList /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/generateApiKey',
-          element: <GuardedRoute><MainLayout><GenerateApiKey/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><GenerateApiKey /></MainLayout></GuardedRoute>,
         },
         {
           path: 'authenticationServices/viewApiKeyDetails',
-          element: <GuardedRoute><MainLayout><ViewApiKeyDetails/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><ViewApiKeyDetails /></MainLayout></GuardedRoute>,
         },
         {
           path: 'deviceProviderServices/sbiList',
-          element: <GuardedRoute><MainLayout><SbiList/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><SbiList /></MainLayout></GuardedRoute>,
         },
         {
           path: 'deviceProviderServices/addSbi',
-          element: <GuardedRoute><MainLayout><AddSbi/></MainLayout></GuardedRoute>,
+          element: <GuardedRoute><MainLayout><AddSbi /></MainLayout></GuardedRoute>,
         },
         {
           path: 'deviceProviderServices/addDevices',
-          element: <GuardedRoute><MainLayout><AddDevices/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><AddDevices /></MainLayout></GuardedRoute>
         },
         {
           path: 'deviceProviderServices/devicesList',
-          element: <GuardedRoute><MainLayout><DevicesList/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><DevicesList /></MainLayout></GuardedRoute>
         },
         {
           path: 'deviceProviderServices/viewDeviceDetails',
-          element: <GuardedRoute><MainLayout><ViewDeviceDetails/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><ViewDeviceDetails /></MainLayout></GuardedRoute>
         },
         {
           path: 'ftmChipProviderServices/ftmList',
-          element: <GuardedRoute><MainLayout><FtmList/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><FtmList /></MainLayout></GuardedRoute>
         },
         {
           path: 'ftmChipProviderServices/addFtm',
-          element: <GuardedRoute><MainLayout><AddFtm/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><AddFtm /></MainLayout></GuardedRoute>
         },
         {
           path: 'ftmChipProviderServices/viewFtmChipDetails',
-          element: <GuardedRoute><MainLayout><ViewFtmChipDetails/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><ViewFtmChipDetails /></MainLayout></GuardedRoute>
         },
         {
           path: 'ftmChipProviderServices/manageFtmChipCertificate',
-          element: <GuardedRoute><MainLayout><ViewFtmChipDetails/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><ViewFtmChipDetails /></MainLayout></GuardedRoute>
         },
         {
           path: 'admin/certificates/rootTrustCertificateList',
-          element: <GuardedRoute><MainLayout><RootTrustCertificateList/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><RootTrustCertificateList /></MainLayout></GuardedRoute>
         },
         {
           path: 'admin/certificates/uploadRootTrustCertificate',
-          element: <GuardedRoute><MainLayout><UploadRootTrustCertificate/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><UploadRootTrustCertificate /></MainLayout></GuardedRoute>
         },
         {
           path: 'admin/partnersList',
-          element: <GuardedRoute><MainLayout><PartnersList/></MainLayout></GuardedRoute>
+          element: <GuardedRoute><MainLayout><PartnersList /></MainLayout></GuardedRoute>
+        }, 
+        {
+          path: 'admin/viewPartnerDetails',
+          element: <GuardedRoute><MainLayout><ViewPartnerDetails/></MainLayout></GuardedRoute>
         },
-
         {
           path: 'runtimeError',
-          element: <RuntimeError/>,
+          element: <RuntimeError />,
         },
       ],
     },