Skip to content

fix: bypass api circular progress #967

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

Merged
EllaMartirosyan merged 2 commits into from
May 20, 2026
Merged

fix: bypass api circular progress #967

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df2608b
fix: bypass api circular progress
EllaMartirosyan May 19, 2026
78e74ba
fix: prettier
EllaMartirosyan May 20, 2026
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
26 changes: 21 additions & 5 deletions src/discrete-layer/components/layer-details/raster/resolution-conflict.dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Box, VectorLayer, VectorSource } from '@map-colonies/react-components';
import {
Button,
Checkbox,
CircularProgress,
CollapsibleList,
Dialog,
DialogContent,
Expand Down Expand Up @@ -91,6 +92,7 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
>();
const [collectionMountKeys, setCollectionMountKeys] = useState<number[]>([]);
const [approver, setApprover] = useState('');
const [isApproving, setIsApproving] = useState(false);
const [listFilterMode, setListFilterMode] = useState<FilterMode>('all');
const [selectedItem, setSelectedItem] = useState<Feature>();
const [polygonPartsErrors, setPolygonPartsErrors] = useState<string[] | undefined>();
Expand Down Expand Up @@ -326,7 +328,12 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
}, []);

const approve = useCallback((): void => {
if (isApproving) {
return;
}

const resumeJob = async (): Promise<void> => {
setIsApproving(true);
try {
await state.context.store.mutateJobApproveAndResume({
data: {
Expand All @@ -345,10 +352,12 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
setPolygonPartsErrors([
intl.formatMessage({ id: 'resolutionConflict.error.approveFailed' }),
]);
} finally {
setIsApproving(false);
}
};
void resumeJob();
}, [approver]);
}, [approver, isApproving]);

const progresses = useMemo(() => {
return extractProgressArray(api);
Expand Down Expand Up @@ -628,7 +637,9 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
<Box>
<Typography
tag="span"
className={`approverLabel ${isApproverFieldDisabled ? 'disabled' : ''}`}
className={`approverLabel ${
isApproverFieldDisabled || isApproving ? 'disabled' : ''
}`}
>
{intl.formatMessage({ id: 'resolutionConflict.approver.label' })}
<Typography
Expand All @@ -643,7 +654,7 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
</Typography>
<TextField
className="approverNameField"
disabled={isApproverFieldDisabled}
disabled={isApproverFieldDisabled || isApproving}
value={approver}
onChange={(event): void => {
setApprover(event.currentTarget.value);
Expand All @@ -667,15 +678,20 @@ const ResolutionConflictDialogComponent: React.FC<ResolutionConflictDialogProps>
type="button"
onClick={approve}
disabled={
isApproving ||
isLoadingLowResolutionParts ||
lowResolutionCollections.length === 0 ||
approver.trim().length === 0
}
>
<FormattedMessage id="general.confirm-btn.text" />
{isApproving ? (
<CircularProgress className="loading" />
) : (
<FormattedMessage id="general.confirm-btn.text" />
)}
</Button>
)}
<Button type="button" onClick={closeDialog}>
<Button type="button" onClick={closeDialog} disabled={isApproving}>
<FormattedMessage id="general.close-btn.text" />
</Button>
</Box>
Expand Down
Loading