From d4ddfa0b43fee24125b78261c98b359f4c046c31 Mon Sep 17 00:00:00 2001 From: bhavanakarwade <137506897+bhavanakarwade@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:03:06 +0530 Subject: [PATCH] merge/ dev-to-qa-17-07-2024 (#720) * [Deno Deploy] Update .github/workflows/deploy.yml * feat: support no ledger (#689) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade * wip: modified no ledger screen Signed-off-by: bhavanakarwade * feat: modified ui for create did popup Signed-off-by: bhavanakarwade * refactor: worked on error handling Signed-off-by: bhavanakarwade * fix: validations on create did popup Signed-off-by: bhavanakarwade * refactor: mapping function Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * fix: input box issues Signed-off-by: bhavanakarwade * refactor: handled role wise conditions Signed-off-by: bhavanakarwade * fix: resolved code duplication errors Signed-off-by: bhavanakarwade * fix: enum values Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * fixed CSS and avatar issues (#696) * fix:css issues Signed-off-by: pranalidhanavade * fix:sonarcloud issues Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * feat: support no ledger (#697) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade * wip: modified no ledger screen Signed-off-by: bhavanakarwade * feat: modified ui for create did popup Signed-off-by: bhavanakarwade * refactor: worked on error handling Signed-off-by: bhavanakarwade * fix: validations on create did popup Signed-off-by: bhavanakarwade * refactor: mapping function Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * fix: input box issues Signed-off-by: bhavanakarwade * refactor: handled role wise conditions Signed-off-by: bhavanakarwade * fix: resolved code duplication errors Signed-off-by: bhavanakarwade * fix: enum values Signed-off-by: bhavanakarwade * fix: added loading chnages Signed-off-by: bhavanakarwade * fix: ledgerconfig object changes Signed-off-by: bhavanakarwade * fix: resolved type errors Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * refactor: responsiveness of the component (#699) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade * wip: modified no ledger screen Signed-off-by: bhavanakarwade * feat: modified ui for create did popup Signed-off-by: bhavanakarwade * refactor: worked on error handling Signed-off-by: bhavanakarwade * fix: validations on create did popup Signed-off-by: bhavanakarwade * refactor: mapping function Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * fix: input box issues Signed-off-by: bhavanakarwade * refactor: handled role wise conditions Signed-off-by: bhavanakarwade * fix: resolved code duplication errors Signed-off-by: bhavanakarwade * fix: enum values Signed-off-by: bhavanakarwade * fix: added loading chnages Signed-off-by: bhavanakarwade * fix: ledgerconfig object changes Signed-off-by: bhavanakarwade * fix: resolved type errors Signed-off-by: bhavanakarwade * refactor: modified responsiveness of the component Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * feat: manage keycloak client Signed-off-by: bhavanakarwade * refactor: updated env sample file Signed-off-by: bhavanakarwade * fix: error messages issue from create organization and create ecosystem modals. (#698) * fix:css issues Signed-off-by: pranalidhanavade * fix:sonarcloud issues Signed-off-by: pranalidhanavade * fix:clear error on pop-up close Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fix: css issues (#704) * refactor: parameter name Signed-off-by: bhavanakarwade * refactor: added query parameter Signed-off-by: bhavanakarwade * fix: remove unnecessary code Signed-off-by: bhavanakarwade * fix: query param issue Signed-off-by: bhavanakarwade * fix: css issues Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * feat: add passkey warning message for unsupported devices (#706) * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * fix: removed commnets Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * Feat/passkey warning messages (#707) * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * fix: removed commnets Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade * feat: add passkey warning message for unsupported devices Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * feat: dedicated agent workflow (#693) * feat:Working on dedicated agent workflow Signed-off-by: rohit.shitre * feat/dedicated agent ui form Signed-off-by: pranalidhanavade * feat/ conditional rendering of forms Signed-off-by: pranalidhanavade * feat:add support for dedicated agent Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * feat:dedicated agent workflow ui Signed-off-by: pranalidhanavade * feat:dedicated agent workflow Signed-off-by: pranalidhanavade * fix:sonarcloud issues Signed-off-by: pranalidhanavade * fix: duplication issue of sonarcloud Signed-off-by: pranalidhanavade * fix: duplication code issue of sonarcloud Signed-off-by: pranalidhanavade * fix: duplication code issue of sonarcloud Signed-off-by: pranalidhanavade * fix: sonarlint issues Signed-off-by: pranalidhanavade * fix: sonarlint duplication issue Signed-off-by: pranalidhanavade * feat:dedicated agent workflow Signed-off-by: pranalidhanavade * fixed:sonarcloud issues Signed-off-by: pranalidhanavade * fixed:sonarcloud issues Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * feat: support for dedicated agent Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: formik validations Signed-off-by: pranalidhanavade * fix:dedicated agent formik validations Signed-off-by: pranalidhanavade * fix: yup formik validations Signed-off-by: pranalidhanavade * fix: static values from enum Signed-off-by: pranalidhanavade --------- Signed-off-by: rohit.shitre Signed-off-by: pranalidhanavade Co-authored-by: rohit.shitre * fix: formik validations for dedicated agent workflow (#708) * feat:Working on dedicated agent workflow Signed-off-by: rohit.shitre * feat/dedicated agent ui form Signed-off-by: pranalidhanavade * feat/ conditional rendering of forms Signed-off-by: pranalidhanavade * feat:add support for dedicated agent Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * feat:dedicated agent workflow integration Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * feat:dedicated agent workflow ui Signed-off-by: pranalidhanavade * feat:dedicated agent workflow Signed-off-by: pranalidhanavade * fix:sonarcloud issues Signed-off-by: pranalidhanavade * fix: duplication issue of sonarcloud Signed-off-by: pranalidhanavade * fix: duplication code issue of sonarcloud Signed-off-by: pranalidhanavade * fix: duplication code issue of sonarcloud Signed-off-by: pranalidhanavade * fix: sonarlint issues Signed-off-by: pranalidhanavade * fix: sonarlint duplication issue Signed-off-by: pranalidhanavade * feat:dedicated agent workflow Signed-off-by: pranalidhanavade * fixed:sonarcloud issues Signed-off-by: pranalidhanavade * fixed:sonarcloud issues Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * feat: support for dedicated agent Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: formik validations Signed-off-by: pranalidhanavade * fix:dedicated agent formik validations Signed-off-by: pranalidhanavade * fix: yup formik validations Signed-off-by: pranalidhanavade * fix: static values from enum Signed-off-by: pranalidhanavade * fix: polygon formik validation error Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade --------- Signed-off-by: rohit.shitre Signed-off-by: pranalidhanavade Co-authored-by: rohit.shitre * fix: create did button restrictions (#710) * refactor: parameter name Signed-off-by: bhavanakarwade * refactor: added query parameter Signed-off-by: bhavanakarwade * fix: remove unnecessary code Signed-off-by: bhavanakarwade * fix: query param issue Signed-off-by: bhavanakarwade * fix: css issues Signed-off-by: bhavanakarwade * fix: create did button restrictions Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * feat: changed schema payload (#711) Signed-off-by: tipusinghaw * feat/delete wallet and organization (#712) * feat: delete organization and wallet Signed-off-by: pranalidhanavade * feat: delete org and wallet Signed-off-by: pranalidhanavade * feat: added custom card component for delet card Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed unused code Signed-off-by: pranalidhanavade * changes in delete organization svg image Signed-off-by: pranalidhanavade * changes in delete organization svg image Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade * feat: added custom message for ecosystem lead role Signed-off-by: pranalidhanavade * feat: added interfaces into interface file Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fix: custom-avatar-css-issues (#714) Signed-off-by: pranalidhanavade * feat: delete wallet and organization (#715) * feat: delete organization and wallet Signed-off-by: pranalidhanavade * feat: delete org and wallet Signed-off-by: pranalidhanavade * feat: added custom card component for delet card Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: removed unused code Signed-off-by: pranalidhanavade * changes in delete organization svg image Signed-off-by: pranalidhanavade * changes in delete organization svg image Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade * feat: added custom message for ecosystem lead role Signed-off-by: pranalidhanavade * feat: added interfaces into interface file Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade * fix: dark mode css issues Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * refactor: added query parameter in get all schemas API (#713) * refactor: modified bulk issuance payload Signed-off-by: bhavanakarwade * refactor: added query parameter in get all schemas API Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * refactor: request schema payload (#717) Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade Signed-off-by: pranalidhanavade Signed-off-by: rohit.shitre Signed-off-by: tipusinghaw Co-authored-by: deno-deploy[bot] <75045203+deno-deploy[bot]@users.noreply.github.com> Co-authored-by: pranalidhanavade <137780597+pranalidhanavade@users.noreply.github.com> Co-authored-by: shitrerohit <37360542+shitrerohit@users.noreply.github.com> Co-authored-by: rohit.shitre Co-authored-by: tipusinghaw <126460794+tipusinghaw@users.noreply.github.com> --- src/api/ecosystem.ts | 3 +-- src/components/Resources/Schema/Create.tsx | 12 ++++++++---- src/components/organization/interfaces/index.ts | 2 +- .../walletCommonComponents/WalletSpinup.tsx | 5 +++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts index 47035d566..6bb1d6c2e 100644 --- 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 index e3ef1174d..5ed1c5957 100644 --- 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 index 166bdc131..361783e73 100644 --- a/src/components/organization/interfaces/index.ts +++ b/src/components/organization/interfaces/index.ts @@ -275,4 +275,4 @@ export interface ILedgerItem { ecosystemId: string; ecosystemRoleId: string; ecosystemRole: IEcosystemRole; - } + } \ No newline at end of file diff --git a/src/components/organization/walletCommonComponents/WalletSpinup.tsx b/src/components/organization/walletCommonComponents/WalletSpinup.tsx index 091958633..8b2d7e195 100644 --- a/src/components/organization/walletCommonComponents/WalletSpinup.tsx +++ b/src/components/organization/walletCommonComponents/WalletSpinup.tsx @@ -3,6 +3,7 @@ import { getFromLocalStorage } from '../../../api/Auth'; import { createDid, getOrganizationById, + spinupDedicatedAgent, spinupSharedAgent, } from '../../../api/organization'; import { useEffect, useState } from 'react'; @@ -47,7 +48,7 @@ const WalletSpinup = (props: { const [orgData, setOrgData] = useState(null); const [isShared, setIsShared] = useState(false); const [isConfiguredDedicated, setIsConfiguredDedicated] = useState(false); - + const maskSeeds = (seed: string) => { const visiblePart = seed.slice(0, -10); const maskedPart = seed.slice(-10).replace(/./g, '*'); @@ -67,6 +68,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) @@ -89,7 +91,6 @@ const WalletSpinup = (props: { fetchOrganizationDetails() }, []); - const onRadioSelect = (type: string) => { setAgentType(type); };