Skip to content

fix(verify): handle invalid capture filter errors #1224

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.

Sign up for GitHub

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

Open
harshgupta6789 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(verify): handle invalid capture filter errors #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 41 additions & 2 deletions src/components/CaptureFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ import { CircularProgress } from '@material-ui/core';

export const FILTER_WIDTH = 330;

const isNumericValue = (value) => {
return !value.trim() || /^\d+$/.test(value.trim());
};

const isNumericList = (value) => {
return !value.trim() || /^\d+(\s*,\s*\d+)*$/.test(value.trim());
};

const styles = (theme) => {
return {
root: {},
Expand Down Expand Up @@ -110,6 +118,7 @@ function Filter(props) {
verificationStates.APPROVED,
verificationStates.AWAITING,
]);
const [filterErrors, setFilterErrors] = useState({});
const isAllVerification =
verificationStatus.length &&
verificationStatus.length === verificationStatesArr.length;
Expand Down Expand Up @@ -156,6 +165,17 @@ function Filter(props) {

function handleSubmit(e) {
e.preventDefault();
const errors = {
captureId: isNumericValue(captureId) ? '' : 'Enter a numeric Capture ID',
growerId: isNumericList(growerId)
? ''
: 'Enter numeric Grower IDs separated by commas',
};
setFilterErrors(errors);
if (errors.captureId || errors.growerId) {
return;
}

// save the filer to context for editing & submit
const filter = new FilterModel();
filter.uuid = uuid;
Expand Down Expand Up @@ -193,6 +213,7 @@ function Filter(props) {
{ active: true, approved: true },
{ active: true, approved: false },
]);
setFilterErrors({});
const filter = new FilterModel();
props.onSubmit && props.onSubmit(filter);
}
Expand Down Expand Up @@ -299,15 +320,33 @@ function Filter(props) {
label="Grower ID"
placeholder="e.g. 2, 7"
value={growerId}
onChange={(e) => setGrowerId(e.target.value)}
error={Boolean(filterErrors.growerId)}
helperText={filterErrors.growerId}
inputProps={{ inputMode: 'numeric' }}
onChange={(e) => {
setGrowerId(e.target.value);
setFilterErrors({
...filterErrors,
growerId: '',
});
}}
/>
<TextField
htmlFor="capture-id"
id="capture-id"
label="Capture ID"
placeholder="e.g. 80"
value={captureId}
onChange={(e) => setCaptureId(e.target.value)}
error={Boolean(filterErrors.captureId)}
helperText={filterErrors.captureId}
inputProps={{ inputMode: 'numeric' }}
onChange={(e) => {
setCaptureId(e.target.value);
setFilterErrors({
...filterErrors,
captureId: '',
});
}}
/>
<TextField
htmlFor="uuid"
Expand Down
43 changes: 41 additions & 2 deletions src/components/FilterTop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ import { CircularProgress } from '@material-ui/core';

export const FILTER_WIDTH = 330;

const isNumericValue = (value) => {
return !value.trim() || /^\d+$/.test(value.trim());
};

const isNumericList = (value) => {
return !value.trim() || /^\d+(\s*,\s*\d+)*$/.test(value.trim());
};

const styles = (theme) => {
return {
root: {},
Expand Down Expand Up @@ -101,6 +109,7 @@ function Filter(props) {
filter.stakeholderUUID || ALL_ORGANIZATIONS
);
const [tokenId, setTokenId] = useState(filter?.tokenId || filterOptionAll);
const [filterErrors, setFilterErrors] = useState({});

const handleDateStartChange = (date) => {
setDateStart(date);
Expand All @@ -116,6 +125,17 @@ function Filter(props) {

function handleSubmit(e) {
e.preventDefault();
const errors = {
captureId: isNumericValue(captureId) ? '' : 'Enter a numeric Capture ID',
growerId: isNumericList(growerId)
? ''
: 'Enter numeric Grower IDs separated by commas',
};
setFilterErrors(errors);
if (errors.captureId || errors.growerId) {
return;
}

// save the filer to context for editing & submit
const filter = new FilterModel();
filter.uuid = uuid;
Expand Down Expand Up @@ -150,6 +170,7 @@ function Filter(props) {
setOrganizationId(ALL_ORGANIZATIONS);
setStakeholderUUID(ALL_ORGANIZATIONS);
setTokenId(filterOptionAll);
setFilterErrors({});

const filter = new FilterModel();
filter.approved = approved; // keeps last value set
Expand Down Expand Up @@ -261,15 +282,33 @@ function Filter(props) {
label="Grower ID"
placeholder="e.g. 7"
value={growerId}
onChange={(e) => setGrowerId(e.target.value)}
error={Boolean(filterErrors.growerId)}
helperText={filterErrors.growerId}
inputProps={{ inputMode: 'numeric' }}
onChange={(e) => {
setGrowerId(e.target.value);
setFilterErrors({
...filterErrors,
growerId: '',
});
}}
/>
<TextField
htmlFor="capture-id"
id="capture-id"
label="Capture ID"
placeholder="e.g. 80"
value={captureId}
onChange={(e) => setCaptureId(e.target.value)}
error={Boolean(filterErrors.captureId)}
helperText={filterErrors.captureId}
inputProps={{ inputMode: 'numeric' }}
onChange={(e) => {
setCaptureId(e.target.value);
setFilterErrors({
...filterErrors,
captureId: '',
});
}}
/>
<TextField
htmlFor="uuid"
Expand Down
29 changes: 20 additions & 9 deletions src/context/CapturesContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,17 @@ export function CapturesProvider(props) {
const getCaptureCount = async () => {
log.debug('load capture count');
const paramString = `where=${JSON.stringify(filter.getWhereObj())}`;
const response = await queryCapturesApi({
count: true,
paramString,
});
const { count } = response.data;
setCaptureCount(Number(count));
try {
const response = await queryCapturesApi({
count: true,
paramString,
});
const { count } = response.data;
setCaptureCount(Number(count));
} catch (e) {
log.warn('load capture count error:', e);
setCaptureCount(0);
}
};

const getCapturesAsync = async () => {
Expand All @@ -90,9 +95,15 @@ export function CapturesProvider(props) {
};
const paramString = `filter=${JSON.stringify(filterData)}`;
setIsLoading(true);
const response = await queryCapturesApi({ paramString });
setIsLoading(false);
setCaptures(response.data);
try {
const response = await queryCapturesApi({ paramString });
setCaptures(response.data);
} catch (e) {
log.warn('load captures error:', e);
setCaptures([]);
} finally {
setIsLoading(false);
}
};

// GET CAPTURES FOR EXPORT
Expand Down
32 changes: 23 additions & 9 deletions src/context/VerifyContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,17 @@ export function VerifyProvider(props) {
filter: filter,
};
log.debug('load page with params:', pageParams);
const result = await api.getCaptureImages(pageParams, abortController);
setCaptureImages(result || []);
//restore loading status
setIsLoading(false);
try {
const result = await api.getCaptureImages(pageParams, abortController);
setCaptureImages(result || []);
} catch (e) {
if (e.name !== 'AbortError') {
log.warn('get error:', e);
}
setCaptureImages([]);
} finally {
setIsLoading(false);
}
};

const getCaptureSelectedArr = () => {
Expand Down Expand Up @@ -286,11 +293,18 @@ export function VerifyProvider(props) {
};

const getCaptureCount = async (newfilter = filter) => {
// console.log('-- verify getCaptureCount');
// setInvalidateCaptureCount(false);
const result = await api.getCaptureCount(newfilter);
setCaptureCount(Number(result.count));
setInvalidateCaptureCount(false);
try {
// console.log('-- verify getCaptureCount');
// setInvalidateCaptureCount(false);
const result = await api.getCaptureCount(newfilter);
setCaptureCount(Number(result.count));
setInvalidateCaptureCount(false);
} catch (e) {
log.warn('get capture count error:', e);
setCaptureCount(0);
} finally {
setInvalidateCaptureCount(false);
}
};

const value = {
Expand Down