Skip to content

Commit

Permalink
Updated with the upstream develop branch
Browse files Browse the repository at this point in the history 
Signed-off-by: Anil_Kumar_Majji <[email protected]>
  • Loading branch information
@Anil-kumar-Majji
Anil-kumar-Majji committed Feb 7, 2025
1 parent d26c9fa commit 02dcca8
Show file tree
Hide file tree
Showing 44 changed files with 460 additions and 664 deletions.
4 changes: 2 additions & 2 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/AdminApiKeysList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getUserProfile } from '../../../services/UserProfileService';
import {
isLangRTL, handleMouseClickForDropdown, resetPageNumber, onClickApplyFilter, setPageNumberAndPageSize,
getPartnerManagerUrl, handleServiceErrors, onResetFilter, formatDate, bgOfStatus, getStatusCode, onPressEnterKey, createRequest,
escapeKeyHandler, setSubmenuRef
escapeKeyHandler
} from '../../../utils/AppUtils';
import ErrorMessage from '../../common/ErrorMessage';
import LoadingIcon from '../../common/LoadingIcon';
Expand Down Expand Up @@ -298,7 +298,7 @@ function AdminApiKeysList() {
</div>
</td>
<td className="text-center cursor-default">
<div ref={setSubmenuRef(submenuRef, index)}>
<div ref={(el) => (submenuRef.current[index] = el)}>
<button id={"api_key_list_action_view" + (index + 1)} onClick={() => setActionId(index === actionId ? null : index)} className={`font-semibold mb-0.5 text-[#191919] cursor-pointer text-center`}>
...
</button>
Expand Down
22 changes: 7 additions & 15 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/AdminApiKeysListFilter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { useState, useEffect } from "react";
import DropdownComponent from "../../common/fields/DropdownComponent.js";
import TextInputComponent from "../../common/fields/TextInputComponent.js";
import { useTranslation } from "react-i18next";
import { createDropdownData, isLangRTL } from "../../../utils/AppUtils.js";
import { getUserProfile } from '../../../services/UserProfileService';
import { createDropdownData } from "../../../utils/AppUtils.js";
import ApplyFilterButton from "../../common/ApplyFilterButton.js";

function AdminApiKeysListFilter({ onApplyFilter }) {
const { t } = useTranslation();
const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
const [status, setStatus] = useState([]);
const [statusDropdownData, setStatusDropdownData] = useState([
{ status: 'activated' },
Expand Down Expand Up @@ -104,18 +103,11 @@ function AdminApiKeysListFilter({ onApplyFilter }) {
isPlaceHolderPresent={true}
id="status_filter"
/>
<div className={`mt-6 mr-6 ${isLoginLanguageRTL ? "mr-auto" : "ml-auto"}`}>
<button
id="apply_filter_btn"
onClick={() => onApplyFilter(filters)}
type="button"
disabled={areFiltersEmpty()}
className={`h-10 text-sm font-semibold px-7 text-white rounded-md ml-6
${areFiltersEmpty() ? 'bg-[#A5A5A5] cursor-auto' : 'bg-tory-blue'}`}
>
{t("partnerList.applyFilter")}
</button>
</div>
<ApplyFilterButton
filters={filters}
onApplyFilter={onApplyFilter}
areFiltersEmpty={areFiltersEmpty}
/>
</div>
);
}
Expand Down
22 changes: 7 additions & 15 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/AdminOidcClientsFilter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { useState, useEffect } from "react";
import DropdownComponent from "../../common/fields/DropdownComponent.js";
import TextInputComponent from "../../common/fields/TextInputComponent.js";
import { useTranslation } from "react-i18next";
import { createDropdownData, isLangRTL } from "../../../utils/AppUtils.js";
import { getUserProfile } from '../../../services/UserProfileService';
import { createDropdownData } from "../../../utils/AppUtils.js";
import ApplyFilterButton from "../../common/ApplyFilterButton.js";

function AdminOidcClientsFilter ({ onApplyFilter }) {
const { t } = useTranslation();
const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
const [status, setStatus] = useState([]);
const [statusDropdownData, setStatusDropdownData] = useState([
{ status: 'ACTIVE' },
Expand Down Expand Up @@ -104,18 +103,11 @@ function AdminOidcClientsFilter ({ onApplyFilter }) {
isPlaceHolderPresent={true}
id="status_filter"
/>
<div className={`mt-6 mr-6 ${isLoginLanguageRTL ? "mr-auto" : "ml-auto"}`}>
<button
id="apply_filter__btn"
onClick={() => onApplyFilter(filters)}
type="button"
disabled={areFiltersEmpty()}
className={`h-10 text-sm font-semibold px-7 text-white rounded-md ml-6
${areFiltersEmpty() ? 'bg-[#A5A5A5] cursor-auto' : 'bg-tory-blue'}`}
>
{t("partnerList.applyFilter")}
</button>
</div>
<ApplyFilterButton
filters={filters}
onApplyFilter={onApplyFilter}
areFiltersEmpty={areFiltersEmpty}
/>
</div>
);
}
Expand Down
5 changes: 2 additions & 3 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/AdminOidcClientsList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import {
createRequest,
populateClientNames,
getClientNameLangMap,
escapeKeyHandler,
setSubmenuRef
escapeKeyHandler
} from '../../../utils/AppUtils';
import ErrorMessage from '../../common/ErrorMessage';
import LoadingIcon from '../../common/LoadingIcon';
Expand Down Expand Up @@ -339,7 +338,7 @@ function AdminOidcClientsList() {
</div>
</td>
<td className="text-center cursor-default">
<div ref={setSubmenuRef(submenuRef, index)}>
<div ref={(el) => (submenuRef.current[index] = el)}>
<button id={"oidc_client_list_action_view" + (index + 1)} onClick={() => setActionId(index === actionId ? null : index)} className={`font-semibold mb-0.5 text-[#191919] cursor-pointer text-center`}>
...
</button>
Expand Down
25 changes: 6 additions & 19 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { getUserProfile, setUserProfile } from '../../../services/UserProfileService';
import { bgOfStatus, formatDate, getErrorMessage, getPartnerManagerUrl, getStatusCode, handleFileChange, handleServiceErrors, isLangRTL } from '../../../utils/AppUtils';
import { getUserProfile } from '../../../services/UserProfileService';
import { bgOfStatus, formatDate, getStatusCode, 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';
import UnExpectedErrorScreen from '../../common/UnExpectedErrorScreen';

function ViewAdminApiKeyDetails() {
const { t } = useTranslation();
Expand All @@ -25,9 +24,9 @@ function ViewAdminApiKeyDetails() {

useEffect(() => {
const data = localStorage.getItem('selectedApiKeyAttributes');
if(!data){
if (!data) {
setUnexpectedError(true);
return ;
return;
}
const apiKeyData = JSON.parse(data);
setApiKeyDetails(apiKeyData);
Expand All @@ -53,19 +52,7 @@ function ViewAdminApiKeyDetails() {
</div>

{unexpectedError && (
<div className={`bg-[#FCFCFC] w-full mt-3 rounded-lg shadow-lg items-center`}>
<div className="flex items-center justify-center p-24">
<div className="flex flex-col justify-center items-center">
<img className="max-w-60 min-w-52 my-2" src={somethingWentWrongIcon} alt="" />
<p className="text-base font-semibold text-[#6F6E6E] pt-4">{t('commons.unexpectedError')}</p>
<p className="text-sm font-semibold text-[#6F6E6E] pt-1 pb-4">{getErrorMessage(errorCode, t, errorMsg)}</p>
<button onClick={moveToApiClientsList} type="button"
className={`w-32 h-10 flex items-center justify-center font-semibold rounded-md text-sm mx-8 py-3 bg-tory-blue text-white`}>
{t('commons.goBack')}
</button>
</div>
</div>
</div>
<UnExpectedErrorScreen errCode={errorCode} errMsg={errorMsg} backLink={moveToApiClientsList} />
)}

{!unexpectedError && (
Expand Down
21 changes: 5 additions & 16 deletions pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { bgOfStatus, copyClientId, formatDate, formatPublicKey, getErrorMessage,
import { getUserProfile } from '../../../services/UserProfileService';
import Title from '../../common/Title';
import { useNavigate } from 'react-router-dom';
import somethingWentWrongIcon from '../../../svg/something_went_wrong_icon.svg';
import ErrorMessage from '../../common/ErrorMessage';
import LoadingIcon from '../../common/LoadingIcon';
import content_copy_icon from "../../../svg/content_copy_icon.svg";
import disabled_copy_icon from "../../../svg/disabled_copy_icon.svg";
import { HttpService } from '../../../services/HttpService';
import UnExpectedErrorScreen from '../../common/UnExpectedErrorScreen';

function ViewAdminOidcClientDetails() {
const { t } = useTranslation();
Expand Down Expand Up @@ -88,19 +88,8 @@ function ViewAdminOidcClientDetails() {
<Title title='viewOidcClientDetails.viewOidcClientDetails' subTitle='oidcClientsList.listOfOidcClients' backLink='/partnermanagement/admin/authentication-services/oidc-clients-list' />
</div>
{unexpectedError && (
<div className={`bg-[#FCFCFC] w-full mt-3 rounded-lg shadow-lg items-center`}>
<div className="flex items-center justify-center p-24">
<div className="flex flex-col justify-center items-center">
<img className="max-w-60 min-w-52 my-2" src={somethingWentWrongIcon} alt="" />
<p className="text-base font-semibold text-[#6F6E6E] pt-4">{t('commons.unexpectedError')}</p>
<p className="text-sm font-semibold text-[#6F6E6E] pt-1 pb-4">{getErrorMessage(errorCode, t, errorMsg)}</p>
<button onClick={moveToOidcClientsList} type="button"
className={`w-32 h-10 flex items-center justify-center font-semibold rounded-md text-sm mx-8 py-3 bg-tory-blue text-white`}>
{t('commons.goBack')}
</button>
</div>
</div>
</div>
<UnExpectedErrorScreen errCode={errorCode} errMsg={errorMsg} backLink={moveToOidcClientsList} />

)}
{!unexpectedError && (
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
Expand All @@ -123,14 +112,14 @@ function ViewAdminOidcClientDetails() {
</div>

<button id="oidc_client_details_copy_id" className={`${oidcClientDetails.status === "ACTIVE" ? 'bg-[#F0F5FF] border-[#BED3FF] cursor-pointer hover:shadow-md' : 'bg-gray-200 border-gray-400 cursor-default'} border h-[4%] w-[15%] max-[450px]:w-[40%] max-[800px]:w-[25%] ${isLoginLanguageRTL ? "pr-[3%] pl-[1.5%]" : "pl-[3%] pr-[1%]"} py-[0.5%] rounded-md text-right`}
onClick={() => copyClientId(selectedClientData, selectedClientData.clientId, setCopied)} tabIndex={oidcClientDetails.status === "ACTIVE" && "0"}>
onClick={() => copyClientId(selectedClientData, selectedClientData.clientId, setCopied)} tabIndex={oidcClientDetails.status === "ACTIVE" && "0"}>
<p className="text-sm font-semibold text-[#333333]">{t('viewOidcClientDetails.oidcClientId')}</p>
<div className="flex space-x-1 items-center">
<p className={`text-md font-bold ${selectedClientData.status === "ACTIVE" ? 'text-[#1447B2]' : 'text-gray-400'} truncate`}>
{selectedClientData.clientId}
</p>
{selectedClientData.status === "ACTIVE" ? (
<img id="oidc_client_details_copy_id_icon" src={content_copy_icon} alt=""/>
<img id="oidc_client_details_copy_id_icon" src={content_copy_icon} alt="" />
) : (
<img src={disabled_copy_icon} alt="" />
)}
Expand Down
22 changes: 7 additions & 15 deletions pmp-revamp-ui/src/pages/admin/certificates/CertificatesFilter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
import { useState, useEffect } from 'react';
import DropdownComponent from '../../common/fields/DropdownComponent.js';
import { useTranslation } from 'react-i18next';
import { createDropdownData, isLangRTL } from '../../../utils/AppUtils.js';
import { createDropdownData } from '../../../utils/AppUtils.js';
import TextInputComponent from '../../common/fields/TextInputComponent.js';
import { getUserProfile } from '../../../services/UserProfileService.js';
import ApplyFilterButton from '../../common/ApplyFilterButton.js';

function CertificatesFilter({ onApplyFilter }) {
const { t } = useTranslation();
const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
const [partnerDomainData, setPartnerDomainData] = useState([]);
const [partnerDomainDropdownData, setPartnerDomainDropdownData] = useState([
{ partnerDomain: 'AUTH' },
Expand Down Expand Up @@ -89,18 +88,11 @@ function CertificatesFilter({ onApplyFilter }) {
styleSet={styleSet}
id='cert_issued_by_domain_filter'
/>
<div className={`mt-6 mr-6 ${isLoginLanguageRTL ? "mr-auto" : "ml-auto"}`}>
<button
id="apply_filter__btn"
onClick={() => onApplyFilter(filters)}
type="button"
disabled={areFiltersEmpty()}
className={`h-10 text-sm font-semibold px-7 text-white rounded-md ml-6
${areFiltersEmpty() ? 'bg-[#A5A5A5] cursor-auto' : 'bg-tory-blue'}`}
>
{t("partnerList.applyFilter")}
</button>
</div>
<ApplyFilterButton
filters={filters}
onApplyFilter={onApplyFilter}
areFiltersEmpty={areFiltersEmpty}
/>
</div>
</>
);
Expand Down
5 changes: 2 additions & 3 deletions pmp-revamp-ui/src/pages/admin/certificates/CertificatesList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import {
resetPageNumber,
getPartnerManagerUrl,
downloadCaCertificate,
handleKeymanagerErrors,
setSubmenuRef
handleKeymanagerErrors
} from "../../../utils/AppUtils";
import LoadingIcon from "../../common/LoadingIcon";
import ErrorMessage from "../../common/ErrorMessage";
Expand Down Expand Up @@ -290,7 +289,7 @@ function CertificatesList({ certificateType, viewCertificateDetails, uploadCerti
<td onClick={() => viewCertificateDetails(certificate)} className={`px-2`}>{formatDate(certificate.uploadTime, "dateTime")}</td>
<td onClick={() => viewCertificateDetails(certificate)} className={`px-2 ${certificate.status === false && 'text-crimson-red'}`}>{certificate.status === true ? t('statusCodes.valid') : t('statusCodes.expired')}</td>
<td className="text-center cursor-default">
<div ref={setSubmenuRef(submenuRef, index)}>
<div ref={(el) => (submenuRef.current[index] = el)}>
<button id={"certificate_list_view" + (index + 1)} onClick={() => setActionId(index === actionId ? null : index)} className={`font-semibold mb-0.5 cursor-pointer text-center`}>
...
</button>
Expand Down
Loading

0 comments on commit 02dcca8

Please sign in to comment.