-
- Created: {dateConversion(props.created)} -
+
diff --git a/src/components/Authentication/ResetPassword.tsx b/src/components/Authentication/ResetPassword.tsx
index fb56ef23d..2112dd19f 100644
--- a/src/components/Authentication/ResetPassword.tsx
+++ b/src/components/Authentication/ResetPassword.tsx
@@ -2,155 +2,219 @@ import 'react-toastify/dist/ReactToastify.css';
import * as yup from 'yup';
-import { Alert, Button, Label } from 'flowbite-react';
+import { Alert, Button, Label } from 'flowbite-react';;
+import { apiStatusCodes, passwordRegex, storageKeys } from '../../config/CommonConstant.js';
+import { useEffect, useState } from 'react';
import { Field, Form, Formik } from 'formik';
-import { passwordRegex } from '../../config/CommonConstant.js';
-import { useState } from 'react';
-
import { getSupabaseClient } from '../../supabase';
import { pathRoutes } from '../../config/pathRoutes.js';
import PasswordSuggestionBox from './PasswordSuggestionBox.js';
import FooterBar from './FooterBar.js';
import NavBar from './NavBar.js';
+import { addPasskeyUserDetails, passwordEncryption, setToLocalStorage } from '../../api/Auth.js';
+import type { AxiosResponse } from 'axios';
+import React from 'react';
import { PassInvisible, PassVisible, SignUpArrow } from './Svg.js';
interface passwordValues {
- password: string;
- confirmPassword: string;
+ password: string;
+ confirmPassword: string;
}
const ResetPassword = () => {
- const [loading, setLoading] = useState(false);
- const [erroMsg, setErrMsg] = useState(null);
- const [message] = useState('');
- const [passwordVisible, setPasswordVisible] = useState(false);
- const [confirmPasswordVisible, setConfirmPasswordVisible] = useState(false);
- const [showSuggestion, setShowSuggestion] = useState(false);
-
- const submit = async (passwordDetails: passwordValues) => {
- setLoading(true);
-
- const { error } = await getSupabaseClient().auth.updateUser({
- password: passwordDetails?.password,
- });
-
- setLoading(false);
- if (!error) {
- window.location.href = `${pathRoutes.auth.sinIn}?isPasswordSet=true`;
- } else {
- setErrMsg(error.message);
- }
- };
-
- return (
- <>
-
diff --git a/src/components/Issuance/ConnectionList.tsx b/src/components/Issuance/ConnectionList.tsx
index 599d1cee3..d054c1a63 100644
--- a/src/components/Issuance/ConnectionList.tsx
+++ b/src/components/Issuance/ConnectionList.tsx
@@ -8,6 +8,8 @@ import type { TableData } from "../../commonComponents/datatable/interface";
import { apiStatusCodes } from "../../config/CommonConstant";
import { AlertComponent } from "../AlertComponent";
import { dateConversion } from "../../utils/DateConversion";
+import DateTooltip from "../Tooltip";
+import React from "react";
const ConnectionList = (props: { selectConnection: (connections: TableData[]) => void; }) => {
@@ -38,7 +40,7 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
const createdOn = ele?.createdAt ? ele?.createdAt : 'Not available'
return {
data: [{
- data:
-
+ );
};
export default ResetPassword;
diff --git a/src/components/Authentication/SignInUserPasskey.tsx b/src/components/Authentication/SignInUserPasskey.tsx
index 01d58ccca..37286be51 100644
--- a/src/components/Authentication/SignInUserPasskey.tsx
+++ b/src/components/Authentication/SignInUserPasskey.tsx
@@ -95,13 +95,12 @@ const SignInUserPasskey = (signInUserProps: signInUserProps) => {
...attResp,
challangeId
};
+ setFidoLoader(false)
const verificationResp = await verifyAuthenticationMethod(verifyAuthenticationObj, { userName: email });
const { data } = verificationResp as AxiosResponse
-
if (data?.data.verified) {
const payload: UserSignInData = {
email: email,
- password: passwordEncryption('Password@1'),
isPasskey: true
};
@@ -235,7 +234,7 @@ const SignInUserPasskey = (signInUserProps: signInUserProps) => {
-
+
-
-
- 
-
-
-
-
+
- {(message || erroMsg) && (
- setErrMsg(null)}
- >
-
-
- )}
-
- {
- submit(values);
- }}
- >
- {(formikHandlers): JSX.Element => (
-
+ {message || erroMsg}
- -
-
-
-
- Reset Password
-
-
- Please set new password
-
-
-
-
-
-
-
+ data: {dateConversion(createdOn)} },
]
}
})
@@ -104,8 +108,8 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
}, [selectedConnectionList])
return (
-
) => {
const inputElement = event.target as HTMLInputElement;
selectConnection(userName, connectionId, inputElement.checked)
@@ -46,7 +48,9 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
value="" className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer" />
},
- { data: userName }, { data: connectionId }, {data:dateConversion(createdOn)},
+ { data: userName },
+ { data: connectionId },
+ {data:
-
+
+
{dateConversion(ele?.createDateTime)} : 'Not available' },
{ data: ele.revocable === true ? Yes : No }
]
}
diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index b6248cf7c..b6676bb03 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -1,7 +1,7 @@
'use client';
import { ChangeEvent, useEffect, useState } from 'react';
-import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
+import { IssueCredential, IssueCredentialUserText } from '../../common/enums';
import { AlertComponent } from '../AlertComponent';
import type { AxiosResponse } from 'axios';
@@ -9,11 +9,14 @@ import BreadCrumbs from '../BreadCrumbs';
import { Button } from 'flowbite-react';
import CustomSpinner from '../CustomSpinner';
import DataTable from '../../commonComponents/datatable';
+import DateTooltip from '../Tooltip';
import { EmptyListMessage } from '../EmptyListComponent';
-import { IssueCredential, IssueCredentialUserText } from '../../common/enums';
+import { Features } from '../../utils/enums/features';
import React from 'react';
+import RoleViewButton from '../RoleViewButton';
import SearchInput from '../SearchInput';
import type { TableData } from '../../commonComponents/datatable/interface';
+import { apiStatusCodes } from '../../config/CommonConstant';
import { dateConversion } from '../../utils/DateConversion';
import { getIssuedCredentials } from '../../api/issuance';
import { pathRoutes } from '../../config/pathRoutes';
@@ -56,7 +59,7 @@ const CredentialList = () => {
: 'Not available',
},
{ data: schemaName },
- { data: dateConversion(issuedCredential.updatedAt) },
+ { data: {dateConversion(issuedCredential.updatedAt)} },
{
data: (
{
Connection List
@@ -117,7 +121,7 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) => setError(null) }} /> -
-
-
-
-
+
+ {
- const [fidoError, setFidoError] = useState("")
- const [fidoLoader, setFidoLoader] = useState(false)
- const [OrgUserEmail, setOrgUserEmail] = useState('')
- const [deviceList, setDeviceList] = useState([])
- const [addSuccess, setAddSuccess] = useState(null)
- const [addfailure, setAddFailur] = useState(null)
- const [isEditProfileOpen, setIsEditProfileOpen] = useState(false);
- const [prePopulatedUserProfile, setPrePopulatedUserProfile] = useState(null);
-
-
- const fetchUserProfile = async () => {
- try {
- const token = await getFromLocalStorage(storageKeys.TOKEN);
- const userDetailsResponse = await getUserProfile(token);
- const { data } = userDetailsResponse as AxiosResponse;
-
- if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
- setPrePopulatedUserProfile(data?.data);
- }
- } catch (error) {
- }
- };
-
- const toggleEditProfile = async () => {
- await fetchUserProfile()
- setIsEditProfileOpen(!isEditProfileOpen);
- };
-
- const showFidoError = (error: unknown): void => {
- const err = error as AxiosError
- if (err.message.includes("The operation either timed out or was not allowed")) {
- const [errorMsg] = err.message.split('.')
- setFidoError(errorMsg)
- setTimeout(() => {
- setFidoError("")
- }, 5000)
- } else {
- setFidoError(err.message)
- setTimeout(() => {
- setFidoError("")
- }, 5000)
+import PasskeyAddDevice from '../../commonComponents/PasseyAddDevicePopup';
+import { apiRoutes } from '../../config/apiRoutes';
+import React from 'react';
+
+const AddPasskey = () => {
+ const [fidoError, setFidoError] = useState("")
+ const [fidoLoader, setFidoLoader] = useState(true)
+ const [OrgUserEmail, setOrgUserEmail] = useState('')
+ const [deviceList, setDeviceList] = useState([])
+ const [addSuccess, setAddSuccess] = useState(null)
+ const [addfailure, setAddFailur] = useState(null)
+ const [isEditProfileOpen, setIsEditProfileOpen] = useState(false);
+ const [prePopulatedUserProfile, setPrePopulatedUserProfile] = useState(null);
+ const [disableFlag, setDisableFlag] = useState(false)
+
+
+ const [openModel, setOpenModel] = useState(false)
+
+ const props = { openModel, setOpenModel };
+ const fetchUserProfile = async () => {
+ try {
+ const token = await getFromLocalStorage(storageKeys.TOKEN);
+ const userDetailsResponse = await getUserProfile(token);
+ const { data } = userDetailsResponse as AxiosResponse;
+
+ if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+ setPrePopulatedUserProfile(data?.data);
}
+ } catch (error) {
}
+ };
+ const toggleEditProfile = async () => {
+ await fetchUserProfile()
+ setIsEditProfileOpen(!isEditProfileOpen);
+ };
- const addDevice = async (): Promise => {
- try {
- registerWithPasskey(true)
- } catch (error) {
- setFidoLoader(false)
- }
+ const showFidoError = (error: unknown): void => {
+ const err = error as AxiosError
+ if (err.message.includes("The operation either timed out or was not allowed")) {
+ const [errorMsg] = err.message.split('.')
+ setFidoError(errorMsg)
+ } else {
+ setFidoError(err.message)
}
+ }
- const setProfile = async () => {
- const UserEmail = await getFromLocalStorage(storageKeys.USER_EMAIL)
- setOrgUserEmail(UserEmail)
- return UserEmail
+ const addDevice = async (): Promise => {
+ try {
+ setOpenModel(true)
+ } catch (error) {
+ setFidoLoader(false)
}
-
- useEffect(() => {
- fetchUserProfile();
+ }
+ const setProfile = async () => {
+ const UserEmail = await getFromLocalStorage(storageKeys.USER_EMAIL)
+ setOrgUserEmail(UserEmail)
+ return UserEmail
+ }
+
+ useEffect(() => {
+ fetchUserProfile();
}, []);
- const registerWithPasskey = async (flag: boolean): Promise => {
- try {
- const RegistrationOption: RegistrationOptionInterface = {
- userName: OrgUserEmail,
- deviceFlag: flag
- }
- // Generate Registration Option
- const generateRegistrationResponse = await generateRegistrationOption(RegistrationOption)
- const { data } = generateRegistrationResponse as AxiosResponse
- const opts = data?.data
- const challangeId = data?.data?.challenge
- if (opts) {
- opts.authenticatorSelection = {
- residentKey: "preferred",
- requireResidentKey: false,
- userVerification: "preferred"
- }
- }
- const attResp = await startRegistration(opts)
-
- const verifyRegistrationObj = {
- ...attResp,
- challangeId
+ const registerWithPasskey = async (flag: boolean): Promise => {
+ try {
+ const RegistrationOption: RegistrationOptionInterface = {
+ userName: OrgUserEmail,
+ deviceFlag: flag
+ }
+ // Generate Registration Option
+ const generateRegistrationResponse = await generateRegistrationOption(RegistrationOption)
+ const { data } = generateRegistrationResponse as AxiosResponse
+ const opts = data?.data
+ const challangeId = data?.data?.challenge
+ if (opts) {
+ opts.authenticatorSelection = {
+ residentKey: "preferred",
+ requireResidentKey: false,
+ userVerification: "preferred"
}
+ }
+ setOpenModel(false)
+ const attResp = await startRegistration(opts)
- await verifyRegistrationMethod(verifyRegistrationObj, OrgUserEmail);
- } catch (error) {
- showFidoError(error)
+ const verifyRegistrationObj = {
+ ...attResp,
+ challangeId
}
+ console.log("verifyRegistrationObj::::", verifyRegistrationObj)
+ await verifyRegistrationMethod(verifyRegistrationObj, OrgUserEmail);
+ } catch (error) {
+ showFidoError(error)
}
+ }
- const verifyRegistrationMethod = async (verifyRegistrationObj, OrgUserEmail: string) => {
- try {
- const verificationRegisterResp = await verifyRegistration(verifyRegistrationObj, OrgUserEmail)
- const { data } = verificationRegisterResp as AxiosResponse
- const credentialID = data?.data?.newDevice?.credentialID
+ const verifyRegistrationMethod = async (verifyRegistrationObj, OrgUserEmail: string) => {
+ try {
+ const verificationRegisterResp = await verifyRegistration(verifyRegistrationObj, OrgUserEmail)
+ const { data } = verificationRegisterResp as AxiosResponse
+ const credentialID = data?.data?.newDevice?.credentialID
- if (data?.data?.verified) {
- let platformDeviceName = ''
+ if (data?.data?.verified) {
+ let platformDeviceName = ''
- if (verifyRegistrationObj?.authenticatorAttachment === "cross-platform") {
- platformDeviceName = 'Passkey'
- } else {
- platformDeviceName = navigator.platform
- }
+ if (verifyRegistrationObj?.authenticatorAttachment === "cross-platform") {
+ platformDeviceName = 'Passkey'
+ } else {
+ platformDeviceName = navigator.platform
+ }
- const deviceBody: IdeviceBody = {
- userName: OrgUserEmail,
- credentialId: credentialID,
- deviceFriendlyName: platformDeviceName
- }
- await addDeviceDetailsMethod(deviceBody)
+ const deviceBody: IdeviceBody = {
+ userName: OrgUserEmail,
+ credentialId: credentialID,
+ deviceFriendlyName: platformDeviceName
}
- } catch (error) {
- showFidoError(error)
+ await addDeviceDetailsMethod(deviceBody)
}
+ } catch (error) {
+ showFidoError(error)
}
-
- const addDeviceDetailsMethod = async (deviceBody: IdeviceBody) => {
- try {
- const deviceDetailsResp = await addDeviceDetails(deviceBody)
- const { data } = deviceDetailsResp as AxiosResponse
- if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
- setAddSuccess("Device added successfully")
- userDeviceDetails()
- } else {
- setAddFailur(deviceDetailsResp as string)
- }
+ }
+
+ const addDeviceDetailsMethod = async (deviceBody: IdeviceBody) => {
+ try {
+ const deviceDetailsResp = await addDeviceDetails(deviceBody)
+ const { data } = deviceDetailsResp as AxiosResponse
+ if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+ setAddSuccess("Device added successfully")
setTimeout(() => {
+ // userDeviceDetails() // required
setAddSuccess('')
- setAddFailur('')
- }, 3000);
- } catch (error) {
- showFidoError(error)
+ window.location.href = `${apiRoutes.auth.profile}`
+ }, 4000)
+ } else {
+ setAddFailur(deviceDetailsResp as string)
}
+ } catch (error) {
+ showFidoError(error)
}
-
- //userDeviceDetails on page reload
- const userDeviceDetails = async (): Promise => {
- try {
- const config = { headers: {} }
- setFidoLoader(true)
-
- const userDeviceDetailsResp = await getUserDeviceDetails(OrgUserEmail)
- setFidoLoader(false)
-
- if (userDeviceDetailsResp) {
- const deviceDetails = Object.keys(userDeviceDetailsResp?.data?.data)?.length > 0 ?
- userDeviceDetailsResp?.data?.data.map((data) => {
- data.lastChangedDateTime = dateConversion(data.lastChangedDateTime) ? dateConversion(data.lastChangedDateTime) : "-"
- return data
- })
- : []
- setDeviceList(deviceDetails)
- }
- } catch (error) {
- setFidoLoader(false)
+ }
+
+ //userDeviceDetails on page reload
+ const userDeviceDetails = async (): Promise => {
+ try {
+ setFidoLoader(true)
+
+ const userDeviceDetailsResp = await getUserDeviceDetails(OrgUserEmail)
+ const { data } = userDeviceDetailsResp as AxiosResponse
+ setFidoLoader(false)
+ if (userDeviceDetailsResp) {
+ const deviceDetails = Object.keys(data)?.length > 0 ?
+ userDeviceDetailsResp?.data?.data.map((data) => {
+ data.lastChangedDateTime = data.lastChangedDateTime ? data.lastChangedDateTime : "-"
+ return data
+ })
+ : []
+ if (data?.data?.length === 1){
+ setDisableFlag(true)
+ }
+ setDeviceList(deviceDetails)
}
+ } catch (error) {
+ setAddFailur("Error while fetching the device details")
+ setFidoLoader(false)
}
+ }
+
+ useEffect(() => {
+ if (OrgUserEmail) {
+ userDeviceDetails();
+ } else {
+ setProfile();
+ }
+ }, [OrgUserEmail]);
+
+ const updatePrePopulatedUserProfile = (updatedProfile: UserProfile) => {
+ setPrePopulatedUserProfile(updatedProfile);
+ };
+
+ return (
+
+
+
+
+
+
+ User's Profile +
+ + {fidoLoader + ?
+
+
+ :
+
+
+
+ {/* first section */}
+
+ buttonContent={'Create'}
+ svgComponent={}
onClick={() => {
diff --git a/src/components/Resources/Schema/ViewSchema.tsx b/src/components/Resources/Schema/ViewSchema.tsx
index 5384cbfa4..669857437 100644
--- a/src/components/Resources/Schema/ViewSchema.tsx
+++ b/src/components/Resources/Schema/ViewSchema.tsx
@@ -1,19 +1,23 @@
+import * as yup from 'yup';
+
import { Alert, Button, Card, Label, Pagination } from 'flowbite-react';
-import { Field, FieldArray, Form, Formik } from 'formik';
+import { Field, Form, Formik } from 'formik';
+import { apiStatusCodes, storageKeys } from '../../../config/CommonConstant';
+import { createCredentialDefinition, getCredDeffById, getSchemaById } from '../../../api/Schema';
+import { getFromLocalStorage, setToLocalStorage } from '../../../api/Auth';
import { useEffect, useState } from 'react';
+
+import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../../BreadCrumbs';
-import * as yup from 'yup';
-import { apiStatusCodes, schemaVersionRegex, storageKeys } from '../../../config/CommonConstant';
-import SchemaCard from '../../../commonComponents/SchemaCard';
import CredDeffCard from '../../../commonComponents/CredentialDefinitionCard';
-import { createCredentialDefinition, getCredDeffById, getSchemaById } from '../../../api/Schema';
-import type { AxiosResponse } from 'axios';
import type { CredDeffFieldNameType } from './interfaces';
-import { getFromLocalStorage, setToLocalStorage } from '../../../api/Auth';
+import CustomSpinner from '../../CustomSpinner';
import { EmptyListMessage } from '../../EmptyListComponent';
+import React from 'react';
+import { Roles } from '../../../utils/enums/roles';
+import SchemaCard from '../../../commonComponents/SchemaCard';
import { nanoid } from 'nanoid';
import { pathRoutes } from '../../../config/pathRoutes';
-import CustomSpinner from '../../CustomSpinner';
interface Values {
tagName: string;
@@ -50,6 +54,9 @@ const ViewSchemas = () => {
const [orgId, setOrgId] = useState(0)
const [credDefAuto, setCredDefAuto] = useState('')
+ const [userRoles, setUserRoles] = useState([])
+
+
const getSchemaDetails = async (id: string, organizationId: number) => {
try {
setLoading(true);
@@ -108,6 +115,16 @@ const ViewSchemas = () => {
fetchData();
}, []);
+ const getUserRoles = async () => {
+ const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
+ const roles = orgRoles.split(',')
+ setUserRoles(roles)
+ }
+
+ useEffect(() => {
+ getUserRoles()
+ },[])
+
const submit = async (values: Values) => {
setCreateLoader(true)
@@ -131,11 +148,11 @@ const ViewSchemas = () => {
}
getCredentialDefinitionList(schemaDetails?.schemaId, orgId)
}
-
+
const credDefSelectionCallback = async (schemaId: string, credentialDefinitionId: string) => {
await setToLocalStorage(storageKeys.CRED_DEF_ID, credentialDefinitionId)
window.location.href = `${pathRoutes.organizations.Issuance.connections}`
- }
+ }
return (
+
+ {!isEditProfileOpen && prePopulatedUserProfile && (
+
-
@@ -182,8 +186,8 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
}
{loading
? (- User's Profile -
- - {fidoLoader - ?
-
-
- :
-
-
-
- {/* first section */}
-
+ );
+};
+
+export default AddPasskey;
diff --git a/src/components/Profile/interfaces/index.ts b/src/components/Profile/interfaces/index.ts
index 74df7fa80..799a152b5 100644
--- a/src/components/Profile/interfaces/index.ts
+++ b/src/components/Profile/interfaces/index.ts
@@ -4,6 +4,9 @@ export interface RegistrationOptionInterface {
}
+export interface AddPassword {
+ password: string,
+}
export interface verifyRegistrationObjInterface {
id: string;
rawId: string;
diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
index 9283b109d..5660dbc33 100644
--- a/src/components/Resources/Schema/Create.tsx
+++ b/src/components/Resources/Schema/Create.tsx
@@ -191,8 +191,8 @@ const CreateSchema = () => {
return (
<>
-
-
- {!isEditProfileOpen && prePopulatedUserProfile && (
-
-
- {/* second section */}
-
-
+ }
+
-
-
- );
- };
- export default AddPasskey;
+
- {deviceList && deviceList.length > 0 &&
- deviceList.map((element, key) => (
-
-
-
-
- {/* */}
- {
- (addSuccess || addfailure || fidoError) &&
-
+
+ {/* second section */}
+
- setAddSuccess(null)}
- >
-
-
-
- }
- - {addSuccess || addfailure || fidoError} -
- -
+
- }
-
+
+
+ {deviceList && deviceList.length > 0 &&
+ deviceList.map((element, key) => (
+
+
+
+
+ {
+ (addSuccess || addfailure || fidoError) &&
+
+ {
+ setAddSuccess(null)
+ setFidoError('')
+ setAddFailur('')
+ }}
+ >
+
+
+
+ }
+ + {addSuccess || addfailure || fidoError} +
+ +
- Attributes *
+
+ Attributes *
{attribute.map((element: any, index: number) => (
diff --git a/src/components/Resources/Schema/SchemasList.tsx b/src/components/Resources/Schema/SchemasList.tsx
index 445e56ee0..8070a53e0 100644
--- a/src/components/Resources/Schema/SchemasList.tsx
+++ b/src/components/Resources/Schema/SchemasList.tsx
@@ -4,16 +4,19 @@ import { Alert, Button, Card, Pagination, Table, } from 'flowbite-react';
import { ChangeEvent, useEffect, useState } from 'react';
import type { GetAllSchemaListParameter, PaginationData } from './interfaces';
import { apiStatusCodes, storageKeys } from '../../../config/CommonConstant';
+import { getAllSchemas, getAllSchemasByOrgId } from '../../../api/Schema';
+
import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../../BreadCrumbs';
+import CustomSpinner from '../../CustomSpinner';
+import { EmptyListMessage } from '../../EmptyListComponent';
+import { Features } from '../../../utils/enums/features';
+import RoleViewButton from '../../RoleViewButton';
import SchemaCard from '../../../commonComponents/SchemaCard';
+import type { SchemaDetails } from '../../Verification/interface';
import SearchInput from '../../SearchInput';
-import { getAllSchemasByOrgId, getAllSchemas } from '../../../api/Schema';
import { getFromLocalStorage } from '../../../api/Auth';
import { pathRoutes } from '../../../config/pathRoutes';
-import { EmptyListMessage } from '../../EmptyListComponent';
-import type { SchemaDetails } from '../../Verification/interface';
-import CustomSpinner from '../../CustomSpinner';
const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaDetails: SchemaDetails) => void; }) => {
const [schemaList, setSchemaList] = useState([])
@@ -136,8 +139,8 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
-
-
+ />
-
-
)
:
schemaList && schemaList.length > 0 ? (
@@ -199,7 +203,7 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
- {schemaList.length> 0 &&( 0 && ( {
setSchemaListAPIParameter(prevState => ({
@@ -213,8 +217,8 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
) : (
@@ -159,7 +176,7 @@ const ViewSchemas = () => {
@@ -169,19 +186,20 @@ const ViewSchemas = () => {
className="p-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"
>
-
+
{loading ? (
-
) : (
-
-
+
+
+
<>
@@ -382,8 +408,8 @@ const ViewSchemas = () => {
{loading ? (
{activity.action}
diff --git a/src/components/Verification/ConnectionList.tsx b/src/components/Verification/ConnectionList.tsx
index 212e006fa..c9995b8f1 100644
--- a/src/components/Verification/ConnectionList.tsx
+++ b/src/components/Verification/ConnectionList.tsx
@@ -8,6 +8,8 @@ import type { TableData } from "../../commonComponents/datatable/interface";
import { apiStatusCodes } from "../../config/CommonConstant";
import { AlertComponent } from "../AlertComponent";
import { dateConversion } from "../../utils/DateConversion";
+import DateTooltip from "../Tooltip";
+import React from "react";
const ConnectionList = (props: { selectConnection: (connections: TableData[]) => void; }) => {
const [connectionList, setConnectionList] = useState
Schema Details
-
-
-
)
: credDeffList && credDeffList.length > 0 ? (
@@ -391,7 +417,14 @@ const ViewSchemas = () => {
{credDeffList && credDeffList.length > 0 &&
credDeffList.map((element, key) => (
([])
+
+ const getUserRoles = async () => {
+ const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
+ const roles = orgRoles.split(',')
+ setUserRoles(roles)
+ }
+
+ useEffect(() => {
+ getUserRoles()
+ }, [])
+
+ const isRoleAccess = (): boolean => {
+
+ if(feature === Features.CRETAE_ORG){
+ return true
+ } else if (feature === Features.ISSUENCE) {
+ if (userRoles.includes(Roles.OWNER)
+ || userRoles.includes(Roles.ADMIN)
+ || userRoles.includes(Roles.ISSUER)
+ ) {
+ return true
+ }
+ return false
+ }else if (feature === Features.VERIFICATION) {
+ if (userRoles.includes(Roles.OWNER)
+ || userRoles.includes(Roles.ADMIN)
+ || userRoles.includes(Roles.VERIFIER)
+ ) {
+ return true
+ }
+ return false
+ }else if (userRoles.includes(Roles.OWNER) || userRoles.includes(Roles.ADMIN)) {
+ return true
+ } else {
+ return false
+ }
+
+ }
+
+ return (
+ <>
+ {
+ isRoleAccess()
+ &&
+ }
+
+ )
+
+}
+
+export default RoleViewButton
\ No newline at end of file
diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx
new file mode 100644
index 000000000..912a20ba3
--- /dev/null
+++ b/src/components/Tooltip/index.tsx
@@ -0,0 +1,30 @@
+import { Tooltip } from 'flowbite-react';
+import moment from 'moment';
+import { dateConversion } from '../../utils/DateConversion';
+import type { ChildrenType } from 'react-tooltip';
+
+interface DateProps {
+ date: string
+ id?: string
+ children?: any
+}
+
+const DateTooltip = ({date, children}: DateProps) => {
+
+
+ const updatedDate = new Date(date);
+ const formattedDate = date ? moment(updatedDate).format("MMM DD, YYYY, h:mm A z") : '';
+
+
+ return (
+
+ {
+ children
+ }
+
+ )
+}
+
+export default DateTooltip
\ No newline at end of file
diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
index 737204bf4..9bbe9ce17 100644
--- a/src/components/User/UserDashBoard.tsx
+++ b/src/components/User/UserDashBoard.tsx
@@ -13,6 +13,7 @@ import { getUserInvitations } from "../../api/invitations";
import { pathRoutes } from "../../config/pathRoutes";
import { setToLocalStorage } from "../../api/Auth";
import { dateConversion } from "../../utils/DateConversion";
+import DateTooltip from "../Tooltip";
const initialPageState = {
pageNumber: 1,
@@ -256,7 +257,10 @@ const UserDashBoard = () => {
-
))
}
diff --git a/src/components/RoleViewButton/index.tsx b/src/components/RoleViewButton/index.tsx
new file mode 100644
index 000000000..1c2f0616b
--- /dev/null
+++ b/src/components/RoleViewButton/index.tsx
@@ -0,0 +1,76 @@
+import { ReactElement, useEffect, useState } from 'react';
+
+import { Button } from 'flowbite-react';
+import { Features } from '../../utils/enums/features';
+import { Roles } from '../../utils/enums/roles';
+import { getFromLocalStorage } from '../../api/Auth';
+import { storageKeys } from '../../config/CommonConstant';
+
+interface RoleViewButtonProps {
+ buttonTitle?: string,
+ svgComponent?: ReactElement,
+ onClickEvent?: () => void,
+ feature: string
+}
+
+
+const RoleViewButton = ({ buttonTitle, svgComponent, onClickEvent, feature }: RoleViewButtonProps) => {
+
+ const [userRoles, setUserRoles] = useState
{activity.action}
diff --git a/src/components/Verification/ConnectionList.tsx b/src/components/Verification/ConnectionList.tsx
index 212e006fa..c9995b8f1 100644
--- a/src/components/Verification/ConnectionList.tsx
+++ b/src/components/Verification/ConnectionList.tsx
@@ -8,6 +8,8 @@ import type { TableData } from "../../commonComponents/datatable/interface";
import { apiStatusCodes } from "../../config/CommonConstant";
import { AlertComponent } from "../AlertComponent";
import { dateConversion } from "../../utils/DateConversion";
+import DateTooltip from "../Tooltip";
+import React from "react";
const ConnectionList = (props: { selectConnection: (connections: TableData[]) => void; }) => {
const [connectionList, setConnectionList] = useState([])
@@ -18,10 +20,10 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
const [error, setError] = useState(null)
useEffect(() => {
- getConnections()
+ getConnectionsVerification()
}, [])
- const getConnections = async () => {
+ const getConnectionsVerification = async () => {
setLoading(true)
const response = await getConnectionsByOrg();
const { data } = response as AxiosResponse
@@ -33,7 +35,7 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
const createdOn = ele?.createdAt ? ele?.createdAt : 'Not available'
return {
data: [{
- data:
+ data:
) => {
const inputElement = event.target as HTMLInputElement;
selectConnection(userName, connectionId, inputElement.checked)
@@ -42,7 +44,9 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer" />
},
- { data: userName }, { data: connectionId }, {data:dateConversion(createdOn)},
+ { data: userName },
+ { data: connectionId },
+ {data: {dateConversion(createdOn)} },
]
}
})
@@ -54,8 +58,8 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
setLoading(false)
}
-
- const header = [
+
+ const verification_header = [
{ columnName: '', width: 'w-0.5' },
{ columnName: 'User' },
{ columnName: 'Connection ID' },
@@ -85,22 +89,23 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
}, [selectedConnectionList])
return (
-
-
+
+
Connection List
- {
setError(null)
}}
/>
-
-
)
diff --git a/src/components/Verification/Verification.tsx b/src/components/Verification/Verification.tsx
index ddd9919e8..0ac50352b 100644
--- a/src/components/Verification/Verification.tsx
+++ b/src/components/Verification/Verification.tsx
@@ -10,6 +10,7 @@ import DataTable from "../../commonComponents/datatable";
import type { TableData } from "../../commonComponents/datatable/interface";
import { verifyCredential } from "../../api/verification";
import { pathRoutes } from "../../config/pathRoutes";
+import CustomSpinner from "../CustomSpinner";
interface SchemaDetails {
schemaName: string,
@@ -41,7 +42,7 @@ const VerificationCred = () => {
const [schemaDetails, setSchemaDetails] = useState({
schemaName: '', version: '', schemaId: '', credDefId: ''
})
- const [loading, setLoading] = useState(false)
+ const [loading, setLoading] = useState(true)
const [schemaAttributes, setSchemaAttributes] = useState([]);
const [selectedUsersData, setSelectedUsersData] = useState>([]);
const [requestLoader, setRequestLoader] = useState(false)
@@ -220,6 +221,11 @@ const VerificationCred = () => {
Verification
+ {loading ?
+
+
@@ -242,6 +248,7 @@ const VerificationCred = () => {
+ }
{
(proofReqSuccess || errMsg) &&
diff --git a/src/components/Verification/VerificationCredentialList.tsx b/src/components/Verification/VerificationCredentialList.tsx
index bd187dfd2..7be364f3a 100644
--- a/src/components/Verification/VerificationCredentialList.tsx
+++ b/src/components/Verification/VerificationCredentialList.tsx
@@ -1,7 +1,11 @@
'use client';
-import { Alert, Button, Pagination } from 'flowbite-react';
+import { Alert, Button } from 'flowbite-react';
import { ChangeEvent, useEffect, useState } from 'react';
+import {
+ ProofRequestState,
+ ProofRequestStateUserText,
+} from '../../common/enums';
import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
import {
getProofAttributes,
@@ -12,21 +16,20 @@ import {
import { AlertComponent } from '../AlertComponent';
import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../BreadCrumbs';
+import CustomSpinner from '../CustomSpinner';
import DataTable from '../../commonComponents/datatable';
+import DateTooltip from '../Tooltip';
import { EmptyListMessage } from '../EmptyListComponent';
+import { Features } from '../../utils/enums/features';
import ProofRequest from './ProofRequestPopup';
-import {
- ProofRequestState,
- ProofRequestStateUserText,
-} from '../../common/enums';
import React from 'react';
import type { RequestProof } from './interface';
+import RoleViewButton from '../RoleViewButton';
import SearchInput from '../SearchInput';
import type { TableData } from '../../commonComponents/datatable/interface';
import { dateConversion } from '../../utils/DateConversion';
import { pathRoutes } from '../../config/pathRoutes';
import { removeFromLocalStorage } from '../../api/Auth';
-import CustomSpinner from '../CustomSpinner';
const VerificationCredentialList = () => {
const [loading, setLoading] = useState(true);
@@ -76,7 +79,7 @@ const VerificationCredentialList = () => {
? requestProof?.connectionId
: 'Not available',
},
- { data: dateConversion(requestProof?.updatedAt) },
+ { data: {dateConversion(requestProof.updatedAt)} },
{
data: (
{
-
-
-
-
-
-
+ }
{
)
: walletStatus === true
? ( setWalletSpinupStatus(flag)} />)
+ : ((userRoles.includes(Roles.OWNER) || userRoles.includes(Roles.ADMIN))
+ && setWalletSpinupStatus(flag)} />)
+
}
diff --git a/src/components/organization/EditOrgdetailsModal.tsx b/src/components/organization/EditOrgdetailsModal.tsx
index 57d742a48..e7312d0cc 100644
--- a/src/components/organization/EditOrgdetailsModal.tsx
+++ b/src/components/organization/EditOrgdetailsModal.tsx
@@ -176,7 +176,7 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps)=> {
props?.onEditSucess()
}
props.setOpenModal(false)
-
+ window.location.reload();
} else {
setErrMsg(resUpdateOrg as string)
}
diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
index fbc072c74..740fef4f0 100644
--- a/src/components/organization/OrgDropDown.tsx
+++ b/src/components/organization/OrgDropDown.tsx
@@ -23,16 +23,23 @@ const OrgDropDown = () => {
if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
setOrgList(data?.data?.organizations);
setActiveOrg(data?.data?.organizations)
- } else {
- console.log("data?.data?.organizations")
}
};
- const goToOrgDashboard = async (orgId: number, roles: string[]) => {
- await setToLocalStorage(storageKeys.ORG_ID, orgId.toString());
+ const goToOrgDashboard = async (org: Organisation) => {
+
+ await setOrgRoleDetails(org)
window.location.href = pathRoutes.organizations.dashboard;
};
+ const setOrgRoleDetails = async (org: Organisation) => {
+
+ await setToLocalStorage(storageKeys.ORG_ID, org.id.toString());
+ const roles: string[] = org?.userOrgRoles.map(role => role.orgRole.name)
+
+ await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ }
+
const setActiveOrg = async (organizations: Organisation[]) => {
let activeOrg: Organisation | null = null
@@ -48,15 +55,8 @@ const OrgDropDown = () => {
}
if (activeOrg) {
-
- await setToLocalStorage(storageKeys.ORG_ID, activeOrg.id.toString());
- const roles: string[] = activeOrg?.userOrgRoles.map(role => role.orgRole.name)
- activeOrg.roles = roles
-
- await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ await setOrgRoleDetails(activeOrg)
}
-
-
}
const redirectToCreateOrgModal = () => {
@@ -107,7 +107,7 @@ const OrgDropDown = () => {
const roles: string[] = org.userOrgRoles.map(role => role.orgRole.name)
org.roles = roles
return (
- - goToOrgDashboard(org?.id, org?.roles)}>
+
- goToOrgDashboard(org)}>
{
@@ -173,8 +174,11 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
- {agentData?.createDateTime ? dateConversion(agentData?.createDateTime) : dateConversion(new Date().toISOString())}
-
+ {
+ agentData?.createDateTime ?
+ { dateConversion(agentData?.createDateTime) } :
+ { dateConversion(new Date().toISOString()) }
+ }
diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx
index d256ac6d9..57e1eb4fd 100644
--- a/src/components/organization/OrganizationsList.tsx
+++ b/src/components/organization/OrganizationsList.tsx
@@ -9,13 +9,16 @@ import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../BreadCrumbs';
import CreateOrgFormModal from "./CreateOrgFormModal";
import CustomAvatar from '../Avatar'
+import { Features } from '../../utils/enums/features';
import type { Organisation } from './interfaces'
+import RoleViewButton from '../RoleViewButton';
import SearchInput from '../SearchInput';
import { getOrganizations } from '../../api/organization';
import { pathRoutes } from '../../config/pathRoutes';
import { setToLocalStorage } from '../../api/Auth';
import { EmptyListMessage } from '../EmptyListComponent';
import CustomSpinner from '../CustomSpinner';
+import React from 'react';
const initialPageState = {
pageNumber: 1,
@@ -109,9 +112,14 @@ const OrganizationsList = () => {
setSearchText(e.target.value);
}
- const redirectOrgDashboard = (orgId: number) => {
- setToLocalStorage(storageKeys.ORG_ID, orgId.toString())
- window.location.href = pathRoutes.organizations.dashboard
+ const redirectOrgDashboard = async (activeOrg: Organisation) => {
+
+ await setToLocalStorage(storageKeys.ORG_ID, activeOrg.id.toString());
+ const roles: string[] = activeOrg?.userOrgRoles.map(role => role.orgRole.name)
+ activeOrg.roles = roles
+
+ await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ window.location.href = pathRoutes.organizations.dashboard
}
@@ -132,18 +140,18 @@ const OrganizationsList = () => {
+
+
+ }
+ onClickEvent={createOrganizationModel}
+ />
{
: organizationsList && organizationsList?.length > 0 ? (
{
organizationsList.map((org) => (
- redirectOrgDashboard(org.id)} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer'>
-
+ redirectOrgDashboard(org)} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer overflow-hidden overflow-ellipsis' style={{ maxHeight: '100%', maxWidth: '100%', overflow: 'auto' }}>
{(org.logoUrl) ? (null)
const [error, setError] = useState(null)
const [currentPage, setCurrentPage] = useState(initialPageState);
+ const [userRoles, setUserRoles] = useState([])
const timestamp = Date.now();
const onPageChange = (page: number) => {
@@ -88,6 +92,7 @@ const Invitations = () => {
return () => clearTimeout(getData)
}, [searchText, openModal, currentPage.pageNumber])
+
//onCHnage of Search input text
const searchInputChange = (e: ChangeEvent) => {
setSearchText(e.target.value);
@@ -107,16 +112,15 @@ const Invitations = () => {
{
- Invited On: {dateConversion(invitation.createDateTime)}
-
-
+ Invited On: {dateConversion(invitation.createDateTime)}
+
+
))
@@ -234,6 +238,7 @@ const Invitations = () => {
message={'No Invitations'}
description={'Get started by inviting a users'}
buttonContent={'Invite'}
+ feature={Features.SEND_INVITATION}
onClick={createInvitationsModel}
svgComponent={
+ data: {dateConversion(createdOn)} },
]
}
})
@@ -54,8 +58,8 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
setLoading(false)
}
-
- const header = [
+
+ const verification_header = [
{ columnName: '', width: 'w-0.5' },
{ columnName: 'User' },
{ columnName: 'Connection ID' },
@@ -85,22 +89,23 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
}, [selectedConnectionList])
return (
- {
: organizationsList && organizationsList?.length > 0 ? (
) => {
const inputElement = event.target as HTMLInputElement;
selectConnection(userName, connectionId, inputElement.checked)
@@ -42,7 +44,9 @@ const ConnectionList = (props: { selectConnection: (connections: TableData[]) =>
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer" />
},
- { data: userName }, { data: connectionId }, {data:dateConversion(createdOn)},
+ { data: userName },
+ { data: connectionId },
+ {data:
-
+
+
+ }
+ onClickEvent={createOrganizationModel}
+ />
+ ({
schemaName: '', version: '', schemaId: '', credDefId: ''
})
- const [loading, setLoading] = useState(false)
+ const [loading, setLoading] = useState(true)
const [schemaAttributes, setSchemaAttributes] = useState([]);
const [selectedUsersData, setSelectedUsersData] = useState>([]);
const [requestLoader, setRequestLoader] = useState(false)
@@ -220,6 +221,11 @@ const VerificationCred = () => {
Verification
+ {loading ?
+
+
- {
setError(null)
}}
/>
-
)
diff --git a/src/components/Verification/Verification.tsx b/src/components/Verification/Verification.tsx
index ddd9919e8..0ac50352b 100644
--- a/src/components/Verification/Verification.tsx
+++ b/src/components/Verification/Verification.tsx
@@ -10,6 +10,7 @@ import DataTable from "../../commonComponents/datatable";
import type { TableData } from "../../commonComponents/datatable/interface";
import { verifyCredential } from "../../api/verification";
import { pathRoutes } from "../../config/pathRoutes";
+import CustomSpinner from "../CustomSpinner";
interface SchemaDetails {
schemaName: string,
@@ -41,7 +42,7 @@ const VerificationCred = () => {
const [schemaDetails, setSchemaDetails] = useStateConnection List
-
+
+ :
@@ -242,6 +248,7 @@ const VerificationCred = () => {
+ }
{
(proofReqSuccess || errMsg) &&
diff --git a/src/components/Verification/VerificationCredentialList.tsx b/src/components/Verification/VerificationCredentialList.tsx
index bd187dfd2..7be364f3a 100644
--- a/src/components/Verification/VerificationCredentialList.tsx
+++ b/src/components/Verification/VerificationCredentialList.tsx
@@ -1,7 +1,11 @@
'use client';
-import { Alert, Button, Pagination } from 'flowbite-react';
+import { Alert, Button } from 'flowbite-react';
import { ChangeEvent, useEffect, useState } from 'react';
+import {
+ ProofRequestState,
+ ProofRequestStateUserText,
+} from '../../common/enums';
import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
import {
getProofAttributes,
@@ -12,21 +16,20 @@ import {
import { AlertComponent } from '../AlertComponent';
import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../BreadCrumbs';
+import CustomSpinner from '../CustomSpinner';
import DataTable from '../../commonComponents/datatable';
+import DateTooltip from '../Tooltip';
import { EmptyListMessage } from '../EmptyListComponent';
+import { Features } from '../../utils/enums/features';
import ProofRequest from './ProofRequestPopup';
-import {
- ProofRequestState,
- ProofRequestStateUserText,
-} from '../../common/enums';
import React from 'react';
import type { RequestProof } from './interface';
+import RoleViewButton from '../RoleViewButton';
import SearchInput from '../SearchInput';
import type { TableData } from '../../commonComponents/datatable/interface';
import { dateConversion } from '../../utils/DateConversion';
import { pathRoutes } from '../../config/pathRoutes';
import { removeFromLocalStorage } from '../../api/Auth';
-import CustomSpinner from '../CustomSpinner';
const VerificationCredentialList = () => {
const [loading, setLoading] = useState(true);
@@ -76,7 +79,7 @@ const VerificationCredentialList = () => {
? requestProof?.connectionId
: 'Not available',
},
- { data: dateConversion(requestProof?.updatedAt) },
+ { data: {dateConversion(requestProof.updatedAt)} },
{
data: (
{
- setWalletSpinupStatus(flag)} />)
+ : ((userRoles.includes(Roles.OWNER) || userRoles.includes(Roles.ADMIN))
+ && setWalletSpinupStatus(flag)} />)
+
}
diff --git a/src/components/organization/EditOrgdetailsModal.tsx b/src/components/organization/EditOrgdetailsModal.tsx
index 57d742a48..e7312d0cc 100644
--- a/src/components/organization/EditOrgdetailsModal.tsx
+++ b/src/components/organization/EditOrgdetailsModal.tsx
@@ -176,7 +176,7 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps)=> {
props?.onEditSucess()
}
props.setOpenModal(false)
-
+ window.location.reload();
} else {
setErrMsg(resUpdateOrg as string)
}
diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
index fbc072c74..740fef4f0 100644
--- a/src/components/organization/OrgDropDown.tsx
+++ b/src/components/organization/OrgDropDown.tsx
@@ -23,16 +23,23 @@ const OrgDropDown = () => {
if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
setOrgList(data?.data?.organizations);
setActiveOrg(data?.data?.organizations)
- } else {
- console.log("data?.data?.organizations")
}
};
- const goToOrgDashboard = async (orgId: number, roles: string[]) => {
- await setToLocalStorage(storageKeys.ORG_ID, orgId.toString());
+ const goToOrgDashboard = async (org: Organisation) => {
+
+ await setOrgRoleDetails(org)
window.location.href = pathRoutes.organizations.dashboard;
};
+ const setOrgRoleDetails = async (org: Organisation) => {
+
+ await setToLocalStorage(storageKeys.ORG_ID, org.id.toString());
+ const roles: string[] = org?.userOrgRoles.map(role => role.orgRole.name)
+
+ await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ }
+
const setActiveOrg = async (organizations: Organisation[]) => {
let activeOrg: Organisation | null = null
@@ -48,15 +55,8 @@ const OrgDropDown = () => {
}
if (activeOrg) {
-
- await setToLocalStorage(storageKeys.ORG_ID, activeOrg.id.toString());
- const roles: string[] = activeOrg?.userOrgRoles.map(role => role.orgRole.name)
- activeOrg.roles = roles
-
- await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ await setOrgRoleDetails(activeOrg)
}
-
-
}
const redirectToCreateOrgModal = () => {
@@ -107,7 +107,7 @@ const OrgDropDown = () => {
const roles: string[] = org.userOrgRoles.map(role => role.orgRole.name)
org.roles = roles
return (
- - goToOrgDashboard(org?.id, org?.roles)}>
+
- goToOrgDashboard(org)}>
{
@@ -173,8 +174,11 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx
index d256ac6d9..57e1eb4fd 100644
--- a/src/components/organization/OrganizationsList.tsx
+++ b/src/components/organization/OrganizationsList.tsx
@@ -9,13 +9,16 @@ import type { AxiosResponse } from 'axios';
import BreadCrumbs from '../BreadCrumbs';
import CreateOrgFormModal from "./CreateOrgFormModal";
import CustomAvatar from '../Avatar'
+import { Features } from '../../utils/enums/features';
import type { Organisation } from './interfaces'
+import RoleViewButton from '../RoleViewButton';
import SearchInput from '../SearchInput';
import { getOrganizations } from '../../api/organization';
import { pathRoutes } from '../../config/pathRoutes';
import { setToLocalStorage } from '../../api/Auth';
import { EmptyListMessage } from '../EmptyListComponent';
import CustomSpinner from '../CustomSpinner';
+import React from 'react';
const initialPageState = {
pageNumber: 1,
@@ -109,9 +112,14 @@ const OrganizationsList = () => {
setSearchText(e.target.value);
}
- const redirectOrgDashboard = (orgId: number) => {
- setToLocalStorage(storageKeys.ORG_ID, orgId.toString())
- window.location.href = pathRoutes.organizations.dashboard
+ const redirectOrgDashboard = async (activeOrg: Organisation) => {
+
+ await setToLocalStorage(storageKeys.ORG_ID, activeOrg.id.toString());
+ const roles: string[] = activeOrg?.userOrgRoles.map(role => role.orgRole.name)
+ activeOrg.roles = roles
+
+ await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+ window.location.href = pathRoutes.organizations.dashboard
}
@@ -132,18 +140,18 @@ const OrganizationsList = () => {
- {
)
: walletStatus === true
? (
-
-
-
-
+ }
- {agentData?.createDateTime ? dateConversion(agentData?.createDateTime) : dateConversion(new Date().toISOString())}
-
+ {
+ agentData?.createDateTime ?
+
{
organizationsList.map((org) => (
- redirectOrgDashboard(org.id)} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer'>
-
+ redirectOrgDashboard(org)} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer overflow-hidden overflow-ellipsis' style={{ maxHeight: '100%', maxWidth: '100%', overflow: 'auto' }}>
{
{dateConversion(invitation.createDateTime)}
+
+
))
@@ -234,6 +238,7 @@ const Invitations = () => {
message={'No Invitations'}
description={'Get started by inviting a users'}
buttonContent={'Invite'}
+ feature={Features.SEND_INVITATION}
onClick={createInvitationsModel}
svgComponent={
{(org.logoUrl) ? (null)
const [error, setError] = useState(null)
const [currentPage, setCurrentPage] = useState(initialPageState);
+ const [userRoles, setUserRoles] = useState([])
const timestamp = Date.now();
const onPageChange = (page: number) => {
@@ -88,6 +92,7 @@ const Invitations = () => {
return () => clearTimeout(getData)
}, [searchText, openModal, currentPage.pageNumber])
+
//onCHnage of Search input text
const searchInputChange = (e: ChangeEvent) => {
setSearchText(e.target.value);
@@ -107,16 +112,15 @@ const Invitations = () => {
- Invited On: {dateConversion(invitation.createDateTime)} -
- + Invited On: