Skip to content

Commit 83c43d8

Browse files
authored
Merge branch 'master' into inbox-check-per-orga
2 parents db55174 + e365856 commit 83c43d8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

frontend/javascripts/admin/rest_api.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ export function getEditableMappingInfo(
14751475

14761476
export function getPositionForSegmentInAgglomerate(
14771477
datastoreUrl: string,
1478-
dataSourceId: APIDataSourceId,
1478+
datasetId: string,
14791479
layerName: string,
14801480
mappingName: string,
14811481
segmentId: number,
@@ -1486,9 +1486,7 @@ export function getPositionForSegmentInAgglomerate(
14861486
segmentId: `${segmentId}`,
14871487
});
14881488
const position = await Request.receiveJSON(
1489-
`${datastoreUrl}/data/datasets/${dataSourceId.owningOrganization}/${
1490-
dataSourceId.directoryName
1491-
}/layers/${layerName}/agglomerates/${mappingName}/positionForSegment?${params.toString()}`,
1489+
`${datastoreUrl}/data/datasets/${datasetId}/layers/${layerName}/agglomerates/${mappingName}/positionForSegment?${params.toString()}`,
14921490
);
14931491
return position;
14941492
});

frontend/javascripts/test/helpers/apiHelpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ function receiveJSONMockImplementation(
181181

182182
if (
183183
url ===
184-
`http://localhost:9000/data/datasets/Connectomics department/ROI2017_wkw/layers/color/mappings?token=${TOKEN}`
184+
`http://localhost:9000/data/datasets/66f3c82966010034942e9740/layers/color/mappings?token=${TOKEN}`
185185
) {
186186
return Promise.resolve({});
187187
}

frontend/javascripts/viewer/model/sagas/volume/proofread_saga.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ function* getPositionForSegmentId(volumeTracing: VolumeTracing, segmentId: numbe
12481248
const position = yield* call(
12491249
getPositionForSegmentInAgglomerate,
12501250
dataStoreUrl,
1251-
dataset,
1251+
dataset.id,
12521252
volumeTracing.fallbackLayer,
12531253
editableMapping.baseMappingName,
12541254
segmentId,

unreleased_changes/8830.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### Fixed
2+
- Fixed a bug that impacted some proofreading interactions when e.g. splitting an agglomerate.

0 commit comments

Comments
 (0)