Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 8 additions & 6 deletions scanpipe/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
remove_output=request.data.get("remove_output"),
)
except RunInProgressError as error:
return Response(error, status=status.HTTP_400_BAD_REQUEST)
return Response({"status": str(error)}, status=status.HTTP_400_BAD_REQUEST)
else:
return Response({"status": f"The project {project} has been archived."})

Expand All @@ -437,13 +437,15 @@
return Response({"status": message})

try:
project.reset(keep_input=True)
project.reset(
keep_input=request.data.get("keep_input", True),
restore_pipelines=request.data.get("restore_pipelines", False),
execute_now=request.data.get("execute_now", False),
)
except RunInProgressError as error:
return Response(error, status=status.HTTP_400_BAD_REQUEST)
return Response({"status": str(error)}, status=status.HTTP_400_BAD_REQUEST)
else:
message = (
f"All data, except inputs, for the {project} project have been removed."
)
message = f"The {project} project has been reset."
return Response({"status": message})

@action(detail=True, methods=["get"])
Expand Down
3 changes: 1 addition & 2 deletions scanpipe/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,8 +963,7 @@ def test_scanpipe_api_project_action_reset(self):
response = self.csrf_client.post(url)
self.assertEqual(status.HTTP_200_OK, response.status_code)
expected = {
"status": "All data, except inputs, for the Analysis project have been "
"removed."
"status": "The Analysis project has been reset."
}
self.assertEqual(expected, response.data)
self.assertEqual(0, self.project1.runs.count())
Expand Down
Loading