Skip to content
Snippets Groups Projects
Commit 34e1d82d authored by Steffen Schulze's avatar Steffen Schulze
Browse files

Merge branch 'feature/small-fixes' into 'main'

Refactor credential types and remove proof from presentation  - Update import...

See merge request eclipse/xfsc/personal-credential-manager-cloud/web-ui!61
parents 25143119 7d5c9ac0
No related branches found
No related tags found
No related merge requests found
...@@ -5,13 +5,7 @@ import { Button, Tab, Tabs } from 'react-bootstrap'; ...@@ -5,13 +5,7 @@ import { Button, Tab, Tabs } from 'react-bootstrap';
import { faRightLeft, faRightToBracket } from '@fortawesome/free-solid-svg-icons'; import { faRightLeft, faRightToBracket } from '@fortawesome/free-solid-svg-icons';
import DidSelection from '../did-selection/DidSelection'; import DidSelection from '../did-selection/DidSelection';
import CardDocument from '../card-document/CardDocument'; import CardDocument from '../card-document/CardDocument';
import type { import type { CredentialData, Description, PresentationDefinitionData, VerifiableCredentials } from '@/service/types';
Credential,
Description,
PresentationDefinitionData,
ValidCredential,
VerifiableCredentials,
} from '@/service/types';
import { useDrop } from 'react-dnd'; import { useDrop } from 'react-dnd';
import { useContext, useEffect, useState } from 'react'; import { useContext, useEffect, useState } from 'react';
import { genericFetch } from '@/service/apiService'; import { genericFetch } from '@/service/apiService';
...@@ -26,7 +20,7 @@ interface PresentationSelectionProps { ...@@ -26,7 +20,7 @@ interface PresentationSelectionProps {
} }
interface CredentialDescription { interface CredentialDescription {
credential: Credential; credential: CredentialData;
description: Description; description: Description;
id: string; id: string;
} }
...@@ -38,7 +32,7 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection ...@@ -38,7 +32,7 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection
const t = useTranslations('Presentation'); const t = useTranslations('Presentation');
const [{ isOver }, drop] = useDrop({ const [{ isOver }, drop] = useDrop({
accept: 'credential', accept: 'credential',
drop: (item: { credential: Credential; description: Description; id: string }) => { drop: (item: { credential: CredentialData; description: Description; id: string }) => {
setPresentation([ setPresentation([
...presentation, ...presentation,
{ {
...@@ -103,9 +97,6 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection ...@@ -103,9 +97,6 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection
body: JSON.stringify({ body: JSON.stringify({
signKeyId: selectedDID, signKeyId: selectedDID,
filters: presentation.map<VerifiableCredentials>(credential => { filters: presentation.map<VerifiableCredentials>(credential => {
// remove the proof from the credential before sending it to avoid errors
delete credential.credential.proof;
return { return {
description: { description: {
id: presentationDefinition.id, id: presentationDefinition.id,
...@@ -196,7 +187,7 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection ...@@ -196,7 +187,7 @@ const PresentationSelection = ({ presentationDefinition }: PresentationSelection
{presentation.map(credential => ( {presentation.map(credential => (
<CardDocument <CardDocument
key={credential.id} key={credential.id}
credential={credential.credential as ValidCredential} credential={credential.credential}
description={credential.description} description={credential.description}
id={credential.id} id={credential.id}
/> />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment