Skip to content

Allow deleting FM datasets that have no images/spectra #461

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
pnemere merged 1 commit into from
Jan 14, 2026
Merged

Allow deleting FM datasets that have no images/spectra #461

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
15 changes: 12 additions & 3 deletions api/ws/handlers/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,18 @@ func HandleScanDeleteReq(req *protos.ScanDeleteReq, hctx wsHelpers.HandlerContex
return nil, errorwithstatus.MakeBadRequestError(fmt.Errorf("Specified title did not match scan title of: \"%v\"", dbItem.Title))
}

// Check that it's not an FM dataset
if dbItem.Instrument == protos.ScanInstrument_PIXL_FM {
return nil, errorwithstatus.MakeBadRequestError(errors.New("Cannot delete FM datasets using this feature"))
// Only allow deleting an FM dataset if it doesn't have any spectra or images - as it might be a safety survey or other failed scan
// that we don't want to keep around
imageCount := 0
for _, dt := range dbItem.DataTypes {
if dt.DataType == protos.ScanDataType_SD_IMAGE && dt.Count > 0 {
imageCount = int(dt.Count)
break
}
}

if dbItem.Instrument == protos.ScanInstrument_PIXL_FM && (dbItem.ContentCounts["BulkSpectra"] > 0 || dbItem.ContentCounts["NormalSpectra"] > 0 || imageCount > 0) {
return nil, errorwithstatus.MakeBadRequestError(errors.New("Cannot delete FM datasets containing spectra or images using this feature"))
}

// TODO: Should we stop deletion if images or quants reference it???
Expand Down
Loading