Skip to content

fix: approve enabled for inprogress job ( MAPCO-10794 ) #990

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
alebinson merged 3 commits into from
Jun 10, 2026
Merged

fix: approve enabled for inprogress job ( MAPCO-10794 ) #990

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fb8a4f
fix: approve enabled for inprogress job
alebinson Jun 10, 2026
f9e9f24
chore: revert cause eslint
alebinson Jun 10, 2026
381d4cb
chore: pr comments
alebinson Jun 10, 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
10 changes: 5 additions & 5 deletions src/discrete-layer/components/layer-details/raster/job-info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
} from '../../../../common/models/job-errors-summary.raster';
import { Status } from '../../../models';
import { JobErrorsSummaryRasterJobData } from '../../job-manager/cell-renderer/job-details/job-errors-summary.raster-job-data';
import { FINAL_STATUSES } from '../../job-manager/job.types';
import { Progress } from './progress';
import { ResolutionConflictDialog } from './resolution-conflict.dialog';
import { isJobValid, isStatusFailed, isTaskValid } from './state-machine/helpers';
Expand Down Expand Up @@ -46,9 +45,10 @@ const JobInfoComponent: React.FC<JobInfoProps> = ({ job }) => {
const errorsCount = displayJob?.validationReport?.errorsSummary?.errorsCount;
const thresholds = displayJob?.validationReport?.errorsSummary?.thresholds;
const jobStatus = displayJob?.details?.status as Status | undefined;
const isAlreadyApproved = !isEmpty(displayJob?.details?.parameters.allowedValidationErrors);

@EllaMartirosyan EllaMartirosyan Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets take it out to utils


const isViewOnly = useMemo(() => {
const isStatusReadOnly = jobStatus != null && FINAL_STATUSES.includes(jobStatus);
const isStatusReadOnly = jobStatus != null && jobStatus !== Status.Suspended;
if (!errorsCount) {
return isStatusReadOnly;
}
Expand All @@ -61,8 +61,8 @@ const JobInfoComponent: React.FC<JobInfoProps> = ({ job }) => {
}
return false;
});
return isStatusReadOnly || hasOtherErrors;
}, [errorsCount, thresholds, jobStatus]);
return isStatusReadOnly || hasOtherErrors || isAlreadyApproved;
}, [errorsCount, thresholds, jobStatus, isAlreadyApproved]);

if (!displayJob) {
return null;
Expand Down Expand Up @@ -115,7 +115,7 @@ const JobInfoComponent: React.FC<JobInfoProps> = ({ job }) => {
key: 'resolution',
action: openResolutionConflictDialog,
isEnabled: taskStatus === Status.Completed,
isApproved: isApproved || !isEmpty(details?.parameters.allowedValidationErrors),
isApproved: isApproved || isAlreadyApproved,
}
)}
</Box>
Expand Down
Loading