maq/osintbuddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from jerlendds/task/transform-loading-indicator

Browse Source 
task: WS loading indicators for active graph inquiry operations
This commit is contained in:
jerlendds
2023-12-12 06:35:41 -07:00
committed by GitHub
parent 4e79dc03a9 03356613ca
commit 5f67e77015
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/app/app/api/api_v1/endpoints/node.py
View File

@@ -301,7 +301,6 @@ async def run_user_graph_event(event: dict, send_json: Callable, uuid: UUID) ->
if IS_TRANSFORM:
await nodes_transform(event["node"], send_json, uuid)
@router.websocket("/graph/{hid}")
async def active_graph_inquiry(
websocket: WebSocket,
@@ -310,15 +309,16 @@ async def active_graph_inquiry(
db: Session = Depends(deps.get_db)
):
await websocket.accept()
await websocket.send_json({"action": "isLoading", "detail": "true" })
is_project_active = True
active_inquiry = crud.graphs.get(db, id=hid)
if active_inquiry is None:
is_project_active = False
else:
await websocket.send_json({"action": "refresh"})
while is_project_active:
try:
event: dict = await websocket.receive_json()
await websocket.send_json({"action": "isLoading", "detail": "true" })
await run_user_graph_event(
event=event,
send_json=websocket.send_json,
@@ -332,6 +332,8 @@ async def active_graph_inquiry(
log.error("Exception inside node.active_project")
log.error(e)
is_project_active = False
finally:
await websocket.send_json({ "action": "isLoading", "detail": "false" })
await websocket.close()

8
frontend/src/routes/graph-inquiry/index.tsx
View File

@@ -54,6 +54,8 @@ const getEdgeId = () => {
return `e-tmp-${edgeId}`
}
const loadingToastId = "loadingToast";
export default function GraphInquiry({ }: GraphInquiryProps) {
const dispatch = useAppDispatch();
const { hid } = useParams()
@@ -198,8 +200,10 @@ export default function GraphInquiry({ }: GraphInquiryProps) {
toast.info('No results found');
}
}
if (lastJsonMessage.action === 'refresh') {
toast.info(`Loading plugins...`);
if (lastJsonMessage.action === 'isLoading') {
lastJsonMessage.detail === 'true' ? toast.loading("Loading...", { closeButton: true, isLoading: true, toastId: loadingToastId })
: toast.update(loadingToastId, { render: "Success", type: "success", isLoading: false, autoClose: 1000 });
}
}
}, [lastJsonMessage, setMessageHistory]);