Skip to content

Commit

Permalink
Revert "MOSIP-38879, MOSIP-38941, MOSIP-38907: Resolved the bugs. (#1092
Browse files Browse the repository at this point in the history 
)" (#1100)

This reverts commit 95e674e.
  • Loading branch information
@mayuradesh
mayuradesh authored Jan 16, 2025
1 parent 5a4df96 commit dac5f8c
Show file tree
Hide file tree
Showing 13 changed files with 100 additions and 99 deletions.
26 changes: 13 additions & 13 deletions pmp-revamp-ui/public/i18n/eng.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@
"KER_PRT_390": " Invalid filter value",
"KER-PCM-008": "The organization name in the uploaded certificate does not match the name provided during partner registration.",
"PMS_PRT_001": " A Partner is already registered with the same Name",
"PMS_PRT_051": " A Partner is already registered with the same ID",
"PMS_PRT_051": " A Partner is already registered with the same Id",
"PMS_PRT_052": "PartnerId max length should be 36",
"PMS_ATH_053": " IO Exception occured while passing paging request",
"PMS_ATH_054": " User not found",
Expand Down Expand Up @@ -1104,8 +1104,8 @@
"PMS_PRT_060": "This policy has already been approved against your partner ID.",
"PMS_AUT_028": "Device details for id $ID are rejected. Can't use same details for mapping.",
"PMS_CERTIFICATE_ERROR_001": "Error while fetching partner certificates.",
"PMS_CERTIFICATE_ERROR_002": "User ID does not exists.",
"PMS_CERTIFICATE_ERROR_003": "Partner ID is null or empty.",
"PMS_CERTIFICATE_ERROR_002": "User Id does not exists.",
"PMS_CERTIFICATE_ERROR_003": "Partner Id is null or empty.",
"PMS_CERTIFICATE_ERROR_004": "Partner Type is null or empty",
"PMS_CERTIFICATE_ERROR_005": "Approval Status is null or empty",
"PMS_CERTIFICATE_ERROR_006": "Unable to decode the certificate data",
Expand All @@ -1117,9 +1117,9 @@
"PMS_CERTIFICATE_ERROR_012": "Certificate id is null or empty",
"PMS_POLICY_ERROR_001": "Policy Group does not exists.",
"PMS_POLICY_ERROR_002": "Error while fetching partner policies.",
"PMS_POLICY_ERROR_003": "Error while fetching all approved partner IDs with policy groups.",
"PMS_POLICY_ERROR_003": "Error while fetching all approved partner Ids with policy groups.",
"PMS_POLICY_ERROR_004": "Matching Policy not found.",
"PMS_POLICY_ERROR_005": "Policy Group ID is empty.",
"PMS_POLICY_ERROR_005": "Policy Group Id is empty.",
"PMS_POLICY_ERROR_006": "Error while fetching OIDC clients list.",
"PMS_POLICY_ERROR_007": "Error while fetching API Key requests",
"PMS_POLICY_ERROR_008": "No matching policy group was found for the provided partner",
Expand All @@ -1136,7 +1136,7 @@
"PMS_ESI_008": "Client already deactivated.",
"PMS_PRT_056": "Given langCode is not supported",
"PMS_PRT_057": "Policy Type Mismatch. Only Auth policy can be used to create OIDC Client.",
"PMS_PRT_058": "AuthPartner doesn't exists with this ID",
"PMS_PRT_058": "AuthPartner doesn't exists with this Id",
"PMS_PRT_059": "Only Auth_partner can Create OIDC Client. Other partner types are not allowed to create OIDC Client.",
"PMS_PRT_066": "PartnerId should not have any spaces",
"PMS_PRT_096": "Json is not valid",
Expand All @@ -1145,14 +1145,14 @@
"PMP-AUT-020": "Parse Error exception",
"PMP-AUT-021": "Audit Exception from client",
"KER-AUD-001": "PartnerId max length should be 36",
"PMS_DP_FETCH_001": "Unable to fetch approved device provider IDs.",
"PMS_DP_FETCH_001": "Unable to fetch approved device provider Ids.",
"PMS_DEVICE_ERROR_001": "Partner id is not associated with user.",
"PMS_DEVICE_ERROR_002": "SBI is not associated with partner ID.",
"PMS_DEVICE_ERROR_002": "SBI is not associated with partner Id.",
"PMS_DEVICE_ERROR_003": "Invalid partner type.",
"PMS_DEVICE_ERROR_004": "SBI and Device mapping already exists.",
"PMS_DEVICE_ERROR_005": "SBI do not exists.",
"PMS_DEVICE_ERROR_006": "Device do not exists.",
"PMS_DEVICE_ERROR_007": "Device is not associated with partner ID.",
"PMS_DEVICE_ERROR_007": "Device is not associated with partner Id.",
"PMS_DEVICE_ERROR_008": "Error while adding device for sbi.",
"PMS_DEVICE_ERROR_009": "Given SBI is either deactivated or not approved yet.",
"PMS_DEVICE_ERROR_010": "Given device details are not in pending for approval status.",
Expand All @@ -1162,7 +1162,7 @@
"PMS_DEVICE_ERROR_014": "The selected device has been already deactivated",
"PMS_DEVICE_ERROR_015": "Error while deactivating the device",
"PMS_DEVICE_ERROR_016": "Device is not associated with user.",
"PMS_DEVICE_ERROR_017": "SBI ID is invalid",
"PMS_DEVICE_ERROR_017": "SBI Id is invalid",
"PMS_DEVICE_ERROR_018": "Error while deactivating the SBI",
"PMS_DEVICE_ERROR_019": "SBI is not associated with user.",
"PMS_DEVICE_ERROR_020": "The selected SBI is already deactivated",
Expand All @@ -1176,15 +1176,15 @@
"PMS_SF_ERROR_001": "Error while fetching devices list for SBI.",
"PMS_SBI_ERROR_001": "Unable to fetch SBI details.",
"PMS_REQUEST_ERROR_001": "Invalid request.",
"PMS_REQUEST_ERROR_002": "Invalid Request ID",
"PMS_REQUEST_ERROR_002": "Invalid Request Id",
"PMS_REQUEST_ERROR_003": "Request version is invalid",
"PMS_REQUEST_ERROR_004": "Invalid request time",
"PMS_REQUEST_ERROR_005": "Request body is invalid",
"PMS_REQUEST_ERROR_006": "Request date should be current date",
"PMS_FTM_ERROR_001": "Error while fetching the FTM chip details",
"PMS_FTM_ERROR_002": "Unable to fetch approved FTM provider IDs.",
"PMS_FTM_ERROR_002": "Unable to fetch approved FTM provider Ids.",
"PMS_FTM_ERROR_003": "Error while deactivating the FTM",
"PMS_FTM_ERROR_004": "FTM ID is invalid",
"PMS_FTM_ERROR_004": "FTM Id is invalid",
"PMS_FTM_ERROR_005": "FTM Details do not exists.",
"PMS_FTM_ERROR_006": "FTM is not associated with user.",
"PMS_FTM_ERROR_007": "The selected FTM is already deactivated",
Expand Down
4 changes: 2 additions & 2 deletions pmp-revamp-ui/public/i18n/fra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@
"PMS_PRT_006": "Aucune clé API requise n'existe",
"PMS_PRT_105": "La clé API du partenaire n'est pas créée",
"PMS_PRT_011": "L'e-mail existe déjà.",
"PMS_PRT_012": " ID email invalide.",
"PMS_PRT_012": " Id email invalide.",
"PMS_PRT_013": "Numéro de mobile non valide. La longueur doit être inférieure à .",
"PMS_ATH_401": "Authentification échouée",
"PMS_PRT_106": "Le statut APIKeyReqID est en cours",
Expand Down Expand Up @@ -1152,7 +1152,7 @@
"KER-AUD-001": "La longueur maximale du PartnerId doit être 36",
"PMS_DP_FETCH_001": "Impossible de récupérer les identifiants des fournisseurs d'appareils approuvés.",
"PMS_DEVICE_ERROR_001": "L'identifiant du partenaire n'est pas associé à l'utilisateur.",
"PMS_DEVICE_ERROR_002": "SBI is not associated with partner ID.",
"PMS_DEVICE_ERROR_002": "SBI is not associated with partner Id.",
"PMS_DEVICE_ERROR_003": "Type de partenaire invalide.",
"PMS_DEVICE_ERROR_004": "Le mappage SBI et périphérique existe déjà.",
"PMS_DEVICE_ERROR_005": "SBI n'existe pas.",
Expand Down
31 changes: 16 additions & 15 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { getUserProfile } from '../../../services/UserProfileService';
import { bgOfStatus, formatDate, getErrorMessage, getStatusCode, isLangRTL } from '../../../utils/AppUtils';
import { getUserProfile, setUserProfile } from '../../../services/UserProfileService';
import { bgOfStatus, formatDate, getErrorMessage, getPartnerManagerUrl, getStatusCode, handleFileChange, handleServiceErrors, isLangRTL } from '../../../utils/AppUtils';
import LoadingIcon from '../../common/LoadingIcon';
import somethingWentWrongIcon from '../../../svg/something_went_wrong_icon.svg';
import ErrorMessage from '../../common/ErrorMessage';
import Title from '../../common/Title';
import { HttpService } from '../../../services/HttpService';

