Skip to content

Commit bb89038

Browse files
committed
use resource id instead of document title
1 parent f974d7f commit bb89038

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

frontend/src/stimulus/controllers/dynamic/documents/init-yjs-provider.controller.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,18 @@ import { LiveCollaborationManager } from 'core-stimulus/helpers/live-collaborati
3535
export default class extends Controller {
3636
static values = {
3737
hocuspocusUrl: String,
38-
openProjectUrl: String,
3938
oauthToken: String,
4039
documentName: String,
41-
documentId: String,
4240
};
4341

4442
declare readonly hocuspocusUrlValue:string;
45-
declare readonly openProjectUrlValue:string;
4643
declare readonly oauthTokenValue:string;
4744
declare readonly documentNameValue:string;
48-
declare readonly documentIdValue:string;
4945

5046
connect():void {
51-
const url = new URL(this.hocuspocusUrlValue);
52-
url.searchParams.set('document_id', this.documentIdValue);
53-
url.searchParams.set('openproject_base_path', this.openProjectUrlValue);
54-
5547
LiveCollaborationManager.initializeYjsProvider(
5648
new HocuspocusProvider({
57-
url: url.toString(),
49+
url: this.hocuspocusUrlValue,
5850
name: this.documentNameValue,
5951
token: this.oauthTokenValue,
6052
document: LiveCollaborationManager.ydoc,

modules/documents/app/components/documents/show_edit_view/block_note_editor_component.html.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@
3333
helpers.content_controller(
3434
"documents--init-yjs-provider",
3535
"documents--init-yjs-provider-hocuspocus-url-value": Setting.collaborative_editing_hocuspocus_url,
36-
"documents--init-yjs-provider-open-project-url-value": root_url,
3736
"documents--init-yjs-provider-oauth-token-value": oauth_token,
38-
"documents--init-yjs-provider-document-name-value": document.title,
39-
"documents--init-yjs-provider-document-id-value": document.id
37+
"documents--init-yjs-provider-document-name-value": resource_url
4038
)
4139
%>
4240

modules/documents/app/components/documents/show_edit_view/block_note_editor_component.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ class BlockNoteEditorComponent < ApplicationComponent
4646
def current_user
4747
User.current
4848
end
49+
50+
def resource_url
51+
URI.join(
52+
root_url,
53+
API::V3::Utilities::PathHelper::ApiV3Path.document(document.id)
54+
).to_s
55+
end
4956
end
5057
end
5158
end

0 commit comments

Comments
 (0)