[#73909] Restructure wiki tab content for new designs by Kharonus · Pull Request #22833 · opf/openproject

Kharonus · 2026-04-20T13:56:44Z

Ticket

What are you trying to accomplish?

align wiki tab content with current designs

What approach did you choose and why?

add new sections
add new border boxes for all sections
add collapsing logic
add empty state for the whole tab

…inks' into feature/73909-restructure-wiki-tab-content-for-new-designs

- https://community.openproject.org/work_packages/73909 - add new sections - add new border boxes for all sections - add collapsing logic - add empty state for the whole tab

- use single collapsible page links component for inlines and mentions

…r-new-designs

github-actions · 2026-04-20T13:58:04Z

Caution

The provided work package version does not match the core version

Details:

Work package URL: https://community.openproject.org/work_packages/73909
Work package version: not set
Core version: 17.5.0

Please make sure that:

The work package version OR your pull request target branch is correct

…b-content-for-new-designs

…r-new-designs

- amend page info result model - adapt page link service to return page info results

Kharonus · 2026-04-21T13:41:39Z

This PR is still bloated with the changes in #22761 . Once the other is merged, it will be reviewable.

Alternatively I could set the merge target to new-wiki-macros but this branch already includes a newer dev, hence the PR would include even more irrelevant changes.

…r-new-designs

Kharonus · 2026-04-23T08:18:41Z

This PR is still bloated with the changes in #22761 . Once the other is merged, it will be reviewable.

Alternatively I could set the merge target to new-wiki-macros but this branch already includes a newer dev, hence the PR would include even more irrelevant changes.

Merge finished, this PR is again clean of external changes.

NobodysNightmare · 2026-04-23T10:55:42Z

    end

-    def relation_page_links_for(provider:, linkable:)
+    def relation_page_link_infos_for(provider:, linkable:)


🟡 I noticed the term "page link info" in a few places before. Is it a mix of the two real entities "page link" and "page info"?

Or is there an entity that I am not aware of, that's called PageLinkInfo?

no, this is a naming issue, i can simply resolve....

Edit: now I remember how this names came into place. The differentiation is the prefix. We have relation page links and inline page links. And on top of those we fetch page infos. So, I already shortened it from RelationPageLinkPageInfo to something shorter. Thoughts from your side with this information?

It's interesting that I stumbled over it in the first place... Let me write it down logically: A page link is a link to a page and I might want to have information about a page... page info.

Now what we fetch here is the information about a page that we link to... linked page info? That would give us inline linked page info and relation linked page info...

I don't say that I like these names, I am just trying to use the words as if they were actual language... And I think that "inline" and "relation" tell us how we link the pages.

Any thoughts from your side now? I think eventually I can also live with the names chosen here... Alternatively, I am trying to figure out how much I like/hate relation_linked_page_infos_for and inline_linked_page_infos_for...

NobodysNightmare · 2026-04-23T11:01:03Z

-    def relation_page_links_for(provider:, linkable:)
+    def relation_page_link_infos_for(provider:, linkable:)
      provider.page_links
              .merge(RelationPageLink.all)


🔴 I just realized that this is a valid implementation for the internal provider, but an invalid implementation for the XWiki provider, because we will not be storing relation page links for XWiki locally.

As propoposed for a different query already, I'd suggest to extract this code into a query that can be called on the provider (then it also makes sense that it returns PageInfos). We can take this implementation here for the internal wiki already, but I guess for XWiki we should go for another fake implementation.

As said earlier, I would find it great if we could push our "faking" out into the queries and commands, but have the rest of the code in "production" shape already. Because this will eventually give us a nice overview of which pieces are still missing.

Naming proposals:

provider.resolve("queries.related_pages").call(...) provider.resolve("queries.relation_page_links").call(...)

- resolved post merge conflict errors - improve counting of page links in tab

Kharonus · 2026-04-23T11:57:41Z

I want to create now two queries. @NobodysNightmare Are you fine, if I extract both to a separate PR?

NobodysNightmare · 2026-04-23T13:00:33Z

I want to create now two queries. @NobodysNightmare Are you fine, if I extract both to a separate PR?

No concern about splitting this out into a separate PR, feel free to do so.

For me the most important part is, that we don't forget to do it :)

Kharonus · 2026-04-23T13:14:33Z

PR for the referencing pages query would be here: #22899

If the only thing left here are the queries, is this approved? or is there something missing?

NobodysNightmare · 2026-04-23T13:19:56Z

+
+      relation_page_links +
+        inline_page_link_infos_for(linkable:).size +
+        referencing_wiki_page_infos_for(linkable:).size


❗ Interesting that the referencing pages are now included. They were previously ignored.

I am not quite sure where we plan to use this number, though, so maybe it makes sense 🤷

the number is used in the tab counter badge. And Design said explicitly to include all shown page links.

NobodysNightmare

Dead code (see my comment) still needs to be addressed. And potentially the naming issue around page link infos...

Apart from this, it looks good.

NobodysNightmare

(leaving decision on the naming and whether to include "mentioned by" in counts up to you)

Kharonus added 3 commits April 15, 2026 14:59

Merge branch 'implementation/73356-show-existing-relation-wiki-page-l…

d79261a

…inks' into feature/73909-restructure-wiki-tab-content-for-new-designs

[#73909] add new view component structure

b3a14b7

- https://community.openproject.org/work_packages/73909 - add new sections - add new border boxes for all sections - add collapsing logic - add empty state for the whole tab

[#73909] add view model for page links

52709a7

- use single collapsible page links component for inlines and mentions

Kharonus requested a review from a team April 20, 2026 13:56

Kharonus self-assigned this Apr 20, 2026

Merge branch 'dev' into feature/73909-restructure-wiki-tab-content-fo…

eabb934

…r-new-designs

Kharonus commented Apr 20, 2026

View reviewed changes

Comment thread modules/wikis/app/models/wikis/page_link_view_model.rb

Kharonus commented Apr 20, 2026

View reviewed changes

Comment thread modules/wikis/app/components/wikis/page_link_component.html.erb Outdated

NobodysNightmare reviewed Apr 20, 2026

View reviewed changes

Comment thread modules/wikis/app/components/wikis/page_link_component.html.erb Outdated

NobodysNightmare reviewed Apr 20, 2026

View reviewed changes

Comment thread modules/wikis/app/models/wikis/page_link_view_model.rb Outdated

NobodysNightmare reviewed Apr 20, 2026

View reviewed changes

Comment thread modules/wikis/app/models/wikis/page_link_view_model.rb Outdated

Kharonus and others added 4 commits April 21, 2026 11:07

[#73909] remove headings from wiki tab content

505f3ea

Merge branch 'new-wiki-macros' into feature/73909-restructure-wiki-ta…

9fd5085

…b-content-for-new-designs

Merge branch 'dev' into feature/73909-restructure-wiki-tab-content-fo…

79f9e71

…r-new-designs

[#73909] use page info result to render page link component

3c5bdcb

- amend page info result model - adapt page link service to return page info results

github-advanced-security AI found potential problems Apr 21, 2026

View reviewed changes

Comment thread modules/wikis/app/services/wikis/page_link_service.rb Fixed

Kharonus changed the base branch from dev to new-wiki-macros April 21, 2026 13:40

Kharonus requested a review from NobodysNightmare April 21, 2026 13:40

Kharonus changed the base branch from new-wiki-macros to dev April 21, 2026 13:40

Merge branch 'dev' into feature/73909-restructure-wiki-tab-content-fo…

2e19a05

…r-new-designs

[#73909] removed view model

3292c37

github-advanced-security AI found potential problems Apr 23, 2026

View reviewed changes

Comment thread modules/wikis/app/services/wikis/page_link_service.rb Dismissed

NobodysNightmare reviewed Apr 23, 2026

View reviewed changes

Comment thread modules/wikis/app/services/wikis/page_link_service.rb

NobodysNightmare requested changes Apr 23, 2026

View reviewed changes

[#73909] removed wiki tab global blank slate

d53a39c

- resolved post merge conflict errors - improve counting of page links in tab

Kharonus force-pushed the feature/73909-restructure-wiki-tab-content-for-new-designs branch from 92150bc to d53a39c Compare April 23, 2026 11:56

Kharonus requested a review from NobodysNightmare April 23, 2026 13:14

NobodysNightmare reviewed Apr 23, 2026

View reviewed changes

NobodysNightmare requested changes Apr 23, 2026

View reviewed changes

[#73909] removed obsolete code

09df122

NobodysNightmare approved these changes Apr 23, 2026

View reviewed changes

Kharonus merged commit 7dabcc3 into dev Apr 24, 2026
17 of 18 checks passed

Kharonus deleted the feature/73909-restructure-wiki-tab-content-for-new-designs branch April 24, 2026 11:15

github-actions Bot locked and limited conversation to collaborators Apr 24, 2026

Conversation

Kharonus commented Apr 20, 2026

Ticket

What are you trying to accomplish?

What approach did you choose and why?

Uh oh!

github-actions Bot commented Apr 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kharonus commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kharonus commented Apr 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

NobodysNightmare Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Kharonus Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NobodysNightmare Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

NobodysNightmare Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kharonus commented Apr 23, 2026

Uh oh!

NobodysNightmare commented Apr 23, 2026

Uh oh!

Kharonus commented Apr 23, 2026

Uh oh!

NobodysNightmare Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Kharonus Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

NobodysNightmare left a comment

Choose a reason for hiding this comment

Uh oh!

NobodysNightmare left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Apr 20, 2026 •

edited

Loading

Kharonus commented Apr 21, 2026 •

edited

Loading

Kharonus Apr 23, 2026 •

edited

Loading