[#74710] show inline page link macros in editing mode

docker-compose.yml

@@ -8,7 +8,6 @@ volumes:
   tmp:
   opdata:
   bundle:
-  npm:
   pgdata-test:
   tmp-test:
   fedata-test:

frontend/src/app/core/path-helper/path-helper.service.ts

@@ -472,4 +472,11 @@ export class PathHelperService {
   public externalRedirectPath(url:string) {
     return `${this.staticBase}/external_redirect?url=${encodeURIComponent(url)}`;
   }
+
+  public wikiPageLinkMacro(providerId:string, pageIdentifier:string, turboFrameId:string) {
+    const providerIdQuery = `provider_id=${encodeURIComponent(providerId)}`;
+    const pageIdentifierQuery = `page_identifier=${encodeURIComponent(pageIdentifier)}`;
+    const frameIdQuery = `turbo_frame_id=${encodeURIComponent(turboFrameId)}`;
+    return `${this.staticBase}/wiki_page_link_macro/load?${providerIdQuery}&${pageIdentifierQuery}&${frameIdQuery}`;
+  }
 }

modules/wikis/app/components/wikis/inline_page_link_macro_component.html.erb

@@ -0,0 +1,43 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+  render(OpPrimer::InlineMacroComponent.new) do |inline_macro|
+    inline_macro.with_leading_visual_icon(icon: :"op-file-doc")
+
+    page_info_result.either(
+      ->(page_info) do
+        render(Primer::Beta::Link.new(href: page_info.href)) { page_info.title }
+      end,
+      ->(_error) do
+        render(Primer::Beta::Text.new(color: :muted)) { I18n.t("wikis.macro.page_not_found") }
+      end
+    )
+  end
+%>

modules/wikis/app/components/wikis/inline_page_link_macro_component.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Wikis
+  class InlinePageLinkMacroComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpPrimer::ComponentHelpers
+
+    alias_method :page_info_result, :model
+  end
+end

modules/wikis/app/controllers/wikis/page_link_controller.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Wikis
+  class PageLinkController < ApplicationController
+    include Dry::Monads[:result]
+
+    # The view component shown in `load` will be rendered regardless of the current user's authorization status.
+    # The component itself handles the states of "unauthorized", "forbidden", and "not_found".
+    authorization_checked! :load
+
+    def load
+      provider = Provider.visible.find_by(id: params[:provider_id])
+      @page_info_result = page_info_result(provider)
+      @turbo_frame_id = turbo_frame_id
+
+      render layout: false
+    end
+
+    private
+
+    def page_info_result(provider)
+      return Failure() if provider.nil?
+
+      Adapters::Input::PageInfo.build(identifier:).bind do |input_data|
+        provider.auth_strategy_for(User.current).bind do |auth_strategy|
+          provider.resolve("queries.page_info").call(input_data:, auth_strategy:)
+        end
+      end
+    end
+
+    def identifier
+      params[:page_identifier]
+    end
+
+    def turbo_frame_id
+      params[:turbo_frame_id]
+    end
+  end
+end

modules/wikis/app/services/wikis/text_formatting/wiki_link_matcher.rb

@@ -60,37 +60,24 @@ def initialize(provider_id:, identifier:)
       end
 
       def process
-        provider = Wikis::Provider.find_by(id: @provider_id)
+        provider = Provider.find_by(id: @provider_id)
         view_context = ApplicationController.new.view_context
-        OpPrimer::InlineMacroComponent.new.render_in(view_context) do |component|
-          component.with_leading_visual_icon(icon: :"op-file-doc")
+        page_info_result = resolve_page(provider, @identifier)
 
-          resolve_page(provider, @identifier).either(
-            ->(page_info) { render_page_info_macro(view_context, page_info) },
-            ->(error) { render_error_macro(view_context, error) }
-          )
-        end
+        InlinePageLinkMacroComponent.new(page_info_result).render_in(view_context)
       end
 
       private
 
       def resolve_page(provider, identifier)
         return Failure() if provider.nil?
 
-        Wikis::Adapters::Input::PageInfo.build(identifier:).bind do |input|
+        Adapters::Input::PageInfo.build(identifier:).bind do |input_data|
           provider.auth_strategy_for(User.current).bind do |auth_strategy|
-            provider.resolve("queries.page_info").call(input_data: input, auth_strategy:)
+            provider.resolve("queries.page_info").call(input_data:, auth_strategy:)
           end
         end
       end
-
-      def render_page_info_macro(view_context, page_info)
-        Primer::Beta::Link.new(href: page_info.href).render_in(view_context) { page_info.title }
-      end
-
-      def render_error_macro(view_context, _error)
-        Primer::Beta::Text.new(color: :muted).render_in(view_context) { I18n.t("wikis.macro.page_not_found") }
-      end
     end
   end
 end

modules/wikis/app/views/wikis/page_link/load.html.erb

@@ -0,0 +1,32 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<turbo-frame id="<%= @turbo_frame_id %>">
+  <%= render(::Wikis::InlinePageLinkMacroComponent.new(@page_info_result)) %>
+</turbo-frame>

modules/wikis/config/routes.rb

@@ -43,6 +43,11 @@
       end
     end
   end
+
+  resource :wiki_page_link_macro, controller: "wikis/page_link" do
+    get :load
+  end
+
   resources :projects, only: %i[] do
     resources :work_packages, only: %i[] do
       resources :wikis, only: %i[] do