From 0cda5360cd893f90f9bd9b6f5061a464bbc35694 Mon Sep 17 00:00:00 2001 From: pranalidhanavade <137780597+pranalidhanavade@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:26:28 +0530 Subject: [PATCH] merge: dev to qa (#746) * [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 * fix: OOB issuance with other organizations schema (#741) * fix: create did ui fixes Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade * fix: OOB issuance with other organizations schema Signed-off-by: pranalidhanavade * fix: removed consoles Signed-off-by: pranalidhanavade * fix: sonarcloud issues Signed-off-by: pranalidhanavade --------- Signed-off-by: pranalidhanavade * fix: radio button state issue on shared and dedicated wallet creation (#743) Signed-off-by: pranalidhanavade * fix: bugs (#744) * 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 * fix: popup card fixes Signed-off-by: bhavanakarwade * fix: remove click on card Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade * fix: bugs (#745) * 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 * fix: popup card fixes Signed-off-by: bhavanakarwade * fix: remove click on card Signed-off-by: bhavanakarwade * fix: remove card click Signed-off-by: bhavanakarwade * fix: cred def details 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: bhavanakarwade 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/components/Issuance/EmailIssuance.tsx | 3 +- src/components/Issuance/interface.ts | 1 + .../Verification/AttributesListData.tsx | 104 ++++++++++++++---- .../Verification/EmailCredDefSelection.tsx | 47 ++++---- .../Verification/ProofRequestPopup.tsx | 30 ++--- 5 files changed, 121 insertions(+), 64 deletions(-) diff --git a/src/components/Issuance/EmailIssuance.tsx b/src/components/Issuance/EmailIssuance.tsx index 862803a52..fab81522d 100644 --- a/src/components/Issuance/EmailIssuance.tsx +++ b/src/components/Issuance/EmailIssuance.tsx @@ -210,8 +210,8 @@ const EmailIssuance = () => { transformedData.credentialOffer.push(transformedEntry); }); transformedData.credentialDefinitionId = credDefId; + transformedData.isReuseConnection = true; - } else if (schemaType=== SchemaTypes.schema_W3C) { existingData.formData.forEach((entry: { email: string; credentialData: IEmailCredentialData; attributes:IIssueAttributes[] }) => { @@ -253,6 +253,7 @@ const EmailIssuance = () => { }); transformedData.protocolVersion = "v2"; + transformedData.isReuseConnection = true; transformedData.credentialType = CredentialType.JSONLD; } diff --git a/src/components/Issuance/interface.ts b/src/components/Issuance/interface.ts index 8c27ddd77..fe161edc9 100644 --- a/src/components/Issuance/interface.ts +++ b/src/components/Issuance/interface.ts @@ -187,5 +187,6 @@ export interface ICredentialOffer { credentialOffer: ICredentialOffer[]; credentialDefinitionId?: string; protocolVersion?: string; + isReuseConnection?: boolean; credentialType?: string; } \ No newline at end of file diff --git a/src/components/Verification/AttributesListData.tsx b/src/components/Verification/AttributesListData.tsx index 9eac679dd..0d89dbb7b 100644 --- a/src/components/Verification/AttributesListData.tsx +++ b/src/components/Verification/AttributesListData.tsx @@ -2,45 +2,101 @@ import { Card } from 'flowbite-react'; import CopyDid from '../../commonComponents/CopyDid'; interface AttributesListProps { - attributeDataList: { [key: string]: any }[] + attributeDataList: { [key: string]: any }[]; } +const groupAndMergeAttributes = (data: { [key: string]: any }[], key: string): { [key: string]: any }[] => { + const grouped = data.reduce((result, item) => { + const groupKey = item[key] || item['schemaId']; + if (!result[groupKey]) { + result[groupKey] = {}; + } + // Merge attributes into a single object + result[groupKey] = { ...result[groupKey], ...item }; + return result; + }, {} as { [key: string]: any }); + + // Convert the grouped object back to an array + return Object.values(grouped); +}; + const AttributesListData = ({ attributeDataList }: AttributesListProps): JSX.Element => { - return ( - <> - {attributeDataList?.map((item, index) => ( - -
-
- {`Credential ${index + 1}`} -
+ const mergedData = groupAndMergeAttributes(attributeDataList, 'credDefId'); + return ( + <> + {mergedData?.map((item, index) => ( + +
+
+ {`Credential ${index + 1}`} +
- {Object.entries(item).map(([key, value], idx) => ( -
-
- {key} +
+
+
+ Attributes +
+
+
+ {' '} + Values
-
- : +
+ + {Object.entries(item) + .filter(([key]) => key !== 'credDefId' && key !== 'schemaId') + .map(([key, value], idx) => ( +
+
+ + {key} +
+
+ : +
+
+ {value} +
+
+ ))} +
+ +
+
+
+ schemaId
+
:
- {key === 'schemaId' || key === 'credDefId' ? ( +
+ +
+
+
+
+ + {item.credDefId && ( +
+
+
+ credDefId +
+
:
+
- +
- ) : ( - {value} - )} +
- ))} + )}
))} - - ); -} + + ); +}; export default AttributesListData; diff --git a/src/components/Verification/EmailCredDefSelection.tsx b/src/components/Verification/EmailCredDefSelection.tsx index aeddbaaff..0448f4608 100644 --- a/src/components/Verification/EmailCredDefSelection.tsx +++ b/src/components/Verification/EmailCredDefSelection.tsx @@ -110,43 +110,42 @@ const EmailCredDefSelection = () => { }; const selectConnection = async (credDefId: string, checked: boolean) => { - if (credDefId) { - const getRawCredDefs = await getFromLocalStorage(storageKeys.SCHEMA_CRED_DEFS); - const parsedRawCredDefs = JSON.parse(getRawCredDefs); - - const selectedCredDef = parsedRawCredDefs.find((credDef: CredDefData) => credDef.credentialDefinitionId === credDefId); - - if (selectedCredDef) { - setSelectedCredDefs((prevSelected) => { + if (!credDefId) return; + + const getRawCredDefs = await getFromLocalStorage(storageKeys.SCHEMA_CRED_DEFS); + const parsedRawCredDefs = JSON.parse(getRawCredDefs); + + const selectedCredDef = parsedRawCredDefs.find( + (credDef: CredDefData) => credDef.credentialDefinitionId === credDefId + ); + + if (selectedCredDef) { + setSelectedCredDefs((prevSelected) => { + if (checked) { const isAlreadySelected = prevSelected.some( (credDef) => credDef.credentialDefinitionId === selectedCredDef.credentialDefinitionId ); - + if (!isAlreadySelected) { const newSelected = [...prevSelected, selectedCredDef]; - setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected)); - return newSelected; } - return prevSelected; - }); - } - } - else if (!checked) { - setSelectedCredDefs((prevSelected) => { - const newSelected = prevSelected.filter( - (credDef) => credDef.credentialDefinitionId !== credDefId - ); - - setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected)); - - return newSelected; + } else { + const newSelected = prevSelected.filter( + (credDef) => credDef.credentialDefinitionId !== selectedCredDef.credentialDefinitionId + ); + setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected)); + return newSelected; + } + + return prevSelected; }); } }; + return (
diff --git a/src/components/Verification/ProofRequestPopup.tsx b/src/components/Verification/ProofRequestPopup.tsx index edcc9242b..ee1d207b4 100644 --- a/src/components/Verification/ProofRequestPopup.tsx +++ b/src/components/Verification/ProofRequestPopup.tsx @@ -87,21 +87,7 @@ const ProofRequest = (props: IProofRrquestDetails) => { {' '} Verification Details

- {props.verifyLoading ? ( -
- -
- ) : ( -
-
- - - -
-
- )} -
- {succesMsg && ( + {succesMsg && (
{
)} + {props.verifyLoading ? ( +
+ +
+ ) : ( +
+
+ + + +
+
+ )} +