From c4ec1f3abef289552d76cf979b7357ef04299ac1 Mon Sep 17 00:00:00 2001 From: gkatrakazas Date: Fri, 30 Aug 2024 10:05:11 +0300 Subject: [PATCH 1/4] Display age fields of credentials only if exist in claims in history page --- src/components/Credentials/CredentialInfo.js | 33 +++++++++++++++++--- src/pages/History/History.js | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/components/Credentials/CredentialInfo.js b/src/components/Credentials/CredentialInfo.js index 27c4b3c..5fd0b78 100644 --- a/src/components/Credentials/CredentialInfo.js +++ b/src/components/Credentials/CredentialInfo.js @@ -3,7 +3,7 @@ import { BiSolidCategoryAlt, BiSolidUserCircle } from 'react-icons/bi'; import { AiFillCalendar } from 'react-icons/ai'; import { RiPassExpiredFill, RiPassValidFill } from 'react-icons/ri'; import { MdTitle, MdGrade, MdOutlineNumbers, MdFlag, MdLocalPolice } from 'react-icons/md'; -import { TbRating18Plus } from "react-icons/tb"; +import { TbRating12Plus, TbRating14Plus, TbRating16Plus, TbRating18Plus, TbRating21Plus, TbCirclePlus } from "react-icons/tb"; import { GiLevelEndFlag } from 'react-icons/gi'; import { formatDate } from '../../functions/DateFormat'; import { parseCredential } from '../../functions/parseCredential'; @@ -18,8 +18,18 @@ const getFieldIcon = (fieldName) => { return ; case 'dateOfBirth': return ; + case 'over12': + return ; + case 'over14': + return ; + case 'over16': + return ; case 'over18': return ; + case 'over21': + return ; + case 'over': + return ; case 'id': return ; case 'familyName': @@ -61,7 +71,7 @@ const renderRow = (fieldName, label, fieldValue) => { } }; -const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:text-base pt-5 pr-2 w-full" }) => { +const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:text-base pt-5 pr-2 w-full", displayAgeFields = 'false' }) => { const [parsedCredential, setParsedCredential] = useState(null); @@ -96,8 +106,23 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex {renderRow('dateOfBirth', 'Birthday', parsedCredential?.dateOfBirth)} {renderRow('dateOfBirth', 'Birthday', parsedCredential?.birthdate)} {renderRow('dateOfBirth', 'Birthday', parsedCredential?.birth_date)} - {renderRow('over18', 'Age Over 18', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['18'] : null)} - {renderRow('over18', 'Age Over 18', parsedCredential?.age_over_18)} + {displayAgeFields === 'true' && ( + <> + {renderRow('over12', 'Age Over 12', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['12'] : null)} + {renderRow('over14', 'Age Over 14', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['14'] : null)} + {renderRow('over16', 'Age Over 16', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['16'] : null)} + {renderRow('over18', 'Age Over 18', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['18'] : null)} + {renderRow('over21', 'Age Over 21', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['21'] : null)} + + {renderRow('over12', 'Age Over 12', parsedCredential?.age_over_12)} + {renderRow('over14', 'Age Over 14', parsedCredential?.age_over_14)} + {renderRow('over16', 'Age Over 16', parsedCredential?.age_over_16)} + {renderRow('over18', 'Age Over 18', parsedCredential?.age_over_18)} + {renderRow('over21', 'Age Over 21', parsedCredential?.age_over_21)} + {renderRow('over', 'Age Over 65', parsedCredential?.age_over_65)} + + + )} )} diff --git a/src/pages/History/History.js b/src/pages/History/History.js index 99a3d17..8a5c84a 100644 --- a/src/pages/History/History.js +++ b/src/pages/History/History.js @@ -175,7 +175,7 @@ const History = () => {
- +
From 53136a2351357b3be3961f15230e2d56f2367640 Mon Sep 17 00:00:00 2001 From: gkatrakazas Date: Fri, 30 Aug 2024 10:26:11 +0300 Subject: [PATCH 2/4] increase max-height of credential info in select popup --- src/components/Popups/SelectCredentials.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Popups/SelectCredentials.js b/src/components/Popups/SelectCredentials.js index 4484ded..2584e62 100644 --- a/src/components/Popups/SelectCredentials.js +++ b/src/components/Popups/SelectCredentials.js @@ -248,7 +248,7 @@ function SelectCredentials({ showPopup, setShowPopup, setSelectionMap, conforman additionalClassName='text-xs w-full' />
From 8261ef96188c46dfd3a543809d7f87fc9763d837 Mon Sep 17 00:00:00 2001 From: pstamatop Date: Fri, 30 Aug 2024 12:23:08 +0300 Subject: [PATCH 3/4] Add extra fields in history --- src/components/Credentials/CredentialInfo.js | 17 +++++++++++++++-- src/pages/History/History.js | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/Credentials/CredentialInfo.js b/src/components/Credentials/CredentialInfo.js index 5fd0b78..b175158 100644 --- a/src/components/Credentials/CredentialInfo.js +++ b/src/components/Credentials/CredentialInfo.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { BiSolidCategoryAlt, BiSolidUserCircle } from 'react-icons/bi'; import { AiFillCalendar } from 'react-icons/ai'; import { RiPassExpiredFill, RiPassValidFill } from 'react-icons/ri'; -import { MdTitle, MdGrade, MdOutlineNumbers, MdFlag, MdLocalPolice } from 'react-icons/md'; +import { MdTitle, MdGrade, MdOutlineNumbers, MdFlag, MdLocalPolice, MdHome } from 'react-icons/md'; import { TbRating12Plus, TbRating14Plus, TbRating16Plus, TbRating18Plus, TbRating21Plus, TbCirclePlus } from "react-icons/tb"; import { GiLevelEndFlag } from 'react-icons/gi'; import { formatDate } from '../../functions/DateFormat'; @@ -45,6 +45,8 @@ const getFieldIcon = (fieldName) => { return ; case 'issuingCountry': return ; + case 'address': + return ; default: return null; } @@ -71,7 +73,7 @@ const renderRow = (fieldName, label, fieldValue) => { } }; -const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:text-base pt-5 pr-2 w-full", displayAgeFields = 'false' }) => { +const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:text-base pt-5 pr-2 w-full", displayAgeFields = 'false', displayExtraFields = 'false'}) => { const [parsedCredential, setParsedCredential] = useState(null); @@ -97,10 +99,12 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex {renderRow('familyName', 'Family Name', parsedCredential?.familyName)} {renderRow('familyName', 'Family Name', parsedCredential?.family_name)} {renderRow('familyName', 'Given Name', parsedCredential?.given_name)} + {renderRow('familyName', 'Birth Family Name', parsedCredential?.birth_family_name)} {renderRow('placeOfBirth', 'Place of Birth', parsedCredential?.place_of_birth?.locality)} {renderRow('placeOfBirth', 'Place of Birth', parsedCredential?.birth_place)} {renderRow('issuingCountry', 'Issuing Country', parsedCredential?.issuing_country)} {renderRow('issuingCountry', 'Issuing Authority', parsedCredential?.issuing_authority)} + {renderRow('issuingCountry', 'Issuing Company', parsedCredential?.issuing_company)} {renderRow('firstName', 'First Name', parsedCredential?.firstName)} {renderRow('id', 'Personal ID', parsedCredential?.personalIdentifier)} {renderRow('dateOfBirth', 'Birthday', parsedCredential?.dateOfBirth)} @@ -123,6 +127,15 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex )} + {displayExtraFields === 'true' && ( + <> + {renderRow('address', 'Address (City)', parsedCredential?.address?.locality)} + {renderRow('address', 'Address (Postal Code)', parsedCredential?.address?.postal_code)} + {renderRow('address', 'Address (Street)', parsedCredential?.address?.street_address)} + {renderRow('dateOfBirth', 'Birthday (Year)', parsedCredential?.age_birth_year)} + {renderRow('dateOfBirth', 'Age in years', parsedCredential?.age_in_years)} + + )} )} diff --git a/src/pages/History/History.js b/src/pages/History/History.js index 8a5c84a..ba8fca5 100644 --- a/src/pages/History/History.js +++ b/src/pages/History/History.js @@ -175,7 +175,7 @@ const History = () => {
- +
From 70656170c69181791eb340e72a8a2f4f924611a3 Mon Sep 17 00:00:00 2001 From: pstamatop Date: Fri, 30 Aug 2024 19:51:11 +0300 Subject: [PATCH 4/4] Group cred details and add missing ones --- src/components/Credentials/CredentialInfo.js | 16 ++++++++++++++-- src/components/Popups/SelectCredentials.js | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Credentials/CredentialInfo.js b/src/components/Credentials/CredentialInfo.js index b175158..062a4ed 100644 --- a/src/components/Credentials/CredentialInfo.js +++ b/src/components/Credentials/CredentialInfo.js @@ -100,6 +100,10 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex {renderRow('familyName', 'Family Name', parsedCredential?.family_name)} {renderRow('familyName', 'Given Name', parsedCredential?.given_name)} {renderRow('familyName', 'Birth Family Name', parsedCredential?.birth_family_name)} + {renderRow('familyName', 'Birth Family Name', parsedCredential?.family_name_birth)} + {parsedCredential?.nationalities && renderRow('placeOfBirth', 'Nationality', parsedCredential?.nationalities[0])} + {renderRow('placeOfBirth', 'Nationality', parsedCredential?.nationality?.value)} + {renderRow('placeOfBirth', 'Nationality (Country)', parsedCredential?.nationality?.countryName)} {renderRow('placeOfBirth', 'Place of Birth', parsedCredential?.place_of_birth?.locality)} {renderRow('placeOfBirth', 'Place of Birth', parsedCredential?.birth_place)} {renderRow('issuingCountry', 'Issuing Country', parsedCredential?.issuing_country)} @@ -110,6 +114,7 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex {renderRow('dateOfBirth', 'Birthday', parsedCredential?.dateOfBirth)} {renderRow('dateOfBirth', 'Birthday', parsedCredential?.birthdate)} {renderRow('dateOfBirth', 'Birthday', parsedCredential?.birth_date)} + {displayAgeFields === 'true' && ( <> {renderRow('over12', 'Age Over 12', parsedCredential?.age_equal_or_over ? parsedCredential?.age_equal_or_over['12'] : null)} @@ -125,15 +130,22 @@ const CredentialInfo = ({ credential, mainClassName = "text-xs sm:text-sm md:tex {renderRow('over21', 'Age Over 21', parsedCredential?.age_over_21)} {renderRow('over', 'Age Over 65', parsedCredential?.age_over_65)} + {renderRow('dateOfBirth', 'Birthday (Year)', parsedCredential?.age_birth_year)} + {renderRow('dateOfBirth', 'Age in years', parsedCredential?.age_in_years)} + )} {displayExtraFields === 'true' && ( <> + {renderRow('address', 'Resident Country', parsedCredential?.resident_country)} + {renderRow('address', 'Resident City', parsedCredential?.resident_city)} + {renderRow('address', 'Resident Postal Code', parsedCredential?.resident_postal_code)} + {renderRow('address', 'Resident Street', parsedCredential?.resident_street)} + {renderRow('address', 'Address (City)', parsedCredential?.address?.locality)} + {renderRow('address', 'Address (Country)', parsedCredential?.address?.country)} {renderRow('address', 'Address (Postal Code)', parsedCredential?.address?.postal_code)} {renderRow('address', 'Address (Street)', parsedCredential?.address?.street_address)} - {renderRow('dateOfBirth', 'Birthday (Year)', parsedCredential?.age_birth_year)} - {renderRow('dateOfBirth', 'Age in years', parsedCredential?.age_in_years)} )} diff --git a/src/components/Popups/SelectCredentials.js b/src/components/Popups/SelectCredentials.js index 2584e62..4b90212 100644 --- a/src/components/Popups/SelectCredentials.js +++ b/src/components/Popups/SelectCredentials.js @@ -250,7 +250,7 @@ function SelectCredentials({ showPopup, setShowPopup, setSelectionMap, conforman
- +