From 42a8ca9a570ecc18331e59ab4bd92f5d67331f23 Mon Sep 17 00:00:00 2001 From: pranalidhanavade Date: Fri, 8 Sep 2023 11:41:26 +0530 Subject: [PATCH 1/2] update:get schema details from localstorage Signed-off-by: pranalidhanavade --- .../Resources/Schema/ViewSchema.tsx | 90 +++++++++++-------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/src/components/Resources/Schema/ViewSchema.tsx b/src/components/Resources/Schema/ViewSchema.tsx index 0630f9a4f..3fc113c31 100644 --- a/src/components/Resources/Schema/ViewSchema.tsx +++ b/src/components/Resources/Schema/ViewSchema.tsx @@ -20,25 +20,19 @@ interface Values { revocable: boolean; } -type SchemaData = { - schema: { - attrNames: string[]; - name: string; - version: string; - issuerId: string; - }; +interface SchemaData { + schemaName: string; + version: string; + issuerDid: string; schemaId: string; - resolutionMetadata: Record; - schemaMetadata: { - didIndyNamespace: string; - indyLedgerSeqNo: number; - }; + attributes: string[]; + createdDateTime: string; }; const ViewSchemas = () => { - const [schemaDetails, setSchemaDetails] = useState(null); + const [schemaDetails, setSchemaDetails] = useState(); const [credDeffList, setCredDeffList] = useState([]); const [loading, setLoading] = useState(true) const [createloader, setCreateLoader] = useState(false) @@ -50,20 +44,38 @@ const ViewSchemas = () => { const [orgId, setOrgId] = useState(0) const [credDefAuto, setCredDefAuto] = useState('') - const getSchemaDetails = async (id: string, organizationId: number) => { + const getSchemaDetails = async () => { + try { - setLoading(true); - const SchemaDetails = await getSchemaById(id, organizationId); - const { data } = SchemaDetails as AxiosResponse; - if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) { - setSchemaDetails(data?.data); - setCredDefAuto(`${data?.data?.response?.schema?.name} ${nanoid(8)}`); - setLoading(false); - } else { + const schemaDetails = await getFromLocalStorage(storageKeys.SCHEMA_ATTR) + const schemaId = await getFromLocalStorage(storageKeys.SCHEMA_ID) + const parts = schemaId.split(":"); + const schemaName = parts[2]; + const version = parts[3]; + console.log("schemaId::::", schemaId) + const schemaDidObject = JSON.parse(schemaDetails) + schemaDidObject.schema = schemaId; + + + await setToLocalStorage(storageKeys.SCHEMA_ID, schemaId) + // setSchemaDetails(schemaDidObject) + console.log("schemaDidObject::::", schemaDidObject) + if (schemaDidObject) { setLoading(false); - setSchemaDetailErr(SchemaDetails as unknown as string) + setSchemaDetails({ + attributes: schemaDidObject.attribute, + schemaId: schemaId, + schemaName: schemaName, + version: version, + issuerDid: schemaDidObject.issuerDid, + createdDateTime: schemaDidObject.createdDateTime + + }) } + setLoading(false); + + } catch (error) { setSchemaDetailErr('Error while fetching schema details') console.error('Error while fetching schema details:', error); @@ -71,6 +83,8 @@ const ViewSchemas = () => { } }; + + const getCredentialDefinitionList = async (id: string, orgId: number) => { try { setCredDeffloader(true); @@ -100,11 +114,11 @@ const ViewSchemas = () => { if (window?.location?.search) { const str = window?.location?.search; const schemaId = str.substring(str.indexOf('=') + 1); - await getSchemaDetails(schemaId, Number(organizationId)); + await getSchemaDetails(); await getCredentialDefinitionList(schemaId, Number(organizationId)); } }; - + getSchemaDetails(); fetchData(); }, []); @@ -131,12 +145,12 @@ 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}` - } - + } + console.log("setSchemaDetails7888979809798", schemaDetails) return (
@@ -172,7 +186,7 @@ const ViewSchemas = () => { {loading ? (
- +
) : (
@@ -207,19 +221,19 @@ const ViewSchemas = () => {

- Name: {schemaDetails?.schema?.name} + Name: {schemaDetails?.schemaName}

- Version: {schemaDetails?.schema?.version} + Version: {schemaDetails?.version}

Schema ID: {schemaDetails?.schemaId}

- Issuer DID: {schemaDetails?.schema?.issuerId} + Issuer DID: {schemaDetails?.issuerDid}

@@ -228,9 +242,9 @@ const ViewSchemas = () => {
Attributes: - {schemaDetails?.schema?.attrNames && schemaDetails?.schema?.attrNames?.length > 0 && - schemaDetails?.schema?.attrNames.map((element: string) => ( - {element} + {schemaDetails?.attributes && schemaDetails?.attributes?.length > 0 && + schemaDetails?.attributes.map((element: string) => ( + {element?.attributeName} ))}
@@ -381,9 +395,9 @@ const ViewSchemas = () => { Credential Definitions - {loading ? (
- - + {credDeffloader ? (
+ +
) : credDeffList && credDeffList.length > 0 ? (
From e32aa78c5215e391dcb21007c4fe0f4f24238ae2 Mon Sep 17 00:00:00 2001 From: pranalidhanavade Date: Fri, 8 Sep 2023 12:16:31 +0530 Subject: [PATCH 2/2] refactor:Get schema details from LocalStorage for view schema page Signed-off-by: pranalidhanavade --- src/components/Resources/Schema/ViewSchema.tsx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/components/Resources/Schema/ViewSchema.tsx b/src/components/Resources/Schema/ViewSchema.tsx index 3fc113c31..0a487bdae 100644 --- a/src/components/Resources/Schema/ViewSchema.tsx +++ b/src/components/Resources/Schema/ViewSchema.tsx @@ -29,10 +29,8 @@ interface SchemaData { createdDateTime: string; }; - - const ViewSchemas = () => { - const [schemaDetails, setSchemaDetails] = useState(); + const [schemaDetails, setSchemaDetails] = useState(null); const [credDeffList, setCredDeffList] = useState([]); const [loading, setLoading] = useState(true) const [createloader, setCreateLoader] = useState(false) @@ -47,20 +45,15 @@ const ViewSchemas = () => { const getSchemaDetails = async () => { try { - const schemaDetails = await getFromLocalStorage(storageKeys.SCHEMA_ATTR) const schemaId = await getFromLocalStorage(storageKeys.SCHEMA_ID) const parts = schemaId.split(":"); const schemaName = parts[2]; const version = parts[3]; - console.log("schemaId::::", schemaId) const schemaDidObject = JSON.parse(schemaDetails) schemaDidObject.schema = schemaId; - await setToLocalStorage(storageKeys.SCHEMA_ID, schemaId) - // setSchemaDetails(schemaDidObject) - console.log("schemaDidObject::::", schemaDidObject) if (schemaDidObject) { setLoading(false); setSchemaDetails({ @@ -75,16 +68,12 @@ const ViewSchemas = () => { } setLoading(false); - } catch (error) { setSchemaDetailErr('Error while fetching schema details') - console.error('Error while fetching schema details:', error); setLoading(false); } }; - - const getCredentialDefinitionList = async (id: string, orgId: number) => { try { setCredDeffloader(true); @@ -150,7 +139,6 @@ const ViewSchemas = () => { await setToLocalStorage(storageKeys.CRED_DEF_ID, credentialDefinitionId) window.location.href = `${pathRoutes.organizations.Issuance.connections}` } - console.log("setSchemaDetails7888979809798", schemaDetails) return (