Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved the bugs. #1066

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Resolved the bugs. #1066

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cac256c
Resolved the issues
Anil-kumar-Majji Jan 6, 2025
acb34a0
Resolved the issues
Anil-kumar-Majji Jan 6, 2025
3c39ecb
Merge branch 'develop' into myBugs
Anil-kumar-Majji Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/nav/UserProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function UserProfile() {
const userData = getUserProfile();

return (
<div className={`mt-2 w-[100%] ${isLoginLanguageRTL ? "mr-28 ml-5" : "ml-28 mr-5"} font-inter`}>
<div className={`mt-5 w-[100%] ${isLoginLanguageRTL ? "mr-28 ml-5" : "ml-28 mr-5"} font-inter`}>
<Title title='userProfile.myProfile' backLink='/partnermanagement' />
<div className="bg-snow-white h-fit my-0.5 rounded-t-lg shadow-sm font-inter">
<div className="flex justify-between px-7 py-2 border-b max-[450px]:flex-col">
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/authenticationServices/AdminApiKeysList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ function AdminApiKeysList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='authenticationServices.authenticationServices' backLink='/partnermanagement' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/authenticationServices/AdminOidcClientsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function AdminOidcClientsList () {
{ errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='authenticationServices.authenticationServices' backLink='/partnermanagement' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function ViewAdminApiKeyDetails() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className={`flex-col mt-8 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className={`flex-col mt-5 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className="flex justify-between mb-3">
<Title title='viewApiKeyDetails.viewApiKeyDetails' subTitle='authenticationServices.authenticationServices' backLink='/partnermanagement/admin/authentication-services/api-keys-list' />
</div>
Expand Down
6 changes: 3 additions & 3 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function ViewAdminOidcClientDetails() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className={`flex-col mt-8 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className={`flex-col mt-5 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className="flex justify-between mb-3">
<Title title='viewOidcClientDetails.viewOidcClientDetails' subTitle='authenticationServices.authenticationServices' backLink='/partnermanagement/admin/authentication-services/oidc-clients-list' />
</div>
Expand Down Expand Up @@ -145,7 +145,7 @@ function ViewAdminOidcClientDetails() {

<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">
<div className="w-[49%] max-[600px]:w-[100%] mb-3">
<div className={`w-[49%] max-[600px]:w-[100%] mb-3 ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id='oidc_client_details_partner_id_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.partnerId")}
</p>
Expand Down Expand Up @@ -232,7 +232,7 @@ function ViewAdminOidcClientDetails() {
</p>
</div>
<div className="flex flex-wrap my-3 max-[800px]:flex-col max-[1020px]:flex-col">
<div className="flex-col space-y-1 w-[50%]">
<div className={`flex-col space-y-1 w-[50%] ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p id='oidc_client_details_redirect_uris' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.redirectUri")}
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/certificates/CertificatesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ function CertificatesList({ certificateType, viewCertificateDetails, uploadCerti
{successMsg && (
<SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="justify-between mb-5 flex-col">
<div className="flex justify-between">
<Title title="certificatesList.certificateTrustStore" backLink="/partnermanagement" />
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/certificates/UploadTrustCertificate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function UploadTrustCertificate() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between">
<Title title="uploadTrustCertificate.uploadTrustCertificate" subTitle={t(uploadCertificateData.breadcrumb)} backLink={uploadCertificateData.backLink} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ function AdminDevicesList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='devicesList.listOfDevices' backLink='/partnermanagement' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminSbiList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function AdminSbiList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='sbiList.listOfSbis' backLink='/partnermanagement' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/ftmProviderServices/AdminFtmList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ function AdminFtmList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='ftmList.listOfFtm' backLink='/partnermanagement' />
</div>
Expand Down
6 changes: 3 additions & 3 deletions pmp-revamp-ui/src/pages/admin/ftmProviderServices/ViewAdminFtmChipDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function ViewAdminFtmChipDetails() {
{successMsg && (
<SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} />
)}
<div className={`flex-col mt-8 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className={`flex-col mt-5 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className="flex justify-between mb-3">
<Title title={'viewFtmChipDetails.viewFtmChipDetails'} subTitle='viewFtmChipDetails.listOfFtmChipDetails' backLink='/partnermanagement/admin/ftm-chip-provider-services/ftm-list' />
</div>
Expand Down Expand Up @@ -130,7 +130,7 @@ function ViewAdminFtmChipDetails() {
</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">
<div className={`w-[49%] max-[600px]:w-[100%] mb-5 ${isLoginLanguageRTL ? "ml[1%]" : "mr-[1%]"}`}>
<div className={`w-[49%] max-[600px]:w-[100%] mb-5 ${isLoginLanguageRTL ? "ml-[1%]" : "mr-[1%]"}`}>
<p id="ftm_chip_details_label_partner_id" className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.partnerId")}
</p>
Expand All @@ -146,7 +146,7 @@ function ViewAdminFtmChipDetails() {
{t("viewFtmChipDetails.ftmChipProvider")}
</p>
</div>
<div className={`w-[50%] max-[600px]:w-[100%] mb-5 ${isLoginLanguageRTL ? "ml[1%]" : "mr-[1%]"}`}>
<div className={`w-[50%] max-[600px]:w-[100%] mb-5`}>
<p id="ftm_chip_details_label_make" className="font-[600] text-suva-gray text-sm">
{t("viewAdminOidcClientDetails.organisation")}
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/partners/PartnersList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ function PartnersList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-3">
<Title title="partnerList.partnerTitle" backLink="/partnermanagement" styleSet={style} />
</div>
Expand Down
8 changes: 4 additions & 4 deletions pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function ViewPartnerDetails() {
{errorMsg && !unexpectedError && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className={`flex-col mt-8 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className={`flex-col mt-5 bg-anti-flash-white h-full font-inter break-words max-[450px]:text-sm mb-[2%]`}>
<div className="flex justify-between mb-3">
<Title title={'viewPartnerDetails.viewPartnerDetails'} subTitle='viewPartnerDetails.listOfPartners' backLink='/partnermanagement/admin/partners-list' />
</div>
Expand Down Expand Up @@ -185,7 +185,7 @@ function ViewPartnerDetails() {
</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">
<div className="mb-3 max-[600px]:w-[100%] w-[50%]">
<div className={`mb-3 max-[600px]:w-[100%] w-[50%] ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.partnerType")}
</p>
Expand All @@ -201,7 +201,7 @@ function ViewPartnerDetails() {
{partnerDetails.organizationName}
</p>
</div>
<div className="w-[50%] max-[600px]:w-[100%] mb-3">
<div className={`w-[50%] max-[600px]:w-[100%] mb-3 ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p className="font-[600] text-suva-gray text-sm">
{t("viewPartnerDetails.firstName")}
</p>
Expand All @@ -217,7 +217,7 @@ function ViewPartnerDetails() {
{partnerDetails.lastName ?? "-"}
</p>
</div>
<div className="mb-3 max-[600px]:w-[100%] w-[50%]">
<div className={`mb-3 max-[600px]:w-[100%] w-[50%] ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p className="font-[600] text-suva-gray text-sm">
{t("userProfile.phoneNumber")}
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/CreatePolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function CreatePolicy() {
{successMsg && (
<SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} customStyle={successcustomStyle} />
)}
<div className="flex-col mt-7 w-full">
<div className="flex-col mt-5 w-full">
<div className="w-fit">
<Title title={title} subTitle={subTitle} backLink={backLink} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/CreatePolicyGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function CreatePolicyGroup() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between">
<Title title='createPolicyGroup.createPolicyGroup' subTitle='createPolicyGroup.listOfPolicyGroups' backLink={'/partnermanagement/admin/policy-manager/policy-group-list'} style={style} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/EditPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function EditPolicy() {
{successMsg && (
<SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} customStyle={successCustomStyle} />
)}
<div className="flex-col mt-7 w-full">
<div className="flex-col mt-5 w-full">
<div className="w-fit">
<Title title={title} subTitle={subTitle} backLink={backLink} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/PoliciesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ function PoliciesList({ policyType, createPolicyButtonName, createPolicy, subTit
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='policyGroupList.policies' backLink='/partnermanagement' />
<>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/PolicyGroupList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function PolicyGroupList() {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5 max-470:flex-col">
<Title title='policyGroupList.policies' backLink='/partnermanagement' />
{applyFilter || policyGroupList.length > 0 ?
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function ViewPolicy() {
<LoadingIcon />
)}
{dataLoaded && (
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-5">
<Title title={viewPolicyPageHeaders.header} subTitle={viewPolicyPageHeaders.subTitle} backLink={viewPolicyPageHeaders.backLink} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicyGroupDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function ViewPolicyGroupDetails() {

return (
<>
<div className={`w-[100%] ${isLoginLanguageRTL ? "mr-28 ml-5" : "ml-28 mr-5"} font-inter mt-7 overflow-x-scroll`}>
<div className={`w-[100%] ${isLoginLanguageRTL ? "mr-28 ml-5" : "ml-28 mr-5"} font-inter mt-5 overflow-x-scroll`}>
<div className="flex justify-between mb-3">
<Title title='viewPolicyGroupDetails.viewPolicyGroup' subTitle='viewPolicyGroupDetails.listOfPolicyGroups' backLink='/partnermanagement/admin/policy-manager/policy-group-list' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/admin/policyRequests/PolicyRequestsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ useEffect(() => {
{errorMsg && (
<ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
)}
<div className="flex-col mt-7">
<div className="flex-col mt-5">
<div className="flex justify-between mb-3">
<Title title='partnerPolicyMappingRequestList.partnerPolicyMappingRequestTitle' backLink='/partnermanagement' />
</div>
Expand Down
4 changes: 2 additions & 2 deletions pmp-revamp-ui/src/pages/admin/policyRequests/ViewPolicyRequestDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function ViewPolicyRequestDetails() {
</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">
<div className="mb-3 max-[600px]:w-[100%] w-[50%]">
<div className={`mb-3 max-[600px]:w-[100%] w-[50%] ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p className="font-[600] text-suva-gray text-sm">
{t("viewPolicyRequest.partnerType")}
</p>
Expand All @@ -79,7 +79,7 @@ function ViewPolicyRequestDetails() {
</div>
</div>
<div className={`flex flex-wrap pt-3`}>
<div className={`w-[50%] max-[600px]:w-[100%] mb-3 px-2`}>
<div className={`w-[50%] max-[600px]:w-[100%] mb-3 ${isLoginLanguageRTL ? "pl-[1%]" : "pr-[1%]"}`}>
<p className="font-[600] text-suva-gray text-sm">
{t("viewPolicyRequest.policyId")}
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmp-revamp-ui/src/pages/dashboard/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ function Dashboard() {
{t('dashboard.welcomeMsg', { firstName: getUserProfile().firstName, lastName: getUserProfile().lastName })}!
</p>
</div>
<div className="flex mt-2 ml-[3%] flex-wrap break-words">
<div className="flex mt-2 ml-[1.8rem] flex-wrap break-words">
{!isPartnerAdmin &&
< div role='button' id='dashboard_partner_certificate_list_card' onClick={() => partnerCertificatesList()} className="w-[23.5%] min-h-[50%] p-6 mr-3 mb-4 pt-16 bg-white border border-gray-200 shadow cursor-pointer text-center rounded-xl" tabIndex="0" onKeyDown={(e) => onPressEnterKey(e, () => partnerCertificatesList())}>
<div className="flex justify-center mb-5">
Expand Down
Loading
Loading