Feat/ocrvs 7978/qr reader #8196
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. @naftis this is the newly added |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
| * | ||
| * OpenCRVS is also distributed under the terms of the Civil Registration | ||
| * & Healthcare Disclaimer located at http://opencrvs.org/license. | ||
| * | ||
| * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. | ||
| */ | ||
| import React from 'react' | ||
| import { BannerType, IFormFieldValue } from '@client/forms' | ||
| import { useIntl } from 'react-intl' | ||
| import { Pill, Banner, Icon, Button, Text } from '@opencrvs/components' | ||
| import { messages } from '@client/i18n/messages/views/id-verification-banner' | ||
|
|
||
| export const IDVerificationBanner = ({ | ||
| type, | ||
| idFieldName, | ||
| setFieldValue | ||
| }: { | ||
| type: BannerType | ||
| setFieldValue: (name: string, value: IFormFieldValue) => void | ||
| idFieldName: string | ||
| }) => { | ||
| const intl = useIntl() | ||
| const handleReset = () => { | ||
| setFieldValue(idFieldName, '') | ||
| setFieldValue('verified', '') | ||
| } | ||
| if (type === 'pending') { | ||
| return ( | ||
| <Banner.Container> | ||
| <Banner.Header type="pending"> | ||
| <Pill | ||
| type="pending" | ||
| size="small" | ||
| pillTheme="dark" | ||
| label={ | ||
| <> | ||
| <Icon name="QrCode" size="small" /> | ||
| {intl.formatMessage(messages.pending.title)} | ||
| </> | ||
| } | ||
| /> | ||
| <Icon name="Clock" size="large" /> | ||
| </Banner.Header> | ||
| <Banner.Body> | ||
| <Text variant="reg16" element="span"> | ||
| {intl.formatMessage(messages.pending.description)} | ||
| </Text> | ||
| </Banner.Body> | ||
| <Banner.Footer justifyContent="flex-end"> | ||
| <Button type="secondary" onClick={handleReset}> | ||
| {intl.formatMessage(messages.actions.reset)} | ||
| </Button> | ||
| </Banner.Footer> | ||
| </Banner.Container> | ||
| ) | ||
| } else if (type === 'verified') { | ||
| return ( | ||
| <Banner.Container> | ||
| <Banner.Header type="default"> | ||
| <Pill | ||
| type="default" | ||
| size="small" | ||
| pillTheme="dark" | ||
| label={ | ||
| <> | ||
| <Icon name="CircleWavyCheck" size="small" /> | ||
| {intl.formatMessage(messages.success.title)} | ||
| </> | ||
| } | ||
| /> | ||
| <Icon name="FilledCheck" size="large" /> | ||
| </Banner.Header> | ||
| <Banner.Body> | ||
| <Text variant="reg16" element="span"> | ||
| {intl.formatMessage(messages.success.description)} | ||
| </Text> | ||
| </Banner.Body> | ||
| <Banner.Footer justifyContent="flex-end"> | ||
| <Button type="secondary" onClick={handleReset}> | ||
| {intl.formatMessage(messages.actions.revoke)} | ||
| </Button> | ||
| </Banner.Footer> | ||
| </Banner.Container> | ||
| ) | ||
| } else if (type === 'failed') { | ||
| return ( | ||
| <Banner.Container> | ||
| <Banner.Header type="inactive"> | ||
| <Pill | ||
| type="inactive" | ||
| size="small" | ||
| pillTheme="dark" | ||
| label={ | ||
| <> | ||
| <Icon name="X" size="small" /> | ||
| {intl.formatMessage(messages.failed.title)} | ||
| </> | ||
| } | ||
| /> | ||
| <Icon name="Close" size="large" /> | ||
| </Banner.Header> | ||
| <Banner.Body> | ||
| <Text variant="reg16" element="span"> | ||
| {intl.formatMessage(messages.failed.description)} | ||
| </Text> | ||
| </Banner.Body> | ||
| <Banner.Footer justifyContent="flex-end"> | ||
| <Button type="secondary" onClick={handleReset}> | ||
| {intl.formatMessage(messages.actions.reset)} | ||
| </Button> | ||
| </Banner.Footer> | ||
| </Banner.Container> | ||
| ) | ||
| } else return null | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
| * | ||
| * OpenCRVS is also distributed under the terms of the Civil Registration | ||
| * & Healthcare Disclaimer located at http://opencrvs.org/license. | ||
| * | ||
| * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. | ||
| */ | ||
| import React from 'react' | ||
| import { QRReader } from '@opencrvs/components/src/IDReader/readers/QRReader/QRReader' | ||
| import { | ||
| IFormData, | ||
| IFormField, | ||
| IFormFieldValue, | ||
| IFormSectionData, | ||
| Ii18nIDReaderFormField, | ||
| Ii18nRedirectFormField, | ||
| ReaderType | ||
| } from '@client/forms' | ||
| import { RedirectField } from './Redirect' | ||
| import { | ||
| internationaliseFieldObject, | ||
| isReaderQR, | ||
| isReaderRedirect | ||
| } from '@client/forms/utils' | ||
| import { | ||
| messages, | ||
| tutorialMessages | ||
| } from '@client/i18n/messages/views/qr-reader' | ||
| import { useIntl } from 'react-intl' | ||
|
|
||
| interface ReaderGeneratorProps { | ||
| readers: ReaderType[] | ||
| fields: IFormField[] | ||
| field: Ii18nIDReaderFormField | ||
| form: IFormSectionData | ||
| draft: IFormData | ||
| setFieldValue: (name: string, value: IFormFieldValue) => void | ||
| } | ||
| export const ReaderGenerator = ({ | ||
| readers, | ||
| field, | ||
| form, | ||
| draft, | ||
| fields, | ||
| setFieldValue | ||
| }: ReaderGeneratorProps) => { | ||
| const intl = useIntl() | ||
| return ( | ||
| <> | ||
| {readers.map((reader) => { | ||
| const { type } = reader | ||
| if (isReaderQR(reader)) { | ||
| return ( | ||
| <QRReader | ||
| key={type} | ||
| labels={{ | ||
| button: intl.formatMessage(messages.button), | ||
| scannerDialogSupportingCopy: intl.formatMessage( | ||
| messages.scannerDialogSupportingCopy | ||
| ), | ||
| tutorial: { | ||
| cameraCleanliness: intl.formatMessage( | ||
| tutorialMessages.cameraCleanliness | ||
| ), | ||
| distance: intl.formatMessage(tutorialMessages.distance), | ||
| lightBalance: intl.formatMessage( | ||
| tutorialMessages.lightBalance | ||
| ) | ||
| } | ||
| }} | ||
| onScan={(data) => { | ||
| setFieldValue(field.name, data) | ||
| setFieldValue('verified', 'pending') | ||
| }} | ||
| onError={(error) => console.error(error)} | ||
| /> | ||
| ) | ||
| } else if (isReaderRedirect(reader)) { | ||
| return ( | ||
| <RedirectField | ||
| key={type} | ||
| form={form} | ||
| draft={draft} | ||
| fieldDefinition={ | ||
| internationaliseFieldObject( | ||
| intl, | ||
| reader | ||
| ) as Ii18nRedirectFormField | ||
| } | ||
| fields={fields} | ||
| setFieldValue={setFieldValue} | ||
| isDisabled={false} | ||
| /> | ||
|
There was a problem hiding this comment. Why is the redirect inside the reader and not just a generic form field? There was a problem hiding this comment. Thanks @naftis good point. Well, in the view component, e-signet button is inside the id-reader component Thought it would be better in code as well There was a problem hiding this comment. Ah makes sense. Should we consider renaming the field to a LINK_BUTTON or something? Got a bit confused as it isn't necessarily a redirect anymore There was a problem hiding this comment. Sounds good, thanks @naftis. I am on it |
||
| ) | ||
| } else return null | ||
| })} | ||
| </> | ||
| ) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is form field component