Skip to content

Fix processing job list #8323

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
merged 9 commits into from
Jan 21, 2025
Merged

Fix processing job list #8323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83d4b22
include backend organization name in frontend orga id and improve con…
knollengewaechs Jan 13, 2025
75a9853
remove dev edits
knollengewaechs Jan 13, 2025
f7a39e3
format comment
knollengewaechs Jan 13, 2025
8294852
format comment
knollengewaechs Jan 13, 2025
ef2d39a
address review: improve if condition
knollengewaechs Jan 15, 2025
78319d5
Merge branch 'master' into show-more-job-descriptions
knollengewaechs Jan 15, 2025
c046d5a
Merge branch 'master' into show-more-job-descriptions
knollengewaechs Jan 16, 2025
4c2efb5
remove application.conf edit
knollengewaechs Jan 21, 2025
cf72867
Merge branch 'master' into show-more-job-descriptions
knollengewaechs Jan 21, 2025
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
2 changes: 1 addition & 1 deletion frontend/javascripts/admin/api/jobs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function transformBackendJobToAPIJob(job: any): APIJob {
type: job.command,
datasetName: job.commandArgs.dataset_name,
datasetDirectoryName: job.commandArgs.dataset_directory_name,
organizationId: job.commandArgs.organization_id,
organizationId: job.commandArgs.organization_id || job.commandArgs.organization_name,
layerName: job.commandArgs.layer_name || job.commandArgs.volume_layer_name,
annotationLayerName: job.commandArgs.annotation_layer_name,
boundingBox: job.commandArgs.bbox,
Expand Down
63 changes: 22 additions & 41 deletions frontend/javascripts/admin/job/job_list_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,20 @@ function JobListView() {
setSearchQuery(event.target.value);
}

function getLinkToDataset(job: APIJob) {
// prefer updated link over legacy link.
if (job.datasetId != null)
return `/datasets/${getReadableURLPart({ name: job.datasetName || "unknown_name", id: job.datasetId })}/view`;
if (job.organizationId != null && (job.datasetName != null || job.datasetDirectoryName != null))
return `/datasets/${job.organizationId}/${job.datasetDirectoryName || job.datasetName}/view`;
return null;
}

function renderDescription(__: any, job: APIJob) {
const linkToDataset =
job.datasetId != null
? `/datasets/${getReadableURLPart({ name: job.datasetName || "unknown_name", id: job.datasetId })}/view` // prefer updated link over legacy link.
: `/datasets/${job.organizationId || ""}/${job.datasetDirectoryName || job.datasetName}/view`;
const linkToDataset = getLinkToDataset(job);
if (job.type === APIJobType.CONVERT_TO_WKW && job.datasetName) {
return <span>{`Conversion to WKW of ${job.datasetName}`}</span>;
} else if (job.type === APIJobType.EXPORT_TIFF && job.organizationId && job.datasetName) {
} else if (job.type === APIJobType.EXPORT_TIFF && linkToDataset != null) {
const labelToAnnotationOrDataset =
job.annotationId != null ? (
<Link to={`/annotations/${job.annotationId}`}>
Expand All @@ -180,33 +186,28 @@ function JobListView() {
{job.ndBoundingBox ? formatWkLibsNdBBox(job.ndBoundingBox) : job.boundingBox})
</span>
);
} else if (job.type === APIJobType.RENDER_ANIMATION && job.organizationId && job.datasetName) {
} else if (job.type === APIJobType.RENDER_ANIMATION && linkToDataset != null) {
return (
<span>
Animation rendering for layer {job.layerName} of dataset{" "}
<Link to={linkToDataset}>{job.datasetName}</Link>
</span>
);
} else if (job.type === APIJobType.COMPUTE_MESH_FILE && job.organizationId && job.datasetName) {
} else if (job.type === APIJobType.COMPUTE_MESH_FILE && linkToDataset != null) {
return (
<span>
Mesh file computation for <Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.COMPUTE_SEGMENT_INDEX_FILE &&
job.organizationId &&
job.datasetName
) {
} else if (job.type === APIJobType.COMPUTE_SEGMENT_INDEX_FILE && linkToDataset != null) {
return (
<span>
Segment index file computation for <Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.FIND_LARGEST_SEGMENT_ID &&
job.organizationId &&
job.datasetName &&
linkToDataset != null &&
job.layerName
) {
return (
Expand All @@ -215,24 +216,14 @@ function JobListView() {
<Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.INFER_NUCLEI &&
job.organizationId &&
job.datasetName &&
job.layerName
) {
} else if (job.type === APIJobType.INFER_NUCLEI && linkToDataset != null && job.layerName) {
return (
<span>
Nuclei inferral for layer {job.layerName} of{" "}
<Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.INFER_NEURONS &&
job.organizationId &&
job.datasetName &&
job.layerName
) {
} else if (job.type === APIJobType.INFER_NEURONS && linkToDataset != null && job.layerName) {
return (
<span>
Neuron inferral for layer {job.layerName} of{" "}
Expand All @@ -241,8 +232,7 @@ function JobListView() {
);
} else if (
job.type === APIJobType.INFER_MITOCHONDRIA &&
job.organizationId &&
job.datasetName &&
linkToDataset != null &&
job.layerName
) {
return (
Expand All @@ -251,23 +241,14 @@ function JobListView() {
<Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.ALIGN_SECTIONS &&
job.organizationId &&
job.datasetName &&
job.layerName
) {
} else if (job.type === APIJobType.ALIGN_SECTIONS && linkToDataset != null && job.layerName) {
return (
<span>
Align sections for layer {job.layerName} of{" "}
<Link to={linkToDataset}>{job.datasetName}</Link>{" "}
</span>
);
} else if (
job.type === APIJobType.MATERIALIZE_VOLUME_ANNOTATION &&
job.organizationId &&
job.datasetName
) {
} else if (job.type === APIJobType.MATERIALIZE_VOLUME_ANNOTATION && linkToDataset != null) {
return (
<span>
Materialize annotation for {job.layerName ? ` layer ${job.layerName} of ` : " "}
Expand All @@ -277,15 +258,15 @@ function JobListView() {
: null}
</span>
);
} else if (job.type === APIJobType.TRAIN_MODEL && job.organizationId) {
} else if (job.type === APIJobType.TRAIN_MODEL) {
const numberOfTrainingAnnotations = job.trainingAnnotations.length;
return (
<span>
{`Train model on ${numberOfTrainingAnnotations} ${Utils.pluralize("annotation", numberOfTrainingAnnotations)}. `}
{getShowTrainingDataLink(job.trainingAnnotations)}
</span>
);
} else if (job.type === APIJobType.INFER_WITH_MODEL && job.organizationId) {
} else if (job.type === APIJobType.INFER_WITH_MODEL && linkToDataset != null) {
return (
<span>
Run AI segmentation with custom model on <Link to={linkToDataset}>{job.datasetName}</Link>
Expand Down