binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-2559] fix: web socket protocol. (#5731)

Browse source
This commit is contained in:
Prateek Shourya 2024-10-01 19:57:17 +05:30 • committed by GitHub
parent 5474ab326d
commit 96dc9db237
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
web/core/components/pages/editor/editor-body.tsx
View file

@ -7,7 +7,6 @@ import {
CollaborativeDocumentReadOnlyEditorWithRef, CollaborativeDocumentReadOnlyEditorWithRef,
EditorReadOnlyRefApi, EditorReadOnlyRefApi,
EditorRefApi, EditorRefApi,
IMarking,
TAIMenuProps, TAIMenuProps,
TDisplayConfig, TDisplayConfig,
TRealtimeConfig, TRealtimeConfig,
@ -67,7 +66,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
project: { getProjectMemberIds }, project: { getProjectMemberIds },
} = useMember(); } = useMember();
// derived values // derived values
const workspaceId = workspaceSlug ? getWorkspaceBySlug(workspaceSlug.toString())?.id ?? "" : ""; const workspaceId = workspaceSlug ? (getWorkspaceBySlug(workspaceSlug.toString())?.id ?? "") : "";
const pageId = page?.id; const pageId = page?.id;
const pageTitle = page?.name ?? ""; const pageTitle = page?.name ?? "";
const { isContentEditable, updateTitle, setIsSubmitting } = page; const { isContentEditable, updateTitle, setIsSubmitting } = page;
@ -113,17 +112,22 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
[] []
); );
const realtimeConfig: TRealtimeConfig = useMemo( const realtimeConfig: TRealtimeConfig = useMemo(() => {
() => ({ // Construct the WebSocket Collaboration URL
url: `${LIVE_URL}/collaboration`, const WS_LIVE_URL = new URL(LIVE_URL);
const isSecureEnvironment = window.location.protocol === "https:";
WS_LIVE_URL.protocol = isSecureEnvironment ? "wss" : "ws";
WS_LIVE_URL.pathname = "collaboration";
return {
url: WS_LIVE_URL.toString(),
queryParams: { queryParams: {
workspaceSlug: workspaceSlug?.toString(), workspaceSlug: workspaceSlug?.toString(),
projectId: projectId?.toString(), projectId: projectId?.toString(),
documentType: "project_page", documentType: "project_page",
}, },
}), };
[projectId, workspaceSlug] }, [projectId, workspaceSlug]);
);
if (pageId === undefined) return <PageContentLoader />; if (pageId === undefined) return <PageContentLoader />;