Skip to content

Commit

Permalink
MOSIP-32731 Refactor UI code into suitable folders for partner and ad…
Browse files Browse the repository at this point in the history 
…min folders

Signed-off-by: MadhuMosip <[email protected]>
  • Loading branch information
@MadhuMosip
MadhuMosip committed Oct 7, 2024
1 parent 301643e commit 35eb232
Show file tree
Hide file tree
Showing 30 changed files with 228 additions and 228 deletions.
40 changes: 20 additions & 20 deletions pmp-reactjs-ui/src/AppRoutes.js
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import { createHashRouter, RouterProvider, redirect } from 'react-router-dom';
import GuardedRoute from './auth/GuardedRoute.js';
import MainLayout from './nav/MainLayout.js';
import PartnerCertificatesList from './pages/certificates/PartnerCertificatesList.js';
import PoliciesList from './pages/policies/PoliciesList.js';
import PartnerCertificatesList from './pages/partner/certificates/PartnerCertificatesList.js';
import PoliciesList from './pages/partner/policies/PoliciesList.js';
import Dashboard from './pages/dashboard/Dashboard.js';
import ViewPolicyDetails from './pages/policies/ViewPolicyDetails.js';
import RequestPolicy from './pages/policies/RequestPolicy';
import OidcClientsList from './pages/authenticationServices/OidcClientsList.js';
import CreateOidcClient from './pages/authenticationServices/CreateOidcClient.js';
import ViewOidcClientDetails from './pages/authenticationServices/ViewOidcClientDetails.js';
import EditOidcClient from './pages/authenticationServices/EditOidcClient.js';
import ApiKeysList from './pages/authenticationServices/ApiKeysList.js';
import GenerateApiKey from './pages/authenticationServices/GenerateApiKey.js';
import ViewApiKeyDetails from './pages/authenticationServices/ViewApiKeyDetails.js';
import ViewPolicyDetails from './pages/partner/policies/ViewPolicyDetails.js';
import RequestPolicy from './pages/partner/policies/RequestPolicy';
import OidcClientsList from './pages/partner/authenticationServices/OidcClientsList.js';
import CreateOidcClient from './pages/partner/authenticationServices/CreateOidcClient.js';
import ViewOidcClientDetails from './pages/partner/authenticationServices/ViewOidcClientDetails.js';
import EditOidcClient from './pages/partner/authenticationServices/EditOidcClient.js';
import ApiKeysList from './pages/partner/authenticationServices/ApiKeysList.js';
import GenerateApiKey from './pages/partner/authenticationServices/GenerateApiKey.js';
import ViewApiKeyDetails from './pages/partner/authenticationServices/ViewApiKeyDetails.js';
import RuntimeError from './pages/common/RuntimeError.js';
import UserProfile from './nav/UserProfile.js';
import AddSbi from './pages/deviceProviderServices/AddSbi.js';
import SbiList from './pages/deviceProviderServices/SbiList.js';
import AddDevices from './pages/deviceProviderServices/AddDevices.js';
import ViewDeviceDetails from './pages/deviceProviderServices/ViewDeviceDetails.js';
import DevicesList from './pages/deviceProviderServices/DevicesList.js';
import FtmList from './pages/ftmProviderServices/FtmList.js';
import AddFtm from './pages/ftmProviderServices/AddFtm.js';
import ViewFtmChipDetails from './pages/ftmProviderServices/ViewFtmChipDetails.js';
import RootTrustCertificateList from './pages/partner/certificates/RootTrustCertificateList.js';
import AddSbi from './pages/partner/deviceProviderServices/AddSbi.js';
import SbiList from './pages/partner/deviceProviderServices/SbiList.js';
import AddDevices from './pages/partner/deviceProviderServices/AddDevices.js';
import ViewDeviceDetails from './pages/partner/deviceProviderServices/ViewDeviceDetails.js';
import DevicesList from './pages/partner/deviceProviderServices/DevicesList.js';
import FtmList from './pages/partner/ftmProviderServices/FtmList.js';
import AddFtm from './pages/partner/ftmProviderServices/AddFtm.js';
import ViewFtmChipDetails from './pages/partner/ftmProviderServices/ViewFtmChipDetails.js';
import RootTrustCertificateList from './pages/admin/certificates/RootTrustCertificateList.js';


