From f42b30503b95773cccc8f7bc0805317fcea6190d Mon Sep 17 00:00:00 2001 From: tipusinghaw <126460794+tipusinghaw@users.noreply.github.com> Date: Tue, 27 Aug 2024 20:36:03 +0530 Subject: [PATCH] merge: develop to qa (#740) * [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 * fix:client id and secret encryption (#724) Signed-off-by: pranalidhanavade * Client id client secret encryption (#726) * fix:client id and secret encryption Signed-off-by: pranalidhanavade * fix: text changes Signed-off-by: pranalidhanavade * fix: env variable changes Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * feat: create schema flow for w3c (#718) * feat: create schema flow for w3c Signed-off-by: pranalidhanavade * feat: w3c create schema flow Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * wip: verification with email (#722) * wip: email verification Signed-off-by: bhavanakarwade * wip: verification using email Signed-off-by: bhavanakarwade * wip: verification with email Signed-off-by: bhavanakarwade * wip: routes changes for verification dashboard Signed-off-by: bhavanakarwade * wip: routes changes Signed-off-by: bhavanakarwade * wip: Implemented custom dashboard component for veriifcation and issuance dashboard Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * feat: Implement w3c issuance with connection,email and bulk. (#721) * feat: create schema flow for w3c Signed-off-by: pranalidhanavade * feat: w3c create schema flow Signed-off-by: pranalidhanavade * feat: w3c issuance with connections, email and bulk Signed-off-by: pranalidhanavade * fix: removed console statements Signed-off-by: pranalidhanavade * fix: removed console statements in schema summarycard Signed-off-by: pranalidhanavade * fix: fixed changes in issuance payload for w3c Signed-off-by: pranalidhanavade * feat: w3c issuance astro route changes Signed-off-by: pranalidhanavade * fix: added static values from common enum Signed-off-by: pranalidhanavade * fix: w3c button on card Signed-off-by: pranalidhanavade * fix: comments on pull request Signed-off-by: pranalidhanavade * fix: delete organization pop up description messages Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * feat: W3C verifcation with connections. (#729) * feat: w3c verification flow Signed-off-by: pranalidhanavade * fix: changes in create schema to remove version for w3c Signed-off-by: pranalidhanavade * fix: removed commnet Signed-off-by: pranalidhanavade * fix: removed comment Signed-off-by: pranalidhanavade * fix: changes in enum file Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: schema creddef popup on verification list Signed-off-by: pranalidhanavade * fix: schema creddef popup on verification list Signed-off-by: pranalidhanavade * fix: sonarlint issues Signed-off-by: pranalidhanavade * fix: sonarlint issues Signed-off-by: pranalidhanavade * fix: sonarlint issues by optimizing code Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fiz: removed unwanted code from astro components Signed-off-by: pranalidhanavade * feat: oob verification using email (#732) * wip: email verification Signed-off-by: bhavanakarwade * wip: verification using email Signed-off-by: bhavanakarwade * wip: verification with email Signed-off-by: bhavanakarwade * wip: routes changes for verification dashboard Signed-off-by: bhavanakarwade * wip: routes changes Signed-off-by: bhavanakarwade * wip: Implemented custom dashboard component for veriifcation and issuance dashboard Signed-off-by: bhavanakarwade * wip: oob verification Signed-off-by: bhavanakarwade * feat: oob verification with email Signed-off-by: bhavanakarwade * wip: resolved conflicts Signed-off-by: bhavanakarwade * wip: oob verification with email Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * worked on sonarlint issues Signed-off-by: bhavanakarwade * fix: resolved sonar cloud issues Signed-off-by: bhavanakarwade * fix: resolved function name duplication error Signed-off-by: bhavanakarwade * refactor: get schema list details function Signed-off-by: bhavanakarwade * fix: interface issues Signed-off-by: bhavanakarwade * fix: resolved readability issues Signed-off-by: bhavanakarwade * fix: resolved spacing problems Signed-off-by: bhavanakarwade * resolved sonarlint issues Signed-off-by: bhavanakarwade * refactor: interface types Signed-off-by: bhavanakarwade * refactor: remove unnecessary tab list Signed-off-by: bhavanakarwade * fix: refactor enum file Signed-off-by: bhavanakarwade * refactor: common constant changes Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * fix: W3C issuance schemaName not displayed correctly on ADEYA. (#733) * fix: issuance schemaName issue Signed-off-by: pranalidhanavade * fix: verification breadcrumb fixes Signed-off-by: pranalidhanavade * fix: schema card hover issue Signed-off-by: pranalidhanavade * fix: delete organization delete svg issue Signed-off-by: pranalidhanavade * fix: sonarclous issues Signed-off-by: pranalidhanavade * fix: sonarlint issues duplication error Signed-off-by: pranalidhanavade * fix: added highlight tag for fixing code logic Signed-off-by: pranalidhanavade * fix: added limited attriutes value in common constant file Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * refactor: predicates number vaidations (#734) * wip: email verification Signed-off-by: bhavanakarwade * wip: verification using email Signed-off-by: bhavanakarwade * wip: verification with email Signed-off-by: bhavanakarwade * wip: routes changes for verification dashboard Signed-off-by: bhavanakarwade * wip: routes changes Signed-off-by: bhavanakarwade * wip: Implemented custom dashboard component for veriifcation and issuance dashboard Signed-off-by: bhavanakarwade * wip: oob verification Signed-off-by: bhavanakarwade * feat: oob verification with email Signed-off-by: bhavanakarwade * wip: resolved conflicts Signed-off-by: bhavanakarwade * wip: oob verification with email Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * worked on sonarlint issues Signed-off-by: bhavanakarwade * fix: resolved sonar cloud issues Signed-off-by: bhavanakarwade * fix: resolved function name duplication error Signed-off-by: bhavanakarwade * refactor: get schema list details function Signed-off-by: bhavanakarwade * fix: interface issues Signed-off-by: bhavanakarwade * fix: resolved readability issues Signed-off-by: bhavanakarwade * fix: resolved spacing problems Signed-off-by: bhavanakarwade * resolved sonarlint issues Signed-off-by: bhavanakarwade * refactor: interface types Signed-off-by: bhavanakarwade * refactor: remove unnecessary tab list Signed-off-by: bhavanakarwade * fix: refactor enum file Signed-off-by: bhavanakarwade * refactor: common constant changes Signed-off-by: bhavanakarwade * fix: unselected fields validations Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * Fix verification dashboard changes (#735) * fix: issuance schemaName issue Signed-off-by: pranalidhanavade * fix: verification breadcrumb fixes Signed-off-by: pranalidhanavade * fix: schema card hover issue Signed-off-by: pranalidhanavade * fix: delete organization delete svg issue Signed-off-by: pranalidhanavade * fix: sonarclous issues Signed-off-by: pranalidhanavade * fix: sonarlint issues duplication error Signed-off-by: pranalidhanavade * fix: added highlight tag for fixing code logic Signed-off-by: pranalidhanavade * fix: added limited attriutes value in common constant file Signed-off-by: pranalidhanavade * fix: resolved comments on pull request Signed-off-by: pranalidhanavade * fix: type errors in schemaList Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fix: email input box issue (#736) * wip: email verification Signed-off-by: bhavanakarwade * wip: verification using email Signed-off-by: bhavanakarwade * wip: verification with email Signed-off-by: bhavanakarwade * wip: routes changes for verification dashboard Signed-off-by: bhavanakarwade * wip: routes changes Signed-off-by: bhavanakarwade * wip: Implemented custom dashboard component for veriifcation and issuance dashboard Signed-off-by: bhavanakarwade * wip: oob verification Signed-off-by: bhavanakarwade * feat: oob verification with email Signed-off-by: bhavanakarwade * wip: resolved conflicts Signed-off-by: bhavanakarwade * wip: oob verification with email Signed-off-by: bhavanakarwade * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade * worked on sonarlint issues Signed-off-by: bhavanakarwade * fix: resolved sonar cloud issues Signed-off-by: bhavanakarwade * fix: resolved function name duplication error Signed-off-by: bhavanakarwade * refactor: get schema list details function Signed-off-by: bhavanakarwade * fix: interface issues Signed-off-by: bhavanakarwade * fix: resolved readability issues Signed-off-by: bhavanakarwade * fix: resolved spacing problems Signed-off-by: bhavanakarwade * resolved sonarlint issues Signed-off-by: bhavanakarwade * refactor: interface types Signed-off-by: bhavanakarwade * refactor: remove unnecessary tab list Signed-off-by: bhavanakarwade * fix: refactor enum file Signed-off-by: bhavanakarwade * refactor: common constant changes Signed-off-by: bhavanakarwade * fix: unselected fields validations Signed-off-by: bhavanakarwade * fix: css issue Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * fix: create wallet UI for shared and dedicated agents. (#738) * fix: create did ui fixes Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fix: routes changes for verifcation with email flow (#739) * 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 --------- 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: bhavanakarwade <137506897+bhavanakarwade@users.noreply.github.com> Co-authored-by: pranalidhanavade <137780597+pranalidhanavade@users.noreply.github.com> Co-authored-by: bhavanakarwade Co-authored-by: shitrerohit <37360542+shitrerohit@users.noreply.github.com> Co-authored-by: rohit.shitre Co-authored-by: pranalidhanavade --- .../Resources/Schema/SchemasList.tsx | 8 +- .../Verification/AttributesListData.tsx | 78 +++++++++---------- .../Verification/EmailAttributesSelection.tsx | 13 ++-- .../Verification/ProofRequestPopup.tsx | 13 ++-- .../Verification/VerificationDashboard.tsx | 2 +- .../walletCommonComponents/DedicatedAgent.tsx | 17 ++++ .../walletCommonComponents/SharedAgent.tsx | 21 ++++- .../walletCommonComponents/WalletSpinup.tsx | 1 + src/config/pathRoutes.ts | 12 +-- .../schema/attributes/index.astro | 14 ++++ .../attributes/verification-email/index.astro | 14 ++++ .../schema/cred-defs/attributes/index.astro | 14 ++++ .../attributes/verification-email/index.astro | 15 ++++ .../schema/cred-defs/index.astro | 17 ++++ .../verify-credentials/schema/index.astro | 16 ++++ 15 files changed, 188 insertions(+), 67 deletions(-) create mode 100644 src/pages/organizations/verification/verify-credentials/schema/attributes/index.astro create mode 100644 src/pages/organizations/verification/verify-credentials/schema/attributes/verification-email/index.astro create mode 100644 src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/index.astro create mode 100644 src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email/index.astro create mode 100644 src/pages/organizations/verification/verify-credentials/schema/cred-defs/index.astro create mode 100644 src/pages/organizations/verification/verify-credentials/schema/index.astro diff --git a/src/components/Resources/Schema/SchemasList.tsx b/src/components/Resources/Schema/SchemasList.tsx index 0c3760db6..bc1f9cfb6 100644 --- a/src/components/Resources/Schema/SchemasList.tsx +++ b/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(); const [searchValue, setSearchValue] = useState(''); + const [schemaType, setSchemaType] = useState(''); + const [w3cSchema,setW3CSchema]= useState(false); const [isNoLedger,setisNoLedger]= useState(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); diff --git a/src/components/Verification/AttributesListData.tsx b/src/components/Verification/AttributesListData.tsx index 845682abe..9eac679dd 100644 --- a/src/components/Verification/AttributesListData.tsx +++ b/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 ( - <> - -
-
-
- Attributes -
-
-
-
- {' '} - Values -
-
+const AttributesListData = ({ attributeDataList }: AttributesListProps): JSX.Element => { - { - attributeDataList?.map((item, index) => ( -
-
-
- {item?.entity} -
-
- : -
-
- {item?.properties.join(', ')} + return ( + <> + {attributeDataList?.map((item, index) => ( + +
+
+ {`Credential ${index + 1}`} +
+ + + {Object.entries(item).map(([key, value], idx) => ( +
+
+ {key} +
+
+ : +
+
+ {key === 'schemaId' || key === 'credDefId' ? ( +
+
-
+ ) : ( + {value} + )}
- )) - } - +
+ ))}
+ ))} + + ); +} - - ) - } - - export default AttributesListData; \ No newline at end of file +export default AttributesListData; diff --git a/src/components/Verification/EmailAttributesSelection.tsx b/src/components/Verification/EmailAttributesSelection.tsx index 905c70936..fd52e48dd 100644 --- a/src/components/Verification/EmailAttributesSelection.tsx +++ b/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); }} />
@@ -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 diff --git a/src/components/Verification/ProofRequestPopup.tsx b/src/components/Verification/ProofRequestPopup.tsx index 8fbdb3aef..edcc9242b 100644 --- a/src/components/Verification/ProofRequestPopup.tsx +++ b/src/components/Verification/ProofRequestPopup.tsx @@ -94,10 +94,9 @@ const ProofRequest = (props: IProofRrquestDetails) => { ) : (
- - + + +
)} @@ -204,11 +203,9 @@ const ProofRequest = (props: IProofRrquestDetails) => { ) : (
- + + -
)} diff --git a/src/components/Verification/VerificationDashboard.tsx b/src/components/Verification/VerificationDashboard.tsx index 16888675a..8334c8081 100644 --- a/src/components/Verification/VerificationDashboard.tsx +++ b/src/components/Verification/VerificationDashboard.tsx @@ -25,7 +25,7 @@ const VerificationDashboard = () => { ); }; diff --git a/src/components/organization/walletCommonComponents/DedicatedAgent.tsx b/src/components/organization/walletCommonComponents/DedicatedAgent.tsx index 60817dcfe..f1c0b7369 100644 --- a/src/components/organization/walletCommonComponents/DedicatedAgent.tsx +++ b/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 = () => * @@ -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(''); const [domainValue, setDomainValue] = useState(''); const [isLoading, setIsLoading] = useState(false); @@ -118,6 +120,7 @@ const DedicatedAgentForm = ({ const handleLedgerChanges = (e: ChangeEvent) => { setSelectedLedger(e.target.value); setSelectedMethod(''); + setIsSelectedNetwork(''); setSelectedDid(''); }; const handleMethodChanges = (e: ChangeEvent) => { @@ -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