aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files/lib/App.php2
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/private/NavigationManager.php4
-rw-r--r--lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php17
-rw-r--r--tests/lib/NavigationManagerTest.php17
6 files changed, 42 insertions, 0 deletions
diff --git a/apps/files/lib/App.php b/apps/files/lib/App.php
index b6b0ffa6917..9e6d35a7538 100644
--- a/apps/files/lib/App.php
+++ b/apps/files/lib/App.php
@@ -10,6 +10,7 @@ namespace OCA\Files;
use OC\NavigationManager;
use OCA\Files\Service\ChunkedUploadConfig;
use OCP\App\IAppManager;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\INavigationManager;
@@ -36,6 +37,7 @@ class App {
Server::get(IGroupManager::class),
Server::get(IConfig::class),
Server::get(LoggerInterface::class),
+ Server::get(IEventDispatcher::class),
);
self::$navigationManager->clear(false);
}
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index aa850c8bed4..df4011f0589 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -640,6 +640,7 @@ return array(
'OCP\\Migration\\IOutput' => $baseDir . '/lib/public/Migration/IOutput.php',
'OCP\\Migration\\IRepairStep' => $baseDir . '/lib/public/Migration/IRepairStep.php',
'OCP\\Migration\\SimpleMigrationStep' => $baseDir . '/lib/public/Migration/SimpleMigrationStep.php',
+ 'OCP\\Navigation\\Events\\LoadAdditionalEntriesEvent' => $baseDir . '/lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php',
'OCP\\Notification\\AlreadyProcessedException' => $baseDir . '/lib/public/Notification/AlreadyProcessedException.php',
'OCP\\Notification\\IAction' => $baseDir . '/lib/public/Notification/IAction.php',
'OCP\\Notification\\IApp' => $baseDir . '/lib/public/Notification/IApp.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index fd4993dd5a8..bbe553913ee 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -681,6 +681,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
'OCP\\Migration\\IOutput' => __DIR__ . '/../../..' . '/lib/public/Migration/IOutput.php',
'OCP\\Migration\\IRepairStep' => __DIR__ . '/../../..' . '/lib/public/Migration/IRepairStep.php',
'OCP\\Migration\\SimpleMigrationStep' => __DIR__ . '/../../..' . '/lib/public/Migration/SimpleMigrationStep.php',
+ 'OCP\\Navigation\\Events\\LoadAdditionalEntriesEvent' => __DIR__ . '/../../..' . '/lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php',
'OCP\\Notification\\AlreadyProcessedException' => __DIR__ . '/../../..' . '/lib/public/Notification/AlreadyProcessedException.php',
'OCP\\Notification\\IAction' => __DIR__ . '/../../..' . '/lib/public/Notification/IAction.php',
'OCP\\Notification\\IApp' => __DIR__ . '/../../..' . '/lib/public/Notification/IApp.php',
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index f341c6d3094..4bcd78b7fcf 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -11,6 +11,7 @@ use InvalidArgumentException;
use OC\App\AppManager;
use OC\Group\Manager;
use OCP\App\IAppManager;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\INavigationManager;
@@ -18,6 +19,7 @@ use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
use OCP\L10N\IFactory;
+use OCP\Navigation\Events\LoadAdditionalEntriesEvent;
use Psr\Log\LoggerInterface;
/**
@@ -56,6 +58,7 @@ class NavigationManager implements INavigationManager {
IGroupManager $groupManager,
IConfig $config,
LoggerInterface $logger,
+ protected IEventDispatcher $eventDispatcher,
) {
$this->appManager = $appManager;
$this->urlGenerator = $urlGenerator;
@@ -318,6 +321,7 @@ class NavigationManager implements INavigationManager {
]);
}
}
+ $this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
if ($this->userSession->isLoggedIn()) {
$user = $this->userSession->getUser();
diff --git a/lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php b/lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php
new file mode 100644
index 00000000000..61db417b927
--- /dev/null
+++ b/lib/public/Navigation/Events/LoadAdditionalEntriesEvent.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCP\Navigation\Events;
+
+use OCP\EventDispatcher\Event;
+
+/**
+ * @since 31.0.0
+ */
+class LoadAdditionalEntriesEvent extends Event {
+}
diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php
index 7767a8c2e8f..d9db928e8a1 100644
--- a/tests/lib/NavigationManagerTest.php
+++ b/tests/lib/NavigationManagerTest.php
@@ -11,6 +11,7 @@ use OC\App\AppManager;
use OC\Group\Manager;
use OC\NavigationManager;
use OC\SubAdmin;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
@@ -18,6 +19,8 @@ use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
use OCP\L10N\IFactory;
+use OCP\Navigation\Events\LoadAdditionalEntriesEvent;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
class NavigationManagerTest extends TestCase {
@@ -34,6 +37,8 @@ class NavigationManagerTest extends TestCase {
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
+ protected IEVentDispatcher|MockObject $dispatcher;
+
/** @var \OC\NavigationManager */
protected $navigationManager;
protected LoggerInterface $logger;
@@ -48,6 +53,7 @@ class NavigationManagerTest extends TestCase {
$this->groupManager = $this->createMock(Manager::class);
$this->config = $this->createMock(IConfig::class);
$this->logger = $this->createMock(LoggerInterface::class);
+ $this->dispatcher = $this->createMock(IEventDispatcher::class);
$this->navigationManager = new NavigationManager(
$this->appManager,
$this->urlGenerator,
@@ -56,6 +62,7 @@ class NavigationManagerTest extends TestCase {
$this->groupManager,
$this->config,
$this->logger,
+ $this->dispatcher,
);
$this->navigationManager->clear(false);
@@ -256,6 +263,11 @@ class NavigationManagerTest extends TestCase {
$this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
$this->navigationManager->clear();
+ $this->dispatcher->expects($this->once())
+ ->method('dispatchTyped')
+ ->willReturnCallback(function ($event) {
+ $this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
+ });
$entries = $this->navigationManager->getAll('all');
$this->assertEquals($expected, $entries);
}
@@ -558,6 +570,11 @@ class NavigationManagerTest extends TestCase {
$this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
$this->navigationManager->clear();
+ $this->dispatcher->expects($this->once())
+ ->method('dispatchTyped')
+ ->willReturnCallback(function ($event) {
+ $this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
+ });
$entries = $this->navigationManager->getAll();
$this->assertEquals($expected, $entries);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 08:43:41 +0000