function AppRoutes() {
Expand Down
0 .../certificates/RootTrustCertificateList.js → .../certificates/RootTrustCertificateList.js
View file
File renamed without changes.
0 ...rtificates/RootTrustCertificatesFilter.js → ...rtificates/RootTrustCertificatesFilter.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...s/authenticationServices/ApiKeysFilter.js → ...r/authenticationServices/ApiKeysFilter.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState, useEffect } from "react";
import DropdownComponent from '../common/fields/DropdownComponent.js';
import DropdownWithSearchComponent from "../common/fields/DropdownWithSearchComponent.js";
import DropdownComponent from '../../common/fields/DropdownComponent.js';
import DropdownWithSearchComponent from "../../common/fields/DropdownWithSearchComponent.js";
import { useTranslation } from 'react-i18next';
import { createDropdownData } from "../../utils/AppUtils.js";
import { createDropdownData } from "../../../utils/AppUtils.js";

function ApiKeysFilter({ filteredApiKeysList, onFilterChange }) {
const { t } = useTranslation();
Expand Down
22 changes: 11 additions & 11 deletions ...ges/authenticationServices/ApiKeysList.js → ...ner/authenticationServices/ApiKeysList.js
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import React, { useEffect, useState, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { getUserProfile } from '../../services/UserProfileService';
import { getUserProfile } from '../../../services/UserProfileService';
import {
isLangRTL, handleServiceErrors, getPartnerManagerUrl, formatDate, getStatusCode,
handleMouseClickForDropdown, toggleSortDescOrder, toggleSortAscOrder, createRequest, bgOfStatus,
onPressEnterKey
} from '../../utils/AppUtils';
import { HttpService } from '../../services/HttpService';
import ErrorMessage from '../common/ErrorMessage';
import LoadingIcon from "../common/LoadingIcon";
import rectangleGrid from '../../svg/rectangle_grid.svg';
} from '../../../utils/AppUtils';
import { HttpService } from '../../../services/HttpService';
import ErrorMessage from '../../common/ErrorMessage';
import LoadingIcon from "../../common/LoadingIcon";
import rectangleGrid from '../../../svg/rectangle_grid.svg';
import ApiKeysFilter from '../authenticationServices/ApiKeysFilter.js';
import AuthenticationServicesTab from './AuthenticationServicesTab';
import DeactivatePopup from '../common/DeactivatePopup';
import FilterButtons from '../common/FilterButtons.js';
import SortingIcon from '../common/SortingIcon.js';
import Pagination from '../common/Pagination.js';
import Title from '../common/Title.js';
import DeactivatePopup from '../../common/DeactivatePopup';
import FilterButtons from '../../common/FilterButtons.js';
import SortingIcon from '../../common/SortingIcon.js';
import Pagination from '../../common/Pagination.js';
import Title from '../../common/Title.js';

function ApiKeysList() {
const navigate = useNavigate('');
Expand Down
4 changes: 2 additions & 2 deletions ...tionServices/AuthenticationServicesTab.js → ...tionServices/AuthenticationServicesTab.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { useNavigate } from "react-router-dom";
import { useTranslation } from 'react-i18next';
import { getUserProfile } from '../../services/UserProfileService';
import { isLangRTL, onPressEnterKey } from '../../utils/AppUtils';
import { getUserProfile } from '../../../services/UserProfileService';
import { isLangRTL, onPressEnterKey } from '../../../utils/AppUtils';

function AuthenticationServicesTab( {activeOidcClient, setActiveOicdClient, activeApiKey, setActiveApiKey} ) {

Expand Down
22 changes: 11 additions & 11 deletions ...uthenticationServices/CreateOidcClient.js → ...uthenticationServices/CreateOidcClient.js
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import { useState, useEffect, useCallback } from "react";
import { useNavigate, useBlocker } from "react-router-dom";
import { useTranslation } from "react-i18next";
import DropdownComponent from '../common/fields/DropdownComponent';
import { getUserProfile } from '../../services/UserProfileService';
import DropdownComponent from '../../common/fields/DropdownComponent';
import { getUserProfile } from '../../../services/UserProfileService';
import {
getPartnerManagerUrl, handleServiceErrors, getPartnerTypeDescription, createRequest,
moveToOidcClientsList, getGrantTypes,
isLangRTL, createDropdownData, validateUrl, getAuthPartnerPolicies,
onPressEnterKey, trimAndReplace
} from '../../utils/AppUtils';
import { HttpService } from '../../services/HttpService';
import DropdownWithSearchComponent from "../common/fields/DropdownWithSearchComponent";
import LoadingIcon from "../common/LoadingIcon";
import ErrorMessage from "../common/ErrorMessage";
} from '../../../utils/AppUtils';
import { HttpService } from '../../../services/HttpService';
import DropdownWithSearchComponent from "../../common/fields/DropdownWithSearchComponent";
import LoadingIcon from "../../common/LoadingIcon";
import ErrorMessage from "../../common/ErrorMessage";
import { importJWK } from 'jose';
import BlockerPrompt from "../common/BlockerPrompt";
import Information from "../common/fields/Information";
import Title from "../common/Title";
import Confirmation from "../common/Confirmation";
import BlockerPrompt from "../../common/BlockerPrompt";
import Information from "../../common/fields/Information";
import Title from "../../common/Title";
import Confirmation from "../../common/Confirmation";

function CreateOidcClient() {
const [oidcClientName, setOidcClientName] = useState("");
Expand Down
18 changes: 9 additions & 9 deletions .../authenticationServices/EditOidcClient.js → .../authenticationServices/EditOidcClient.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import React from "react";
import { useState, useEffect, useCallback } from "react";
import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { getUserProfile } from "../../services/UserProfileService";
import { HttpService } from "../../services/HttpService";
import { moveToOidcClientsList, createRequest, isLangRTL, getPartnerManagerUrl, handleServiceErrors, getGrantTypes, validateUrl, onPressEnterKey, trimAndReplace } from "../../utils/AppUtils";
import LoadingIcon from "../common/LoadingIcon";
import ErrorMessage from "../common/ErrorMessage";
import DropdownComponent from "../common/fields/DropdownComponent";
import Information from "../common/fields/Information";
import Title from "../common/Title";
import Confirmation from "../common/Confirmation";
import { getUserProfile } from "../../../services/UserProfileService";
import { HttpService } from "../../../services/HttpService";
import { moveToOidcClientsList, createRequest, isLangRTL, getPartnerManagerUrl, handleServiceErrors, getGrantTypes, validateUrl, onPressEnterKey, trimAndReplace } from "../../../utils/AppUtils";
import LoadingIcon from "../../common/LoadingIcon";
import ErrorMessage from "../../common/ErrorMessage";
import DropdownComponent from "../../common/fields/DropdownComponent";
import Information from "../../common/fields/Information";
import Title from "../../common/Title";
import Confirmation from "../../common/Confirmation";

function EditOidcClient() {
const { t } = useTranslation();
Expand Down
22 changes: 11 additions & 11 deletions .../authenticationServices/GenerateApiKey.js → .../authenticationServices/GenerateApiKey.js
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { useState, useEffect } from "react";
import { useNavigate, useBlocker } from "react-router-dom";
import { useTranslation } from "react-i18next";
import DropdownComponent from '../common/fields/DropdownComponent';
import { getUserProfile } from '../../services/UserProfileService';
import LoadingIcon from "../common/LoadingIcon";
import ErrorMessage from "../common/ErrorMessage";
import DropdownComponent from '../../common/fields/DropdownComponent';
import { getUserProfile } from '../../../services/UserProfileService';
import LoadingIcon from "../../common/LoadingIcon";
import ErrorMessage from "../../common/ErrorMessage";
import {
getPartnerManagerUrl, handleServiceErrors, getPartnerTypeDescription, isLangRTL, moveToApiKeysList,
createRequest, getAuthPartnerPolicies, createDropdownData, trimAndReplace
} from "../../utils/AppUtils";
import { HttpService } from '../../services/HttpService';
import DropdownWithSearchComponent from "../common/fields/DropdownWithSearchComponent";
import BlockerPrompt from "../common/BlockerPrompt";
import CopyIdPopUp from "../common/CopyIdPopup";
import Title from "../common/Title";
import Confirmation from "../common/Confirmation";
} from "../../../utils/AppUtils";
import { HttpService } from '../../../services/HttpService';
import DropdownWithSearchComponent from "../../common/fields/DropdownWithSearchComponent";
import BlockerPrompt from "../../common/BlockerPrompt";
import CopyIdPopUp from "../../common/CopyIdPopup";
import Title from "../../common/Title";
import Confirmation from "../../common/Confirmation";

function GenerateApiKey() {
const { t } = useTranslation();
Expand Down
4 changes: 2 additions & 2 deletions ...thenticationServices/OidcClientsFilter.js → ...thenticationServices/OidcClientsFilter.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState, useEffect } from "react";
import DropdownComponent from '../common/fields/DropdownComponent.js';
import DropdownComponent from '../../common/fields/DropdownComponent.js';
import { useTranslation } from 'react-i18next';
import { createDropdownData } from "../../utils/AppUtils.js";
import { createDropdownData } from "../../../utils/AppUtils.js";

function OidcClientsFilter({ filteredOidcClientsList, onFilterChange }) {
const { t } = useTranslation();
Expand Down
24 changes: 12 additions & 12 deletions ...authenticationServices/OidcClientsList.js → ...authenticationServices/OidcClientsList.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import React, { useEffect, useState, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { getUserProfile } from '../../services/UserProfileService';
import { getUserProfile } from '../../../services/UserProfileService';
import {
isLangRTL, handleServiceErrors, getPartnerManagerUrl, formatDate, getStatusCode,
handleMouseClickForDropdown, toggleSortDescOrder, toggleSortAscOrder, createRequest, bgOfStatus,
onPressEnterKey
} from '../../utils/AppUtils';
import { HttpService } from '../../services/HttpService';
import ErrorMessage from '../common/ErrorMessage';
import LoadingIcon from "../common/LoadingIcon";
import rectangleGrid from '../../svg/rectangle_grid.svg';
import CopyIdPopUp from '../common/CopyIdPopup.js';
} from '../../../utils/AppUtils';
import { HttpService } from '../../../services/HttpService';
import ErrorMessage from '../../common/ErrorMessage';
import LoadingIcon from "../../common/LoadingIcon";
import rectangleGrid from '../../../svg/rectangle_grid.svg';
import CopyIdPopUp from '../../common/CopyIdPopup.js';
import OidcClientsFilter from './OidcClientsFilter';
import AuthenticationServicesTab from './AuthenticationServicesTab.js';
import DeactivatePopup from '../common/DeactivatePopup.js';
import FilterButtons from '../common/FilterButtons.js';
import SortingIcon from '../common/SortingIcon.js';
import Pagination from '../common/Pagination.js';
import Title from '../common/Title.js';
import DeactivatePopup from '../../common/DeactivatePopup.js';
import FilterButtons from '../../common/FilterButtons.js';
import SortingIcon from '../../common/SortingIcon.js';
import Pagination from '../../common/Pagination.js';
import Title from '../../common/Title.js';

function OidcClientsList() {
const navigate = useNavigate('');
Expand Down
6 changes: 3 additions & 3 deletions ...thenticationServices/ViewApiKeyDetails.js → ...thenticationServices/ViewApiKeyDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React from "react";
import { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { getUserProfile } from "../../services/UserProfileService";
import { isLangRTL, moveToApiKeysList, getStatusCode, formatDate, bgOfStatus} from "../../utils/AppUtils";
import Title from "../common/Title";
import { getUserProfile } from "../../../services/UserProfileService";
import { isLangRTL, moveToApiKeysList, getStatusCode, formatDate, bgOfStatus} from "../../../utils/AppUtils";
import Title from "../../common/Title";

function ViewApiKeyDetails() {
const { t } = useTranslation();
Expand Down
12 changes: 6 additions & 6 deletions ...ticationServices/ViewOidcClientDetails.js → ...ticationServices/ViewOidcClientDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from "react";
import { useState, useEffect, useRef } from "react";
import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { getUserProfile } from "../../services/UserProfileService";
import { isLangRTL, handleMouseClickForDropdown, getGrantTypes, bgOfStatus, onPressEnterKey } from "../../utils/AppUtils";
import { formatDate, moveToOidcClientsList, getStatusCode } from "../../utils/AppUtils";
import content_copy_icon from "../../svg/content_copy_icon.svg";
import disabled_copy_icon from "../../svg/disabled_copy_icon.svg";
import Title from "../common/Title";
import { getUserProfile } from "../../../services/UserProfileService";
import { isLangRTL, handleMouseClickForDropdown, getGrantTypes, bgOfStatus, onPressEnterKey } from "../../../utils/AppUtils";
import { formatDate, moveToOidcClientsList, getStatusCode } from "../../../utils/AppUtils";
import content_copy_icon from "../../../svg/content_copy_icon.svg";
import disabled_copy_icon from "../../../svg/disabled_copy_icon.svg";
import Title from "../../common/Title";

function ViewOidcClientDetails() {
const { t } = useTranslation();
Expand Down
24 changes: 12 additions & 12 deletions ...s/certificates/PartnerCertificatesList.js → ...r/certificates/PartnerCertificatesList.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { useEffect, useState, useRef } from "react";
import UploadCertificate from "./UploadCertificate";
import { HttpService } from "../../services/HttpService";
import { getUserProfile } from "../../services/UserProfileService";
import { isLangRTL } from "../../utils/AppUtils";
import ErrorMessage from "../common/ErrorMessage";
import SuccessMessage from "../common/SuccessMessage";
import LoadingIcon from "../common/LoadingIcon";
import { formatDate, getPartnerTypeDescription, handleMouseClickForDropdown, getPartnerManagerUrl, getPartnerDomainType } from "../../utils/AppUtils";
import { HttpService } from "../../../services/HttpService";
import { getUserProfile } from "../../../services/UserProfileService";
import { isLangRTL } from "../../../utils/AppUtils";
import ErrorMessage from "../../common/ErrorMessage";
import SuccessMessage from "../../common/SuccessMessage";
import LoadingIcon from "../../common/LoadingIcon";
import { formatDate, getPartnerTypeDescription, handleMouseClickForDropdown, getPartnerManagerUrl, getPartnerDomainType } from "../../../utils/AppUtils";
import { useTranslation } from "react-i18next";

import rectangleBox from '../../svg/rectangle_box.svg';
import fileUpload from '../../svg/file_upload_icon.svg';
import file from '../../svg/file_icon.svg';
import Title from "../common/Title";
import DownloadCertificateButton from "../common/DownloadCertificateButton";
import rectangleBox from '../../../svg/rectangle_box.svg';
import fileUpload from '../../../svg/file_upload_icon.svg';
import file from '../../../svg/file_icon.svg';
import Title from "../../common/Title";
import DownloadCertificateButton from "../../common/DownloadCertificateButton";

function PartnerCertificatesList() {
const { t } = useTranslation();
Expand Down
18 changes: 9 additions & 9 deletions ...c/pages/certificates/UploadCertificate.js → ...partner/certificates/UploadCertificate.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useState, useEffect, useCallback } from 'react';
import { HttpService } from "../../services/HttpService";
import { formatDate, getPartnerTypeDescription, getPartnerManagerUrl, getPartnerDomainType, createRequest } from '../../utils/AppUtils';
import { HttpService } from "../../../services/HttpService";
import { formatDate, getPartnerTypeDescription, getPartnerManagerUrl, getPartnerDomainType, createRequest } from '../../../utils/AppUtils';
import { useTranslation } from 'react-i18next';
import { isLangRTL } from '../../utils/AppUtils';
import { getUserProfile } from '../../services/UserProfileService';
import ErrorMessage from "../common/ErrorMessage";
import LoadingIcon from "../common/LoadingIcon";
import SuccessMessage from '../common/SuccessMessage';
import fileUploadImg from '../../svg/file_upload_certificate.svg';
import fileDescription from '../../svg/file_description.svg';
import { isLangRTL } from '../../../utils/AppUtils';
import { getUserProfile } from '../../../services/UserProfileService';
import ErrorMessage from "../../common/ErrorMessage";
import LoadingIcon from "../../common/LoadingIcon";
import SuccessMessage from '../../common/SuccessMessage';
import fileUploadImg from './../../../svg/file_upload_certificate.svg';
import fileDescription from '../../../svg/file_description.svg';
import FocusTrap from 'focus-trap-react';
import * as asn1js from "asn1js";
import { Certificate } from "pkijs";
Expand Down
Loading

0 comments on commit 35eb232

Please sign in to comment.