Merge branch 'develop' of https://github.com/credebl/studio into merg…

…e/dev-to-qa-10-july Signed-off-by: pranalidhanavade <[email protected]>
credebl · Jul 10, 2024 · 5e79fe3 · 5e79fe3
2 parents 2ffdbaa + 1f4d3bc
commit 5e79fe3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts
@@ -110,11 +110,10 @@ export const getEndorsementList = async (
 
 export const createSchemaRequest = async (
 	data: object,
-	schemaType: string,
 	endorsementId: string,
 	orgId: string,
 ) => {
-	const url = `${apiRoutes.Ecosystem.root}/${endorsementId}/${orgId}${apiRoutes.Ecosystem.endorsements.createSchemaRequest}?schemaType=${schemaType}`;
+	const url = `${apiRoutes.Ecosystem.root}/${endorsementId}/${orgId}${apiRoutes.Ecosystem.endorsements.createSchemaRequest}`;
 	const payload = data;
 	const axiosPayload = {
 		url,

diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
@@ -23,6 +23,7 @@ import { createSchemaRequest } from '../../../api/ecosystem';
 import EcosystemProfileCard from '../../../commonComponents/EcosystemProfileCard';
 import ConfirmationModal from '../../../commonComponents/ConfirmationModal';
 import { SchemaType } from '../../../common/enums';
+import React from 'react';
 
 const options = [
 	{
@@ -157,14 +158,17 @@ const CreateSchema = () => {
 		setCreateLoader(true);
 		const schemaFieldName = {
 			endorse: true,
-			attributes: values.attribute,
-			version: values.schemaVersion,
-			name: values.schemaName,
+			type: SchemaType.INDY,
+			schemaPayload: {
+				schemaVersion: values.schemaVersion,
+				schemaName: values.schemaName,
+				attributes: values.attribute
+			},
 		};
 
 		const id = await getEcosystemId();
 
-		const createSchema = await createSchemaRequest(schemaFieldName, SchemaType.INDY, id, orgId);
+		const createSchema = await createSchemaRequest(schemaFieldName, id, orgId);
 		const { data } = createSchema as AxiosResponse;
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
 			setSuccess(data?.message);

diff --git a/src/components/organization/interfaces/index.ts b/src/components/organization/interfaces/index.ts
@@ -222,6 +222,7 @@ export interface IFormikValues {
 	privatekey: string;
 	endorserDid: string;
 }
+
 export interface IDedicatedAgentConfig {
 	walletName: string;
 	agentEndpoint: string;
@@ -249,6 +250,7 @@ export interface ILedgerItem {
     deletedAt: string | null;
   }
 
+
   export interface IOrgCount {
     verificationRecordsCount: number;
     connectionRecordsCount: number;

diff --git a/src/components/organization/walletCommonComponents/WalletSpinup.tsx b/src/components/organization/walletCommonComponents/WalletSpinup.tsx
@@ -16,6 +16,7 @@ import DedicatedAgentForm from '../walletCommonComponents/DedicatedAgent';
 import SharedAgentForm from './SharedAgent';
 import WalletSteps from './WalletSteps';
 import type { IValuesShared } from './interfaces';
+import React from 'react';
 import OrganizationDetails from '../OrganizationDetails';
 import type { Organisation } from '../interfaces';
 
@@ -48,6 +49,7 @@ const WalletSpinup = (props: {
 	const [isShared, setIsShared] = useState<boolean>(false);
 	const [isConfiguredDedicated, setIsConfiguredDedicated] = useState<boolean>(false);
 
+
 	const maskSeeds = (seed: string) => {
 		const visiblePart = seed.slice(0, -10);
 		const maskedPart = seed.slice(-10).replace(/./g, '*');
@@ -67,6 +69,7 @@ const WalletSpinup = (props: {
 	const fetchOrganizationDetails = async () => {
 		setLoading(true);
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+		const orgInfoData = await getFromLocalStorage(storageKeys.ORG_INFO);
 		const response = await getOrganizationById(orgId as string);
 		const { data } = response as AxiosResponse;
 		setLoading(false)
@@ -88,7 +91,6 @@ const WalletSpinup = (props: {
 	useEffect(() => {
        fetchOrganizationDetails()
     }, []);
-
 
 	const onRadioSelect = (type: string) => {
 		setAgentType(type);