@procivis/one-react-native-components 0.3.94 → 0.3.95

package/src/utils/history.ts

@@ -1,8 +1,6 @@
-import { Claim, ClaimValue, DataTypeEnum, HistoryListItem, ProofInputClaim } from '@procivis/react-native-one-core';
+import { HistoryListItem } from '@procivis/react-native-one-core';
 import moment, { Moment } from 'moment';
 
-import { nonEmptyFilter } from './filtering';
-
 export interface HistoryGroupByDaySection {
   data: HistoryListItem[];
   date: Moment;
@@ -30,42 +28,3 @@ export const groupEntriesByDay = (entries: HistoryListItem[]) => {
       return item;
     });
 };
-
-export const claimValueFromProofInputClaim = ({ schema, value }: ProofInputClaim): ClaimValue | undefined => {
-  if (!value) {
-    return undefined;
-  }
-
-  if (Array.isArray(value)) {
-    const values = value.map(claimFromProofInputClaim).filter(nonEmptyFilter);
-    return schema.dataType === (DataTypeEnum.Object as string)
-      ? {
-          array: schema.array,
-          dataType: DataTypeEnum.Object,
-          value: values,
-        }
-      : {
-          array: true,
-          dataType: schema.dataType,
-          value: values,
-        };
-  }
-
-  return {
-    array: false,
-    dataType: schema.dataType,
-    value,
-  };
-};
-
-export const claimFromProofInputClaim = (input: ProofInputClaim): Claim | undefined => {
-  const value = claimValueFromProofInputClaim(input);
-  if (!value) {
-    return undefined;
-  }
-  return {
-    ...value,
-    id: input.schema.id,
-    key: input.schema.key,
-  };
-};

package/src/utils/parsers/credential-sharing-v2.tsx

@@ -1,7 +1,7 @@
 import {
   Claim,
+  ClaimValue,
   Config,
-  DataTypeEnum,
   FailureHint,
   PresentationDefinitionV2ClaimValue,
   PresentationDefinitionV2CredentialClaim,
@@ -27,7 +27,7 @@ import {
 } from '.';
 import { ShareCredentialCardLabels, validityCheckedCardFromCredential } from './credential-sharing';
 
-const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): string | number | boolean | Claim[] => {
+const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): ClaimValue => {
   if (!Array.isArray(value)) {
     return value;
   }
@@ -35,31 +35,10 @@ const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): st
 };
 
 const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2CredentialClaim): Claim => {
-  if (Array.isArray(claim.value)) {
-    if (claim.schema.array) {
-      return {
-        array: claim.schema.array,
-        dataType: claim.schema.datatype,
-        id: claim.path,
-        key: claim.path,
-        value: v2ClaimValueToClaimValue(claim.value) as Claim[],
-      };
-    } else {
-      return {
-        array: claim.schema.array,
-        dataType: DataTypeEnum.Object,
-        id: claim.path,
-        key: claim.path,
-        value: v2ClaimValueToClaimValue(claim.value) as Claim[],
-      };
-    }
-  }
   return {
-    array: false,
-    dataType: claim.schema.datatype,
-    id: claim.path,
-    key: claim.path,
-    value: claim.value,
+    schema: claim.schema,
+    path: claim.path,
+    value: v2ClaimValueToClaimValue(claim.value),
   };
 };
 

package/src/utils/parsers/credential-sharing.tsx

@@ -124,28 +124,18 @@ const getAttributeSelectorStatus = (
   return selected ? SelectorStatus.SelectedCheckmark : SelectorStatus.Empty;
 };
 
-type ClaimWithOptionalPath = Claim & {
-  path?: string;
-};
-
 type FlatClaim = Claim & {
-  path: string;
   isArrayElement?: boolean;
 };
 
 // Returns a spread list of all claims with their full JSON path as key, including all intermediate objects
-const spreadClaims = (claims: ClaimWithOptionalPath[]): FlatClaim[] => {
-  const claimsWithPath: FlatClaim[] = claims.map((c) => ({
-    ...c,
-    path: c.path ?? c.key,
-  }));
-  return claimsWithPath.reduce((acc, claim) => {
+const spreadClaims = (claims: Claim[]): FlatClaim[] => {
+  return claims.reduce((acc, claim) => {
     const result = [claim];
     if (Array.isArray(claim.value)) {
-      const nestedClaimsWithPath: FlatClaim[] = claim.value.map((c, i) => ({
+      const nestedClaimsWithPath: FlatClaim[] = claim.value.map((c) => ({
         ...c,
-        path: claim.array ? `${c.key}/${i}` : c.key,
-        isArrayElement: claim.array,
+        isArrayElement: claim.schema.array && claim.path.split('/').pop() !== claim.schema.key,
       }));
       result.push(...spreadClaims(nestedClaimsWithPath));
     }

package/src/utils/parsers/credential.ts

@@ -47,21 +47,8 @@ export const supportsSelectiveDisclosure = (credential: CredentialListItem | und
     : undefined;
 };
 
-const findClaimByPathParts = (path: string[], claims?: Claim[]): Claim | undefined => {
-  if (!claims?.length) {
-    return undefined;
-  }
-  const [first, second, ...rest] = path;
-  const claim = claims.find((c) => c.key === first);
-  if (claim === undefined || second === undefined || claim.dataType !== DataTypeEnum.Object) {
-    return claim;
-  }
-
-  return findClaimByPathParts([`${first}/${second}`, ...rest], claim.value as Claim[]);
-};
-
 export const findClaimByPath = (path: string | undefined, claims: Claim[] | undefined) =>
-  path ? findClaimByPathParts(path.split('/'), claims) : undefined;
+  path ? claims?.find((claim) => claim.path === path) : undefined;
 
 const formatCredentialDetail = (claim: Claim, config: Config, testID: string): string => {
   const attributeValue = detailsCardAttributeValueFromClaim(claim, config, testID);
@@ -224,27 +211,20 @@ export const getCredentialCardPropsFromCredential = (
 export const detailsCardAttributeFromClaim = (claim: Claim, config: Config, testID: string): CredentialAttribute => {
   const value = detailsCardAttributeValueFromClaim(claim, config, testID);
   return {
-    id: claim.id,
-    name: claim.key.split('/').pop(),
-    path: claim.key,
+    id: claim.path,
+    name: claim.path.split('/').pop(),
+    path: claim.path,
     ...value,
   };
 };
 
 const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID: string): CredentialAttributeValue => {
-  const typeConfig = config?.datatype[claim.dataType];
+  const typeConfig = config?.datatype[claim.schema.datatype];
 
-  if (claim.array) {
+  if (claim.schema.array) {
     return {
-      values: (claim.value || []).map((arrayValue, index) => {
-        return detailsCardAttributeFromClaim(
-          {
-            ...arrayValue,
-            id: `${arrayValue.id}/${index}`,
-          },
-          config,
-          concatTestID(testID, index.toString()),
-        );
+      values: ((claim.value as Claim[]) || []).map((arrayValue, index) => {
+        return detailsCardAttributeFromClaim(arrayValue, config, concatTestID(testID, index.toString()));
       }),
     };
   } else {