Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#67371] Use real open project URL for api calls with op-blocknote-extensions

Judith Roth56768ab79bae
diff --git a/frontend/src/react/OpBlockNoteContainer.tsx b/frontend/src/react/OpBlockNoteContainer.tsx
index e87c9e79961..ff95063ad9c 100644
--- a/frontend/src/react/OpBlockNoteContainer.tsx
+++ b/frontend/src/react/OpBlockNoteContainer.tsx
@@ -31,7 +31,7 @@
import { BlockNoteSchema, defaultBlockSpecs, filterSuggestionItems } from '@blocknote/core';
import { BlockNoteView } from '@blocknote/mantine';
import { getDefaultReactSlashMenuItems, SuggestionMenuController, useCreateBlockNote } from '@blocknote/react';
-import { getDefaultOpenProjectSlashMenuItems, openProjectWorkPackageBlockSpec } from 'op-blocknote-extensions';
+import { initOpenProjectApi, getDefaultOpenProjectSlashMenuItems, openProjectWorkPackageBlockSpec } from 'op-blocknote-extensions';
import { useEffect, useState } from 'react';
import { OpColorMode } from 'core-app/core/setup/globals/theme-utils';
import { HocuspocusProvider } from '@hocuspocus/provider';
@@ -50,6 +50,7 @@ export interface OpBlockNoteContainerProps {
users:User[];
activeUser:User;
documentId:string;
+ openProjectUrl:string;
}
const schema = BlockNoteSchema.create({
@@ -67,7 +68,10 @@ export default function OpBlockNoteContainer({ inputField,
activeUser,
hocuspocusUrl,
hocuspocusAccessToken,
- documentId }:OpBlockNoteContainerProps) {
+ documentId,
+ openProjectUrl }:OpBlockNoteContainerProps) {
+ initOpenProjectApi({ baseUrl: openProjectUrl});
+
const [isLoading, setIsLoading] = useState(true);
let collaboration:any;
diff --git a/frontend/src/stimulus/controllers/dynamic/block-note.controller.ts b/frontend/src/stimulus/controllers/dynamic/block-note.controller.ts
index de3fbc9c1a9..a87cf83f656 100644
--- a/frontend/src/stimulus/controllers/dynamic/block-note.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/block-note.controller.ts
@@ -47,6 +47,7 @@ export default class extends Controller {
hocuspocusUrl: String,
hocuspocusAccessToken: String,
documentId: String,
+ openProjectUrl: String,
};
declare readonly blockNoteEditorTarget:HTMLElement;
@@ -57,6 +58,7 @@ export default class extends Controller {
declare readonly hocuspocusUrlValue:string;
declare readonly hocuspocusAccessTokenValue:string;
declare readonly documentIdValue:string;
+ declare readonly openProjectUrlValue:string;
connect() {
const root = createRoot(this.blockNoteEditorTarget);
@@ -72,6 +74,7 @@ export default class extends Controller {
hocuspocusUrl: this.hocuspocusUrlValue,
hocuspocusAccessToken: this.hocuspocusAccessTokenValue,
documentId: this.documentIdValue,
+ openProjectUrl: this.openProjectUrlValue,
});
}
}
diff --git a/lib/primer/open_project/forms/block_note_editor.html.erb b/lib/primer/open_project/forms/block_note_editor.html.erb
index d2a96d5a4b6..57f3615bd88 100644
--- a/lib/primer/open_project/forms/block_note_editor.html.erb
+++ b/lib/primer/open_project/forms/block_note_editor.html.erb
@@ -39,6 +39,7 @@ See COPYRIGHT and LICENSE files for more details.
block_note_hocuspocus_url_value: hocuspocus_url,
block_note_hocuspocus_access_token_value: hocuspocus_access_token,
block_note_document_id_value: document_id,
+ block_note_open_project_url_value: open_project_url,
test_selector: "blocknote-document-description"
}
) do
diff --git a/lib/primer/open_project/forms/block_note_editor.rb b/lib/primer/open_project/forms/block_note_editor.rb
index e5953382a74..fda7aade97b 100644
--- a/lib/primer/open_project/forms/block_note_editor.rb
+++ b/lib/primer/open_project/forms/block_note_editor.rb
@@ -42,6 +42,7 @@ module Primer
:active_user,
:hocuspocus_url,
:hocuspocus_access_token,
+ :open_project_url,
:document_id
delegate :name, to: :@input
@@ -65,6 +66,7 @@ module Primer
@document_id = document_id
@hocuspocus_url = Setting.collaborative_editing_hocuspocus_url
@hocuspocus_access_token = ::CollaborativeEditing::DocumentAccessTokenGenerator.call(document_id, value)
+ @open_project_url = root_url
end
end
end