function ViewAdminApiKeyDetails() {
const { t } = useTranslation();
Expand Down Expand Up @@ -90,24 +91,24 @@ function ViewAdminApiKeyDetails() {
</div>
</div>
<div className={`${isLoginLanguageRTL ? "pr-8 ml-8" : "pl-8 mr-8"} pt-3 mb-2`}>
<div className="flex flex-wrap py-1 max-[450px]:flex-col justify-between">
<div className={`w-[37.5rem] max-[600px]:w-full mb-3`}>
<div className="flex flex-wrap py-1 max-[450px]:flex-col">
<div className={`w-[49%] max-[600px]:w-[100%] mb-3 ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id='api_key_details_partner_id_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.partnerId")}
</p>
<p id='api_key_details_partner_id_context' className="font-[600] text-vulcan text-md">
{apiKeyDetails.partnerId}
</p>
</div>
<div className="mb-3 max-[600px]:w-full w-[37.5rem]">
<div className="mb-3 max-[600px]:w-[100%] w-[49%]">
<p id='api_key_details_partner_type_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.partnerType")}
</p>
<p id='api_key_details_auth_partner_context' className="font-[600] text-vulcan text-md">
{t("partnerTypes.authPartner")}
</p>
</div>
<div className="my-3 max-[600px]:w-full w-[37.5rem]">
<div className="my-3 max-[600px]:w-[100%] w-[49%]">
<p id='api_key_details_partner_type_label' className="font-[600] text-suva-gray text-sm">
{t("viewAdminOidcClientDetails.organisation")}
</p>
Expand All @@ -117,36 +118,36 @@ function ViewAdminApiKeyDetails() {
</div>
</div>
<hr className={`h-px w-full bg-gray-200 border-0`} />
<div className={`flex flex-wrap pt-3 justify-between`}>
<div className={`w-[37.5rem] max-[600px]:w-full`}>
<div className={`flex flex-wrap pt-3`}>
<div className={`w-[49%] max-[600px]:w-[100%] ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id='api_key_details_policy_group_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.policyGroup")}
</p>
<p id='api_key_details_policy_group_name_context' className="font-[600] text-vulcan text-md">
<p id='api_key_details_policy_group_name_context' className="font-[600] text-vulcan text-md break-normal">
{apiKeyDetails.policyGroupName}
</p>
</div>
<div className={`w-[37.5rem] max-[600px]:w-full`}>
<div className={`w-[49%] max-[600px]:w-[100%]`}>
<p id='api_key_details_policy_name_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.policyName")}
</p>
<p id='api_key_details_policy_name_context' className="font-[600] text-vulcan text-md">
<p id='api_key_details_policy_name_context' className="font-[600] text-vulcan text-md break-normal">
{apiKeyDetails.policyName}
</p>
</div>
<div className={`w-[37.5rem] max-[600px]:w-full my-4`}>
<div className={`w-[49%] max-[600px]:w-[100%] my-4 ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id='api_key_details_policy_group_description_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.policyGroupDescription")}
</p>
<p id='api_key_details_policy_group_description_context' className="font-[600] text-vulcan text-md">
<p id='api_key_details_policy_group_description_context' className="font-[600] text-vulcan text-md break-normal">
{apiKeyDetails.policyGroupDescription}
</p>
</div>
<div className={`w-[37.5rem] max-[600px]:w-full my-4`}>
<div className={`w-[49%] max-[600px]:w-[100%] my-4 ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id='api_key_details_policy_name_description_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.policyNameDescription")}
</p>
<p id='api_key_details_policy_description_context' className="font-[600] text-vulcan text-md">
<p id='api_key_details_policy_description_context' className="font-[600] text-vulcan text-md break-normal">
{apiKeyDetails.policyDescription}
</p>
</div>
Expand Down
Loading

0 comments on commit dac5f8c

Please sign in to comment.