Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"prefer-arrow-callback": 0,
"import/prefer-default-export": "off",
"import/extensions": ["off", "never"],
"newline-per-chained-call": "off",
"no-param-reassign": ["off", "never"],
"no-confusing-arrow": "off",
"implicit-arrow-linebreak": "off",
Expand Down
49 changes: 20 additions & 29 deletions app/javascript/app/document-capture/hooks/use-async.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useState, useCallback } from 'react';
import useIfStillMounted from './use-if-still-mounted';
import { useState } from 'react';

/**
* @typedef SuspenseResource
Expand All @@ -26,33 +25,23 @@ import useIfStillMounted from './use-if-still-mounted';
* @return {SuspenseResource} Suspense resource object.
*/
function useAsync(createPromise, ...args) {
const ifStillMounted = useIfStillMounted();
const [data, setData] = useState();
const [hasData, setHasData] = useState(false);
const [error, setError] = useState();
const [hasError, setHasError] = useState(false);
const read = useCallback(
() =>
createPromise(...args)
.then(
ifStillMounted((nextData) => {
setData(nextData);
setHasData(true);
}),
)
.catch(
ifStillMounted((nextError) => {
setError(nextError);
setHasError(true);
}),
),
args,
);
const [read] = useState(() => {
let hasData = false;
let data;
let hasError = false;
let error;

return {
read() {
const promise = read();
const promise = createPromise(...args)
.then((nextData) => {
hasData = true;
data = nextData;
})
.catch((nextError) => {
hasError = true;
error = nextError;
});

return () => {
if (hasData) {
return data;
}
Expand All @@ -62,8 +51,10 @@ function useAsync(createPromise, ...args) {
}

throw promise;
},
};
};
});

return { read };
}

export default useAsync;
37 changes: 25 additions & 12 deletions spec/javascripts/app/document-capture/hooks/use-async-spec.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import sinon from 'sinon';
import render from '../../../support/render';
import useAsync from '../../../../../app/javascript/app/document-capture/hooks/use-async';
import SuspenseErrorBoundary from '../../../../../app/javascript/app/document-capture/components/suspense-error-boundary';
Expand All @@ -22,12 +23,18 @@ describe('document-capture/hooks/use-async', () => {

it('returns suspense resource that renders fallback', async () => {
let resolve;
const createPromise = () =>
new Promise((_resolve) => {
resolve = () => {
_resolve();
};
});
const createPromise = sinon
.stub()
.onCall(0)
.returns(
new Promise((_resolve) => {
resolve = () => {
_resolve();
};
}),
)
.onCall(1)
.throws();

const { container, findByText } = render(<Parent createPromise={createPromise} />);

Expand All @@ -40,12 +47,18 @@ describe('document-capture/hooks/use-async', () => {

it('returns suspense resource that renders error fallback', async () => {
let reject;
const createPromise = () =>
new Promise((_resolve, _reject) => {
reject = () => {
_reject();
};
});
const createPromise = sinon
.stub()
.onCall(0)
.returns(
new Promise((_resolve, _reject) => {
reject = () => {
_reject();
};
}),
)
.onCall(1)
.throws();

const { container, findByText } = render(<Parent createPromise={createPromise} />);

Expand Down
14 changes: 9 additions & 5 deletions spec/javascripts/support/render.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { render } from '@testing-library/react';
import sinon from 'sinon';
import UploadContext from '../../../app/javascript/app/document-capture/context/upload';

/**
Expand All @@ -13,11 +14,14 @@ import UploadContext from '../../../app/javascript/app/document-capture/context/
* @return {import('@testing-library/react').RenderResult}
*/
function renderWithDefaultContext(element) {
return render(
<UploadContext.Provider value={(payload) => Promise.resolve(payload)}>
{element}
</UploadContext.Provider>,
);
const upload = sinon
.stub()
.onCall(0)
.callsFake((payload) => Promise.resolve(payload))
.onCall(1)
.throws();

return render(<UploadContext.Provider value={upload}>{element}</UploadContext.Provider>);
}

export default renderWithDefaultContext;