Skip to content

[stable34] Revert "Revert "refactor(NavigationManager): move navigation definitions into apps""#61054

Open
susnux wants to merge 2 commits into
stable34from
revert-61008-revert-60961-backport/60458/stable34
Open

[stable34] Revert "Revert "refactor(NavigationManager): move navigation definitions into apps""#61054
susnux wants to merge 2 commits into
stable34from
revert-61008-revert-60961-backport/60458/stable34

Conversation

@susnux
Copy link
Copy Markdown
Contributor

@susnux susnux commented Jun 7, 2026

@susnux susnux added bug 3. to review Waiting for reviews labels Jun 7, 2026
…on definitions into apps""

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux force-pushed the revert-61008-revert-60961-backport/60458/stable34 branch from aeb54b6 to c8edc67 Compare June 7, 2026 09:11
@susnux
Copy link
Copy Markdown
Contributor Author

susnux commented Jun 7, 2026

/backport c8edc67 to master

@susnux susnux marked this pull request as ready for review June 7, 2026 09:11
@susnux susnux requested review from a team, hweihwang and sorbaugh as code owners June 7, 2026 09:11
@susnux susnux requested review from artonge, nfebe, salmart-dev and skjnldsv and removed request for a team June 7, 2026 09:11
@susnux susnux added this to the Nextcloud 34.0.1 milestone Jun 7, 2026
@susnux
Copy link
Copy Markdown
Contributor Author

susnux commented Jun 7, 2026

(not for 34 but .1)

@susnux susnux force-pushed the revert-61008-revert-60961-backport/60458/stable34 branch from c8edc67 to 6175324 Compare June 7, 2026 12:51
The `init` method previously contained two different logics:
1. It set up the internal state of default apps and app order
2. It resolved the app navigation entries

The 1. is needed before `add` can be called, so it was always called by
the `add` method, but this also resolved all appinfo.xml entries on the
first `add` call even if never used.
The 2. is only needed when the navigations are actually fetched.

This splits the logic into two functions:
- `init` for the bare initialization
- `resolveAppNavigationEntries` for resolving the entries when
  requesting to output them.

This should give a small performance improvement for API calls and fixes
a problem when navigations are added before all apps are registered.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux force-pushed the revert-61008-revert-60961-backport/60458/stable34 branch from 6175324 to 848b521 Compare June 7, 2026 13:09
@susnux
Copy link
Copy Markdown
Contributor Author

susnux commented Jun 7, 2026

WAIT FOR MASTER FIRST: #61055

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant