Skip to content

Use NavigationManager instead of AppManager to handle custom apps order #47523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 7 commits into from
Sep 9, 2024
Merged

Use NavigationManager instead of AppManager to handle custom apps order #47523

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0baaae
feat(NavigationManager): Add default entries handling
provokateurin Aug 27, 2024
70ed08d
refactor(AppManager): Deprecated default apps handling
provokateurin Aug 27, 2024
01ec676
fix(URLGenerator): Use NavigationManager to generate default page URL
provokateurin Aug 27, 2024
6696411
fix(TemplateLayout): Use NavigationManager to get default app name
provokateurin Aug 27, 2024
0a3093d
fix(theming): Use NavigationManager to handle default entries
provokateurin Aug 27, 2024
d5e98cd
fix(NavigationManager): Skip invalid default navigation entries
provokateurin Sep 4, 2024
c0ac279
docs(config): Explain how to retrieve navigation entry IDs for 'defau…
provokateurin Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(URLGenerator): Use NavigationManager to generate default page URL 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin
provokateurin committed Sep 9, 2024
commit 01ec6762a249dbedc0bee452eb698c1dc6a52431
25 changes: 19 additions & 6 deletions lib/private/URLGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use OCP\App\IAppManager;
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
Expand All @@ -36,6 +37,7 @@ class URLGenerator implements IURLGenerator {
/** @var null|string */
private $baseUrl = null;
private ?IAppManager $appManager = null;
private ?INavigationManager $navigationManager = null;

public function __construct(IConfig $config,
IUserSession $userSession,
Expand All @@ -58,6 +60,14 @@ private function getAppManager(): IAppManager {
return $this->appManager;
}

private function getNavigationManager(): INavigationManager {
if ($this->navigationManager !== null) {
return $this->navigationManager;
}
$this->navigationManager = \OCP\Server::get(INavigationManager::class);
return $this->navigationManager;
}

/**
* Creates an url using a defined route
*
Expand Down Expand Up @@ -288,14 +298,17 @@ public function linkToDefaultPageUrl(): string {
return $this->getAbsoluteURL($defaultPage);
}

$appId = $this->getAppManager()->getDefaultAppForUser();

if ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false)
|| getenv('front_controller_active') === 'true') {
return $this->getAbsoluteURL('/apps/' . $appId . '/');
$entryId = $this->getNavigationManager()->getDefaultEntryIdForUser();
$entry = $this->getNavigationManager()->get($entryId);
$href = (string)$entry['href'];
if ($href === '') {
throw new \InvalidArgumentException('Default navigation entry is missing href: ' . $entryId);
}
if (str_starts_with($href, '/index.php/') && ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true')) {
$href = substr($href, 10);
}

return $this->getAbsoluteURL('/index.php/apps/' . $appId . '/');
return $this->getAbsoluteURL($href);
}

/**
Expand Down