Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions src/datasource/catmaid/api.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,40 @@ describe("CatmaidClient skeleton editing methods", () => {
);
});

it("deletes skeletons without allowing multi-skeleton neuron deletion", async () => {
const client = new CatmaidClient("https://example.invalid", 1);
const fetchMock = vi.fn().mockResolvedValue({
skeleton_ids: ["17", 21.2, "invalid"],
});
(client as any).fetchProjectEndpoint = fetchMock;

await expect(client.deleteSkeleton(17)).resolves.toEqual({
skeletonIds: [17, 21],
});

expect(fetchMock).toHaveBeenCalledTimes(1);
expect(getFetchPath(fetchMock)).toBe("skeletons/17/delete");
expect(getFetchBody(fetchMock).get("delete_multi_skeleton_neurons")).toBe(
"false",
);
});

it("restores deleted skeletons", async () => {
const client = new CatmaidClient("https://example.invalid", 1);
const fetchMock = vi.fn().mockResolvedValue({
skeleton_id: "17",
});
(client as any).fetchProjectEndpoint = fetchMock;

await expect(client.restoreSkeleton(17)).resolves.toEqual({
skeletonId: 17,
});

expect(fetchMock).toHaveBeenCalledTimes(1);
expect(getFetchPath(fetchMock)).toBe("skeletons/17/restore");
expect(getFetchInit(fetchMock).method).toBe("POST");
});

it("rejects reroot when the response is missing edition_time", async () => {
const client = new CatmaidClient("https://example.invalid", 1);
const fetchMock = vi.fn().mockResolvedValue({
Expand Down
58 changes: 58 additions & 0 deletions src/datasource/catmaid/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ export interface CatmaidDescriptionUpdateOptions {

export type CatmaidDeleteNodeResult = CatmaidSkeletonEditResult;

export interface CatmaidDeleteSkeletonOptions {
deleteMultiSkeletonNeurons?: boolean;
}

export interface CatmaidDeleteSkeletonResult {
skeletonIds: number[];
}

export interface CatmaidRestoreSkeletonResult {
skeletonId: number;
}

export type CatmaidRerootResult = CatmaidSkeletonEditResult;

export interface CatmaidMergeResult extends CatmaidSkeletonEditResult {
Expand Down Expand Up @@ -149,6 +161,11 @@ export interface CatmaidSpatialSkeletonEditApi {
nodeId: number,
options: CatmaidDeleteNodeOptions,
): Promise<CatmaidDeleteNodeResult>;
deleteSkeleton(
skeletonId: number,
options?: CatmaidDeleteSkeletonOptions,
): Promise<CatmaidDeleteSkeletonResult>;
restoreSkeleton(skeletonId: number): Promise<CatmaidRestoreSkeletonResult>;
moveNode(
nodeId: number,
x: number,
Expand Down Expand Up @@ -2064,4 +2081,45 @@ export class CatmaidClient implements CatmaidSpatialSkeletonEditApi {
: undefined,
};
}

async deleteSkeleton(
skeletonId: number,
options: CatmaidDeleteSkeletonOptions = {},
): Promise<CatmaidDeleteSkeletonResult> {
const body = new URLSearchParams({
delete_multi_skeleton_neurons: String(
options.deleteMultiSkeletonNeurons ?? false,
),
});
const response = await this.fetchProjectEndpoint(
`skeletons/${skeletonId}/delete`,
{
method: "POST",
body,
},
);
const skeletonIds = Array.isArray(response?.skeleton_ids)
? response.skeleton_ids
.map((value: unknown) => Math.round(Number(value)))
.filter((value: number) => Number.isSafeInteger(value) && value > 0)
: [];
return { skeletonIds };
}

async restoreSkeleton(
skeletonId: number,
): Promise<CatmaidRestoreSkeletonResult> {
const response = await this.fetchProjectEndpoint(
`skeletons/${skeletonId}/restore`,
{
method: "POST",
},
);
const restoredSkeletonId = Number(response?.skeleton_id);
return {
skeletonId: Number.isFinite(restoredSkeletonId)
? Math.round(restoredSkeletonId)
: skeletonId,
};
}
}
4 changes: 4 additions & 0 deletions src/datasource/catmaid/frontend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ export class CatmaidSpatiallyIndexedSkeletonSource extends WithParameters(
return this.editableSpatialSkeletonEditCommands?.deleteNodesCommand;
}

get deleteSubtreesCommand() {
return this.editableSpatialSkeletonEditCommands?.deleteSubtreesCommand;
}

get rerootCommand() {
return this.editableSpatialSkeletonEditCommands?.rerootCommand;
}
Expand Down
Loading
Loading