Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jmax/lg 13875 rename documentstep in doc auth #11092

Merged
merged 7 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
DocumentCaptureSubheaderOne,
SelfieCaptureWithHeader,
DocumentFrontAndBackCapture,
} from './documents-step';
} from './documents-and-selfie-step';
import type { ReviewIssuesStepValue } from './review-issues-step';

interface DocumentCaptureReviewIssuesProps extends FormStepComponentProps<ReviewIssuesStepValue> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useDidUpdateEffect } from '@18f/identity-react-hooks';
import type { FormStep } from '@18f/identity-form-steps';
import { getConfigValue } from '@18f/identity-config';
import { UploadFormEntriesError } from '../services/upload';
import DocumentsStep from './documents-step';
import { DocumentsAndSelfieStep } from './documents-and-selfie-step';
import InPersonPrepareStep from './in-person-prepare-step';
import InPersonLocationPostOfficeSearchStep from './in-person-location-post-office-search-step';
import InPersonLocationFullAddressEntryPostOfficeSearchStep from './in-person-location-full-address-entry-post-office-search-step';
Expand Down Expand Up @@ -53,7 +53,7 @@ function DocumentCapture({ onStepChange = () => {} }: DocumentCaptureProps) {
// Define different states to be used in human readable array declaration
const documentFormStep: FormStep = {
name: 'documents',
form: DocumentsStep,
form: DocumentsAndSelfieStep,
title: t('doc_auth.headings.document_capture'),
};
const reviewFormStep: FormStep = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function DocumentFrontAndBackCapture({

type ImageValue = Blob | string | null | undefined;

interface DocumentsStepValue {
interface DocumentsAndSelfieStepValue {
front: ImageValue;
back: ImageValue;
selfie: ImageValue;
Expand All @@ -93,17 +93,17 @@ interface DocumentsStepValue {
}

type DefaultSideProps = Pick<
FormStepComponentProps<DocumentsStepValue>,
FormStepComponentProps<DocumentsAndSelfieStepValue>,
'registerField' | 'onChange' | 'errors' | 'onError'
>;

function DocumentsStep({
export function DocumentsAndSelfieStep({
jmax-gsa marked this conversation as resolved.
Show resolved Hide resolved
value = {},
onChange = () => {},
errors = [],
onError = () => {},
registerField = () => undefined,
}: FormStepComponentProps<DocumentsStepValue>) {
}: FormStepComponentProps<DocumentsAndSelfieStepValue>) {
const { t } = useI18n();
const { isMobile } = useContext(DeviceContext);
const { isLastStep } = useContext(FormStepsContext);
Expand Down Expand Up @@ -145,5 +145,3 @@ function DocumentsStep({
</>
);
}

export default DocumentsStep;
1 change: 0 additions & 1 deletion scripts/enforce-typescript-files.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const LEGACY_FILE_EXCEPTIONS = [
'spec/javascript/packages/document-capture/components/document-capture-review-issues-spec.jsx',
'spec/javascript/packages/document-capture/components/document-capture-spec.jsx',
'spec/javascript/packages/document-capture/components/document-capture-warning-spec.jsx',
'spec/javascript/packages/document-capture/components/documents-step-spec.jsx',
'spec/javascript/packages/document-capture/components/file-image-spec.jsx',
'spec/javascript/packages/document-capture/components/file-input-spec.jsx',
'spec/javascript/packages/document-capture/components/review-issues-step-spec.jsx',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,24 @@ import {
FailedCaptureAttemptsContextProvider,
SelfieCaptureContext,
} from '@18f/identity-document-capture';
import DocumentsStep from '@18f/identity-document-capture/components/documents-step';
import { DocumentsAndSelfieStep } from '@18f/identity-document-capture/components/documents-and-selfie-step';
import { composeComponents } from '@18f/identity-compose-components';
import { render } from '../../../support/document-capture';
import { getFixtureFile } from '../../../support/file';

describe('document-capture/components/documents-step', () => {
describe('document-capture/components/documents-and-selfie-step', () => {
it('renders with only front and back inputs by default', () => {
const { getByLabelText, queryByLabelText } = render(<DocumentsStep />);
const { getByLabelText, queryByLabelText } = render(
<DocumentsAndSelfieStep
value={{}}
onChange={() => undefined}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>,
);

const front = getByLabelText('doc_auth.headings.document_capture_front');
const back = getByLabelText('doc_auth.headings.document_capture_back');
Expand All @@ -33,8 +43,18 @@ describe('document-capture/components/documents-step', () => {
<FailedCaptureAttemptsContextProvider
maxCaptureAttemptsBeforeNativeCamera={3}
maxSubmissionAttemptsBeforeNativeCamera={3}
failedFingerprints={{ front: [], back: [] }}
>
<DocumentsStep onChange={onChange} />,
<DocumentsAndSelfieStep
value={{}}
onChange={onChange}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>
,
</FailedCaptureAttemptsContextProvider>,
);
const file = await getFixtureFile('doc_auth_images/id-back.jpg');
Expand All @@ -52,22 +72,48 @@ describe('document-capture/components/documents-step', () => {
it('renders device-specific instructions', () => {
let { getByText } = render(
<DeviceContext.Provider value={{ isMobile: true }}>
<DocumentsStep />
<DocumentsAndSelfieStep
value={{}}
onChange={() => undefined}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>
</DeviceContext.Provider>,
);

expect(() => getByText('doc_auth.tips.document_capture_id_text4')).to.throw();

getByText = render(<DocumentsStep />).getByText;
getByText = render(
<DocumentsAndSelfieStep
value={{}}
onChange={() => undefined}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>,
).getByText;

expect(() => getByText('doc_auth.tips.document_capture_id_text4')).not.to.throw();
});

it('renders the hybrid flow warning if the flow is hybrid', () => {
const { getByText } = render(
<DeviceContext.Provider value={{ isMobile: true }}>
<UploadContextProvider flowPath="hybrid">
<DocumentsStep />
<UploadContextProvider flowPath="hybrid" endpoint="unused">
<DocumentsAndSelfieStep
value={{}}
onChange={() => undefined}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>
</UploadContextProvider>
</DeviceContext.Provider>,
);
Expand All @@ -79,8 +125,16 @@ describe('document-capture/components/documents-step', () => {
it('does not render the hybrid flow warning if the flow is standard (default)', () => {
const { queryByText } = render(
<DeviceContext.Provider value={{ isMobile: true }}>
<UploadContextProvider flowPath="standard">
<DocumentsStep />
<UploadContextProvider flowPath="standard" endpoint="unused">
<DocumentsAndSelfieStep
value={{}}
onChange={() => undefined}
errors={[]}
onError={() => undefined}
registerField={() => undefined}
unknownFieldErrors={[]}
toPreviousStep={() => undefined}
/>
</UploadContextProvider>
</DeviceContext.Provider>,
);
Expand All @@ -100,7 +154,7 @@ describe('document-capture/components/documents-step', () => {
},
},
],
[DocumentsStep],
[DocumentsAndSelfieStep],
);
const { getAllByRole, getByText, getByRole, getByLabelText, queryByLabelText } = render(
<App />,
Expand Down Expand Up @@ -150,7 +204,7 @@ describe('document-capture/components/documents-step', () => {
},
},
],
[DocumentsStep],
[DocumentsAndSelfieStep],
);
const { queryByRole, getByRole, getByLabelText } = render(<App />);

Expand Down