merge: develop to qa

src/components/Resources/Schema/SchemasList.tsx

@@ -23,7 +23,7 @@ import { checkEcosystem } from '../../../config/ecosystem';
 import type { ICheckEcosystem } from '../../../config/ecosystem';
 
 import { Create, SchemaEndorsement } from '../../Issuance/Constant';
-import { DidMethod, SchemaType } from '../../../common/enums';
+import { DidMethod, SchemaType, SchemaTypes } from '../../../common/enums';
 
 const SchemaList = (props: {
 		schemaSelectionCallback: (
@@ -57,6 +57,8 @@ const SchemaList = (props: {
 	const [totalItem, setTotalItem] = useState(0);
 	const [isEcosystemData, setIsEcosystemData] = useState<ICheckEcosystem>();
 	const [searchValue, setSearchValue] = useState('');
+	const [schemaType, setSchemaType] = useState('');
+
 	const [w3cSchema,setW3CSchema]= useState<boolean>(false);
 	const [isNoLedger,setisNoLedger]= useState<boolean>(false);	
 
@@ -70,7 +72,7 @@ const SchemaList = (props: {
 			setLoading(true);
 			let schemaList;
 			if (allSchemaFlag) {
-				schemaList = await getAllSchemas(schemaListAPIParameter, SchemaType.INDY);
+				schemaList = await getAllSchemas(schemaListAPIParameter, schemaType);
 			} else {
 				schemaList = await getAllSchemasByOrgId(
 					schemaListAPIParameter,
@@ -229,9 +231,11 @@ const SchemaList = (props: {
 			}
 			if (did.includes(DidMethod.POLYGON) || did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
 				setW3CSchema(true);
+				setSchemaType(SchemaTypes.schema_W3C)
 			}
 			if (did.includes(DidMethod.INDY)) {
 				setW3CSchema(false);
+				setSchemaType(SchemaTypes.schema_INDY)
 			}
 			if (did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
 				setisNoLedger(true);

src/components/Verification/AttributesListData.tsx

@@ -1,54 +1,46 @@
 import { Card } from 'flowbite-react';
+import CopyDid from '../../commonComponents/CopyDid';
 
 interface AttributesListProps {
-    attributeDataList: { entity: string; properties: any[] }[]
+    attributeDataList: { [key: string]: any }[] 
 }
 
-	const AttributesListData = ({attributeDataList}: AttributesListProps): JSX.Element => {
-		return (
-			<>
-				<Card >
-					<div className="flex h-full flex-col justify-center gap-0 sm:p-0">
-						<div className="flex border-b">
-							<div className="w-5/12 font-semibold flex truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-xl">
-								Attributes
-							</div>
-							<div className="w-1/12 font-semibold flex justify-start truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-xl">
-							</div>
-							<div className="w-6/12 font-semibold flex truncate sm:pl-4 text-primary-700 dark:bg-gray-800 text-xl">
-								{' '}
-								Values
-							</div>
-						</div>
+const AttributesListData = ({ attributeDataList }: AttributesListProps): JSX.Element => {
 
-						{
-							attributeDataList?.map((item, index) => (
-								<div
-									key={item?.entity + 1}
-									className="flex w-full"
-								>
-									<div
-										className={`flex w-full text-lg`}
-									>
-										<div className="w-5/12 m-1 p-1 text-start text-gray-700 dark:text-white text-lg">
-											{item?.entity}
-										</div>
-										<div className="w-1/12 m-1 p-1 flex  items-center text-gray-700 dark:text-white text-lg">
-											:
-										</div>
-										<div className="w-6/12 m-1 truncate p-1 flex justify-start text-gray-700 dark:text-white text-lg">
-											{item?.properties.join(', ')}
+    return (
+        <>
+            {attributeDataList?.map((item, index) => (
+                <Card key={index} className="mb-4">
+                    <div className="flex flex-col justify-start gap-2 p-4">
+					<div className="flex justify-start text-xl font-semibold text-gray-900 dark:text-white mb-2">
+                            {`Credential ${index + 1}`}
+                        </div>
+
+
+						{Object.entries(item).map(([key, value], idx) => (
+							<div key={idx} className="flex w-full text-lg items-center">
+								<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
+									{key}
+								</div>
+								<div className="flex items-center p-1 m-1">
+									:
+								</div>
+								<div className="w-9/12 m-1 text-start text-gray-600 dark:text-white items-center cursor-pointer overflow-auto">
+									{key === 'schemaId' || key === 'credDefId' ? (
+										<div className="flex items-center">
+											<CopyDid value={value} className="truncate font-courier mt-2" />
 										</div>
-									</div>
+									) : (
+										<span className="truncate font-courier">{value}</span>
+									)}
 								</div>
-							))
-						}
-
+							</div>
+						))}
 					</div>
 				</Card>
+			))}
+        </>
+    );
+}
 
-			</>
-		)
-	}
-
-    export default AttributesListData;
+export default AttributesListData;

src/components/Verification/EmailAttributesSelection.tsx

@@ -29,18 +29,19 @@ const EmailAttributesSelection = () => {
 
 	const handleAttributeChange = async (
 		attributeName: string,
-		schemaId: string | undefined,
 		changeType: 'checkbox' | 'input' | 'select',
 		value: string | boolean,
+		schemaId?: string | undefined,
+        credDefId?: string | undefined
 	) => {
 		const updatedAttributes = attributeData?.map(attribute => {
-			if (attribute.attributeName === attributeName && attribute.schemaId === schemaId) {
+			if (attribute.attributeName === attributeName && attribute.schemaId === schemaId && attribute.credDefId === credDefId) {
 				switch (changeType) {
 					case 'checkbox':
 						return {
 							...attribute,
 							isChecked: value as boolean,
-							value: attribute?.value || '',
+							value: (value as boolean) ? attribute.value : '',
 							selectedOption: attribute?.condition || 'Select',
 							inputError: '',
 							selectError: '',
@@ -255,7 +256,7 @@ const EmailAttributesSelection = () => {
 									showCheckbox={true}
 									isVerificationUsingEmail={true}
 									onChange={(checked: boolean) => {
-										handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'checkbox', checked);
+										handleAttributeChange(attribute?.attributeName, 'checkbox', checked, attribute?.schemaId, attribute?.credDefId);
 									}}
 								/>
 							</div>
@@ -270,7 +271,7 @@ const EmailAttributesSelection = () => {
 										disabled={!attribute?.isChecked}
 										value={attribute?.selectedOption}
 										onChange={(e) =>
-											handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'select', e.target.value)
+											handleAttributeChange(attribute?.attributeName, 'select', e.target.value, attribute?.schemaId, attribute?.credDefId)
 										}
 										className={`${!attribute?.isChecked
 											? 'opacity-50 cursor-not-allowed'
@@ -302,7 +303,7 @@ const EmailAttributesSelection = () => {
 										type="number"
 										value={attribute?.value}
 										onChange={(e) =>
-											handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'input', e.target.value)
+											handleAttributeChange(attribute?.attributeName, 'input', e.target.value, attribute?.schemaId, attribute?.credDefId)
 										}
 										disabled={!attribute?.isChecked}
 										className={`${!attribute?.isChecked

src/components/Verification/ProofRequestPopup.tsx

@@ -94,10 +94,9 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 							) : (
 								<div className=" text-gray-500 dark:text-gray-300 w-full">
 									<div className="mt-1 ">
-										<AttributesListData attributeDataList={aggregatedData} />
-										<SchemaCredDefDetails
-											schemaCredDefList={props?.userData?.slice(0, 1)}
-										/>
+
+											<AttributesListData attributeDataList={props?.userData} />
+
 									</div>
 								</div>
 							)}
@@ -204,11 +203,9 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 							) : (
 								<div className=" text-gray-500 dark:text-gray-300 w-full">
 									<div className="mt-1">
-										<AttributesListData attributeDataList={aggregatedData} />
+										<AttributesListData attributeDataList={props?.userData} />
+
 
-										<SchemaCredDefDetails
-											schemaCredDefList={props?.userData?.slice(0, 1)}
-										/>
 									</div>
 								</div>
 							)}

src/components/Verification/VerificationDashboard.tsx

@@ -25,7 +25,7 @@ const VerificationDashboard = () => {
 		<Dashboard
 			title="Verify Credential"
 			options={options}
-			backButtonPath={pathRoutes.organizations.issuedCredentials}
+			backButtonPath={pathRoutes.organizations.credentials}
 		/>
 	);
 };

src/components/organization/walletCommonComponents/DedicatedAgent.tsx

@@ -19,6 +19,7 @@ import SetDomainValueInput from './SetDomainValueInput';
 import SetPrivateKeyValueInput from './SetPrivateKeyValue';
 import { getOrganizationById, setAgentConfigDetails } from '../../../api/organization';
 import type { IDedicatedAgentConfig} from '../interfaces';
+import React from 'react';
 
 const RequiredAsterisk = () => <span className="text-xs text-red-500">*</span>
 
@@ -36,6 +37,7 @@ const DedicatedAgentForm = ({
 	const [selectedLedger, setSelectedLedger] = useState('');
 	const [selectedDid, setSelectedDid] = useState('');
 	const [selectedMethod, setSelectedMethod]=useState('')
+	const [isSelectedNetwork, setIsSelectedNetwork]=useState('')
 	const [privateKeyValue, setPrivateKeyValue] = useState<string>('');
 	const [domainValue, setDomainValue] = useState<string>('');
 	const [isLoading, setIsLoading] = useState<boolean>(false);
@@ -118,6 +120,7 @@ const DedicatedAgentForm = ({
 	const handleLedgerChanges = (e: ChangeEvent<HTMLInputElement>) => {
 		setSelectedLedger(e.target.value);
 		setSelectedMethod('');
+		setIsSelectedNetwork('');
 		setSelectedDid('');
 	};
 	const handleMethodChanges = (e: ChangeEvent<HTMLInputElement>) => {
@@ -248,6 +251,7 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 				onChange={(e) => {
 					formikHandlers.handleChange(e);
 					handleNetworkChanges(e);
+					setIsSelectedNetwork(networks[network])
 				}}
 				className="mr-2"
 			/>
@@ -258,7 +262,19 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 	));
 };
 
+const isSubmitButtonDisabled = () => {
+	if (!selectedLedger) {
+		return true;
+	}
+	else if ((selectedLedger === Ledgers.POLYGON && !privateKeyValue) || (selectedLedger === Ledgers.INDY && (!selectedMethod || !isSelectedNetwork))) {
+		return true;
+	}
+	else if ((selectedLedger === Ledgers.NO_LEDGER && !selectedMethod) ||(selectedLedger === Ledgers.NO_LEDGER && selectedMethod === DidMethod.WEB && !domainValue)) {
+		return true;
+	}
 
+	return false;
+};
 
 	return (
 		<>
@@ -565,6 +581,7 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 
 
 				<Button
+				disabled={isSubmitButtonDisabled()}
 						  isProcessing={loading}
 						  type="submit"
 						  className='float-right mb-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:!bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800'

src/components/organization/walletCommonComponents/SharedAgent.tsx

@@ -43,7 +43,8 @@ const SharedAgentForm = ({
 }: ISharedAgentForm) => {
 	const [haveDidShared, setHaveDidShared] = useState(false);
 	const [selectedLedger, setSelectedLedger] = useState('');
-	const [selectedMethod, setSelectedMethod] = useState('');
+	const [selectedMethod, setSelectedMethod] = useState(''); 
+	const [selectedNetwork, setSelectedNetwork] = useState(''); 
 	const [seedVal, setSeedVal] = useState('');
 	const [maskedSeedVal, setMaskedSeedVal] = useState('');
 	const [selectedDid, setSelectedDid] = useState('');
@@ -119,6 +120,7 @@ const SharedAgentForm = ({
 	const handleLedgerChange = (e: ChangeEvent<HTMLInputElement>) => {
 		setSelectedLedger(e.target.value);
 		setSelectedMethod('');
+		setSelectedNetwork('');
 		setSelectedDid('');
 	};
 
@@ -222,6 +224,7 @@ const SharedAgentForm = ({
 					onChange={(e) => {
 						formikHandlers.handleChange(e)
 						 handleNetworkChange(e)
+						 setSelectedNetwork(networks[network])
 					}}
 					className="mr-2"
 				/>
@@ -232,6 +235,21 @@ const SharedAgentForm = ({
 		));
 	};
 
+	const isSubmitDisabled = () => {
+		if (!selectedLedger) {
+			return true;
+		}
+		else if ((selectedLedger === Ledgers.POLYGON && !privateKeyValue) || (selectedLedger === Ledgers.INDY && (!selectedMethod || !selectedNetwork))) {
+			return true;
+		}
+		else if ((selectedLedger === Ledgers.NO_LEDGER && !selectedMethod) ||(selectedLedger === Ledgers.NO_LEDGER && selectedMethod === DidMethod.WEB && !domainValue)) {
+			return true;
+		}
+
+		return false;
+	};
+
+
 	return (
 		<div className="mt-4 flex-col gap-4">
 			<div className="bg-[#F4F4F4] dark:bg-gray-700 max-w-lg">
@@ -508,6 +526,7 @@ const SharedAgentForm = ({
 
 						<div className="w-full flex justify-end">
 							<Button
+							disabled={isSubmitDisabled()}
 								type="submit"
 								className="flex h-min p-0.5 focus:z-10 focus:outline-none border border-transparent enabled:hover:bg-cyan-800 dark:enabled:hover:bg-cyan-700 mt-4 text-base font-medium text-center text-white bg-primary-700 rounded-md hover:!bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
 							>

src/components/organization/walletCommonComponents/WalletSpinup.tsx

@@ -92,6 +92,7 @@ const WalletSpinup = (props: {
 	useEffect(() => {
        fetchOrganizationDetails()
     }, []);
+
 
 	const onRadioSelect = (type: string) => {
 		setAgentType(type);

src/config/pathRoutes.ts

@@ -49,14 +49,14 @@ export const pathRoutes = {
 		},
 		verification: {
 			requestProof: '/organizations/verification/verify-credentials',
-			email: '/organizations/verification/verify-credentials/email/schemas',
+			email: '/organizations/verification/verify-credentials/schema',
 			schema: '/organizations/verification/verify-credentials/schemas',
 			credDef: '/organizations/verification/verify-credentials/schemas/cred-defs',
-			w3cAttributes: '/organizations/verification/verify-credentials/email/schemas/attributes',
-			attributes: '/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes',
-			emailVerification: '/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/verification-email',
-			w3cEmailVerification: '/organizations/verification/verify-credentials/email/schemas/attributes/verification-email',
-			emailCredDef: '/organizations/verification/verify-credentials/email/schemas/cred-defs',
+			w3cAttributes: '/organizations/verification/verify-credentials/schema/attributes',
+			attributes: '/organizations/verification/verify-credentials/schema/cred-defs/attributes',
+			emailVerification: '/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email',
+			w3cEmailVerification: '/organizations/verification/verify-credentials/schema/attributes/verification-email',
+			emailCredDef: '/organizations/verification/verify-credentials/schema/cred-defs',
 			connections: '/organizations/verification/verify-credentials/schemas/cred-defs/connections',
 			W3CConnections: '/organizations/verification/verify-credentials/schemas/connections',
 

src/pages/organizations/verification/verify-credentials/schema/attributes/index.astro

@@ -0,0 +1,14 @@
+---
+import LayoutSidebar from "../../../../../../app/LayoutSidebar.astro";
+import EmailAttributesSelection from "../../../../../../components/Verification/EmailAttributesSelection";
+import { checkUserSession } from "../../../../../../utils/check-session";
+
+const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
+if (!response.authorized) {
+	return Astro.redirect(response.redirect);
+}
+---
+
+<LayoutSidebar notFoundPage={!response.permitted}>
+	<EmailAttributesSelection client:load />
+</LayoutSidebar>

src/pages/organizations/verification/verify-credentials/schema/attributes/verification-email/index.astro

@@ -0,0 +1,14 @@
+---
+import LayoutSidebar from "../../../../../../../app/LayoutSidebar.astro";
+import EmailVerification from "../../../../../../../components/Verification/EmailVerification";
+import { checkUserSession } from "../../../../../../../utils/check-session";
+
+const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
+if (!response.authorized) {
+	return Astro.redirect(response.redirect);
+}
+---
+
+<LayoutSidebar notFoundPage={!response.permitted}>
+	<EmailVerification client:load />
+</LayoutSidebar>