From 92132ad08b250f683b82bfb748a1e669edb05e73 Mon Sep 17 00:00:00 2001 From: jerlendds Date: Fri, 19 Jan 2024 17:13:15 -0700 Subject: [PATCH] Rework logo and polish compose cfg node.py, logo-ext.svg, AppLayoutSidebar.tsx, and alpha-compose.override.yml --- backend/app/app/api/api_v1/endpoints/node.py | 47 ++++++++++---------- frontend/src/assets/images/logo-ext.svg | 2 +- frontend/src/components/AppLayoutSidebar.tsx | 4 +- ob/alpha-compose.override.yml | 3 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/backend/app/app/api/api_v1/endpoints/node.py b/backend/app/app/api/api_v1/endpoints/node.py index 4b07c5b..bd41bda 100755 --- a/backend/app/app/api/api_v1/endpoints/node.py +++ b/backend/app/app/api/api_v1/endpoints/node.py @@ -160,6 +160,8 @@ async def read_graph(viewport_event, send_json, project_uuid, is_initial_read: b nodes = [] edges_data = [] data_nodes, edges = await load_nodes_from_db(project_uuid, viewport_event) + if is_initial_read: + EntityRegistry.discover_plugins() tmp_invalid_fix = [] tmp_invalid_id_fix = [] for node in data_nodes: @@ -371,29 +373,28 @@ async def active_graph_inquiry( websocket.send({"action": "error"}) for user_cid, ws in graph_users.items(): - while True: - try: - async for event in ws.iter_json(): - await run_user_graph_event( - event=event, - send_json=ws.send_json, - uuid=active_inquiry.uuid - ) - except OBPluginError as e: - await ws.send_json({"action": "error", "detail": f"{e}"}) - await ws.send_json({"action": "isLoading", "detail": False }) - log.error(e) - except (WebSocketException, ConnectionClosedError) as e: - log.error("Exception inside node.active_project") - log.error(e) - await ws.send_json({"action": "isLoading", "detail": False }) - await ws.close() - del graph_users[user_cid] - except (WebSocketDisconnect, RuntimeError) as e: - if isinstance(e, RuntimeError): - log.error(e) - log.info(f"disconnect! {user_cid}") - del graph_users[user_cid] + try: + async for event in ws.iter_json(): + await run_user_graph_event( + event=event, + send_json=ws.send_json, + uuid=active_inquiry.uuid + ) + except OBPluginError as e: + await ws.send_json({"action": "error", "detail": f"{e}"}) + await ws.send_json({"action": "isLoading", "detail": False }) + log.error(e) + except (WebSocketException, ConnectionClosedError) as e: + log.error("Exception inside node.active_project") + log.error(e) + await ws.send_json({"action": "isLoading", "detail": False }) + await ws.close() + # del graph_users[user_cid] + except (WebSocketDisconnect, RuntimeError) as e: + if isinstance(e, RuntimeError): + log.error(e) + log.info(f"disconnect! {user_cid}") + del graph_users[user_cid] @router.get("/refresh") diff --git a/frontend/src/assets/images/logo-ext.svg b/frontend/src/assets/images/logo-ext.svg index 0a8643d..fe10e3b 100644 --- a/frontend/src/assets/images/logo-ext.svg +++ b/frontend/src/assets/images/logo-ext.svg @@ -1 +1 @@ -icGRAPHicGRAPH \ No newline at end of file +icGRAPHicGRAPH \ No newline at end of file diff --git a/frontend/src/components/AppLayoutSidebar.tsx b/frontend/src/components/AppLayoutSidebar.tsx index a4eaebf..d2dfac4 100644 --- a/frontend/src/components/AppLayoutSidebar.tsx +++ b/frontend/src/components/AppLayoutSidebar.tsx @@ -1,5 +1,5 @@ import classNames from "classnames"; -import { ReactComponent as IcGraphLogomark } from "@images/icg-text.svg"; +import { ReactComponent as IcGraphLogomark } from "@images/logo-ext.svg"; // icg-text.svg import { Link, NavLink } from "react-router-dom"; import HamburgerMenu from "./HamburgerMenu"; import { toast } from "react-toastify"; @@ -35,7 +35,7 @@ export default function AppLayoutSidebar({ showSidebar, toggleSidebar, setShowIn )} > - +