From 2bc5ea68227e98db1efbf475781c20b6e5092275 Mon Sep 17 00:00:00 2001 From: LennartSchmidtKern Date: Thu, 9 Jan 2025 15:18:45 +0100 Subject: [PATCH 1/2] settings --- pages/settings.tsx | 6 +++--- submodules/javascript-functions | 2 +- submodules/react-components | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pages/settings.tsx b/pages/settings.tsx index 927c315..5b836a6 100644 --- a/pages/settings.tsx +++ b/pages/settings.tsx @@ -32,9 +32,9 @@ const Settings: NextPage = () => { useEffect(() => { getUserInfoExtended((res) => { - setUser(res['data']['userInfo']); + setUser(res); if (res) { - if (res['data']?.["userInfo"]?.organizationId) { + if (res?.organizationId) { if (WebSocketsService.getConnectionOpened()) return; WebSocketsService.setConnectionOpened(true); WebSocketsService.initWsNotifications(); @@ -54,7 +54,7 @@ const Settings: NextPage = () => { }, []); function refetchAdminMessagesAndProcess() { - getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res["data"]["allActiveAdminMessages"]))); + getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res))); } useWebsocket(user?.organizationId, Application.ENTRY, CurrentPage.ENTRY_LAYOUT, handleWebsocketNotification) diff --git a/submodules/javascript-functions b/submodules/javascript-functions index 3bd200a..e2e09c5 160000 --- a/submodules/javascript-functions +++ b/submodules/javascript-functions @@ -1 +1 @@ -Subproject commit 3bd200a34cc3531519d0b3e48fca5910a10b19e3 +Subproject commit e2e09c5fe580120dacd7958603c98dd886ea274d diff --git a/submodules/react-components b/submodules/react-components index a90abdd..7f969a7 160000 --- a/submodules/react-components +++ b/submodules/react-components @@ -1 +1 @@ -Subproject commit a90abdd0061491a2f17e089b441aade2afc4465d +Subproject commit 7f969a7bf3d279ed656380a0b69b8a7d7f0adf09 From cdfda91ecd9bf05580fb6a9df0cc4e188c32726b Mon Sep 17 00:00:00 2001 From: LennartSchmidtKern Date: Mon, 13 Jan 2025 15:06:28 +0100 Subject: [PATCH 2/2] javascript --- submodules/javascript-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/javascript-functions b/submodules/javascript-functions index e2e09c5..12bf29c 160000 --- a/submodules/javascript-functions +++ b/submodules/javascript-functions @@ -1 +1 @@ -Subproject commit e2e09c5fe580120dacd7958603c98dd886ea274d +Subproject commit 12bf29c1966fe1bfeb716d4e6f4dc9112e7c1ee4