From 01b95a29278cbd358b861da2011f697315131040 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Fri, 3 May 2024 09:18:15 +0200 Subject: [PATCH 1/8] fix server configuration --- src/modules/data/board/socket/socket.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 94e0968b92..9e6285de01 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -4,10 +4,10 @@ import { Action } from "@/types/board/ActionFactory"; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { // implement socket.io here const socket = io( - // "https://bc-6683-poc-board-collaboration-server.dbc.dbildungscloud.dev", - "ws://localhost:4450", + // "ws://BC-7101-collaboration-service-deployment.dbc.dbildungscloud.dev", + ":4450", { - path: "/collaboration", + path: "/board-collaboration", withCredentials: true, } // { path: "/collaboration", transports: ["polling"] } From ccf125fc4033c75260092d7490fa55d2dbd19430 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Mon, 6 May 2024 10:24:29 +0200 Subject: [PATCH 2/8] chore: try to connect to board-collaboration on same server --- src/modules/data/board/socket/socket.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 9e6285de01..514f9e9982 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,11 +1,15 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; +// import { envConfigModule } from "@/store"; + +// const host = envConfigModule.getEnv.API_URL; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { // implement socket.io here const socket = io( - // "ws://BC-7101-collaboration-service-deployment.dbc.dbildungscloud.dev", - ":4450", + // "https://bc-7101-collaboration-service-deployment.dbc.dbildungscloud.dev", + // "ws://localhost:4450", + // ":4450", { path: "/board-collaboration", withCredentials: true, From 78674cb4c02f3e4fab088f4de530245453edb656 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Mon, 6 May 2024 15:59:07 +0200 Subject: [PATCH 3/8] add configuration for board collaboration ws uri --- src/modules/data/board/socket/socket.ts | 20 ++++++-------------- src/serverApi/v3/api.ts | 8 ++++++++ src/store/env-config-defaults.ts | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 514f9e9982..c9800ff78f 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,21 +1,13 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; -// import { envConfigModule } from "@/store"; - -// const host = envConfigModule.getEnv.API_URL; +import { envConfigModule } from "@/store"; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { - // implement socket.io here - const socket = io( - // "https://bc-7101-collaboration-service-deployment.dbc.dbildungscloud.dev", - // "ws://localhost:4450", - // ":4450", - { - path: "/board-collaboration", - withCredentials: true, - } - // { path: "/collaboration", transports: ["polling"] } - ); + const socket = io(envConfigModule.getEnv.BOARD_COLLABORATION_URI, { + path: "/board-collaboration", + withCredentials: true, + }); + socket.on("connect", function () { console.log("connected"); }); diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts index 45c21e66af..6d8bbaff8e 100644 --- a/src/serverApi/v3/api.ts +++ b/src/serverApi/v3/api.ts @@ -1005,6 +1005,12 @@ export interface ConfigResponse { * @memberof ConfigResponse */ FEATURE_MEDIA_SHELF_ENABLED: boolean; + /** + * + * @type {string} + * @memberof ConfigResponse + */ + BOARD_COLLABORATION_URI: string; } /** * @@ -1490,6 +1496,7 @@ export interface CopyApiResponse { export enum CopyApiResponseTypeEnum { Board = 'BOARD', Card = 'CARD', + CollaborativeTextEditorElement = 'COLLABORATIVE_TEXT_EDITOR_ELEMENT', Column = 'COLUMN', Columnboard = 'COLUMNBOARD', Content = 'CONTENT', @@ -1545,6 +1552,7 @@ export enum CopyApiResponseStatusEnum { export enum CopyApiResponseElementsTypesEnum { Board = 'BOARD', Card = 'CARD', + CollaborativeTextEditorElement = 'COLLABORATIVE_TEXT_EDITOR_ELEMENT', Column = 'COLUMN', Columnboard = 'COLUMNBOARD', Content = 'CONTENT', diff --git a/src/store/env-config-defaults.ts b/src/store/env-config-defaults.ts index 610ef05607..56fa0d2844 100644 --- a/src/store/env-config-defaults.ts +++ b/src/store/env-config-defaults.ts @@ -68,4 +68,5 @@ export const defaultConfigEnvs: ConfigResponse = { FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: false, CTL_TOOLS_RELOAD_TIME_MS: 299000, FEATURE_MEDIA_SHELF_ENABLED: false, + BOARD_COLLABORATION_URI: "", }; From 29d7c8b7ec8f5b71c3aedf1e4283de5cf6d40cb3 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Tue, 7 May 2024 08:32:58 +0200 Subject: [PATCH 4/8] remove URI-config --- src/modules/data/board/socket/socket.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index c9800ff78f..6680094456 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,9 +1,8 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; -import { envConfigModule } from "@/store"; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { - const socket = io(envConfigModule.getEnv.BOARD_COLLABORATION_URI, { + const socket = io({ path: "/board-collaboration", withCredentials: true, }); From d79d2be2d2258205cc1fc778ada121bce3b95bb1 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Tue, 7 May 2024 12:33:42 +0200 Subject: [PATCH 5/8] fix: Board Collaboration Usage --- src/modules/data/board/socket/socket.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 6680094456..6234d03b83 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,8 +1,11 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; +import { envConfigModule } from "@/store"; + +const BOARD_COLLABORATION_URI = envConfigModule.getEnv.BOARD_COLLABORATION_URI; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { - const socket = io({ + const socket = io(BOARD_COLLABORATION_URI, { path: "/board-collaboration", withCredentials: true, }); From 21a1c5e3493b2b464536092fe95e9eba37ae61d6 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Tue, 7 May 2024 12:42:53 +0200 Subject: [PATCH 6/8] chore: set the default on the client side to the same value --- src/store/env-config-defaults.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/env-config-defaults.ts b/src/store/env-config-defaults.ts index 5018d4457b..b8852a87e9 100644 --- a/src/store/env-config-defaults.ts +++ b/src/store/env-config-defaults.ts @@ -68,6 +68,6 @@ export const defaultConfigEnvs: ConfigResponse = { FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: false, CTL_TOOLS_RELOAD_TIME_MS: 299000, FEATURE_MEDIA_SHELF_ENABLED: false, - BOARD_COLLABORATION_URI: "", + BOARD_COLLABORATION_URI: "ws://localhost:4450", FEATURE_NEW_LAYOUT_ENABLED: true, }; From 899bd453eb6a467d2628fe8c9f4314833ce33326 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Tue, 7 May 2024 14:26:25 +0200 Subject: [PATCH 7/8] fix: removing envConfig from socket-connection --- src/modules/data/board/socket/socket.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 6234d03b83..1e3956e08c 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,8 +1,9 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; -import { envConfigModule } from "@/store"; -const BOARD_COLLABORATION_URI = envConfigModule.getEnv.BOARD_COLLABORATION_URI; +const BOARD_COLLABORATION_URI = process.env.KUBERNETES_SERVICE_PORT + ? "" // pointing to the same host for websocket-requests + : "ws://localhost:4450"; // default for local development export const useBoardSocketApi = (dispatch: (action: Action) => void) => { const socket = io(BOARD_COLLABORATION_URI, { From 3ab341aaba5be59e7f5097d307be19e5bddaf207 Mon Sep 17 00:00:00 2001 From: hoeppner-dataport Date: Tue, 7 May 2024 15:14:18 +0200 Subject: [PATCH 8/8] fix problems with envConfig --- src/modules/data/board/socket/socket.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/modules/data/board/socket/socket.ts b/src/modules/data/board/socket/socket.ts index 1e3956e08c..c9800ff78f 100644 --- a/src/modules/data/board/socket/socket.ts +++ b/src/modules/data/board/socket/socket.ts @@ -1,12 +1,9 @@ import { io } from "socket.io-client"; import { Action } from "@/types/board/ActionFactory"; - -const BOARD_COLLABORATION_URI = process.env.KUBERNETES_SERVICE_PORT - ? "" // pointing to the same host for websocket-requests - : "ws://localhost:4450"; // default for local development +import { envConfigModule } from "@/store"; export const useBoardSocketApi = (dispatch: (action: Action) => void) => { - const socket = io(BOARD_COLLABORATION_URI, { + const socket = io(envConfigModule.getEnv.BOARD_COLLABORATION_URI, { path: "/board-collaboration", withCredentials: true, });