Merge pull request #2885 from nextcloud/fix/context-navigation-load-additional-entries

feat(navigation): add LoadAdditionalEntriesListener

Author: enjeck

lib/AppInfo/Application.php

@@ -17,7 +17,7 @@
 use OCA\Tables\Event\ViewDeletedEvent;
 use OCA\Tables\Listener\AddMissingIndicesListener;
 use OCA\Tables\Listener\AnalyticsDatasourceListener;
-use OCA\Tables\Listener\BeforeTemplateRenderedListener;
+use OCA\Tables\Listener\LoadAdditionalEntriesListener;
 use OCA\Tables\Listener\LoadAdditionalListener;
 use OCA\Tables\Listener\ReceiverCleanupListener;
 use OCA\Tables\Listener\TablesReferenceListener;
@@ -39,11 +39,11 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 use OCP\DB\Events\AddMissingIndicesEvent;
 use OCP\Group\Events\GroupDeletedEvent;
+use OCP\Navigation\Events\LoadAdditionalEntriesEvent;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
 use Psr\Container\ContainerInterface;
@@ -85,7 +85,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, UserDeletedListener::class);
 		$context->registerEventListener(DatasourceEvent::class, AnalyticsDatasourceListener::class);
 		$context->registerEventListener(RenderReferenceEvent::class, TablesReferenceListener::class);
-		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+		$context->registerEventListener(LoadAdditionalEntriesEvent::class, LoadAdditionalEntriesListener::class);
 		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
 		$context->registerEventListener(TableDeletedEvent::class, WhenTableDeletedAuditLogListener::class);
 		$context->registerEventListener(ViewDeletedEvent::class, WhenViewDeletedAuditLogListener::class);

…tener/BeforeTemplateRenderedListener.php …stener/LoadAdditionalEntriesListener.phplib/Listener/BeforeTemplateRenderedListener.php renamed to lib/Listener/LoadAdditionalEntriesListener.php lib/Listener/BeforeTemplateRenderedListener.php renamed to lib/Listener/LoadAdditionalEntriesListener.php

@@ -8,15 +8,15 @@
 namespace OCA\Tables\Listener;
 
 use OCA\Tables\Service\ContextService;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IUserSession;
+use OCP\Navigation\Events\LoadAdditionalEntriesEvent;
 
 /**
- * @template-implements IEventListener<Event|BeforeTemplateRenderedEvent>
+ * @template-implements IEventListener<Event|LoadAdditionalEntriesEvent>
  */
-class BeforeTemplateRenderedListener implements IEventListener {
+class LoadAdditionalEntriesListener implements IEventListener {
 	public function __construct(
 		protected IUserSession $userSession,
 		protected ContextService $contextService,
@@ -27,7 +27,7 @@ public function __construct(
 	 * @inheritDoc
 	 */
 	public function handle(Event $event): void {
-		if (!$event instanceof BeforeTemplateRenderedEvent) {
+		if (!$event instanceof LoadAdditionalEntriesEvent) {
 			return;
 		}
 

lib/Service/ContextService.php

@@ -80,25 +80,23 @@ public function findForNavigation(string $userId): array {
 	public function addToNavigation(string $userId): void {
 		$contexts = $this->findForNavigation($userId);
 		foreach ($contexts as $context) {
-			$this->navigationManager->add(function () use ($context) {
-				$iconRelPath = 'material/' . $context->getIcon() . '.svg';
-				if (file_exists(__DIR__ . '/../../img/' . $iconRelPath)) {
-					$iconUrl = $this->urlGenerator->imagePath(Application::APP_ID, $iconRelPath);
-				} else {
-					$iconUrl = $this->urlGenerator->imagePath('core', 'places/default-app-icon.svg');
-				}
+			$iconRelPath = 'material/' . $context->getIcon() . '.svg';
+			if (file_exists(__DIR__ . '/../../img/' . $iconRelPath)) {
+				$iconUrl = $this->urlGenerator->imagePath(Application::APP_ID, $iconRelPath);
+			} else {
+				$iconUrl = $this->urlGenerator->imagePath('core', 'places/default-app-icon.svg');
+			}
+
+			$contextUrl = $this->urlGenerator->linkToRoute('tables.page.context', ['contextId' => $context->getId()]);
 
-				$contextUrl = $this->urlGenerator->linkToRoute('tables.page.context', ['contextId' => $context->getId()]);
-
-				return [
-					'id' => Application::APP_ID . '_application_' . $context->getId(),
-					'name' => $context->getName(),
-					'href' => $contextUrl,
-					'icon' => $iconUrl,
-					'order' => 500,
-					'type' => 'link',
-				];
-			});
+			$this->navigationManager->add([
+				'id' => Application::APP_ID . '_application_' . $context->getId(),
+				'name' => $context->getName(),
+				'href' => $contextUrl,
+				'icon' => $iconUrl,
+				'order' => 500,
+				'type' => 'link',
+			]);
 		}
 	}