Merge pull request #547 from nextcloud/fix/quota-links-stable26

[stable26] Fix quota links in files
nextcloud · Aug 30, 2023 · 2e0d18b · 2e0d18b
2 parents 529af45 + 804033a
commit 2e0d18b
Show file tree

Hide file tree

Showing 6 changed files with 6,559 additions and 7,405 deletions.
diff --git a/js/quota-files-sidebar.js b/js/quota-files-sidebar.js
diff --git a/lib/BeforeTemplateRenderedListener.php b/lib/BeforeTemplateRenderedListener.php
@@ -25,6 +25,7 @@
 
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\INavigationManager;
@@ -42,12 +43,19 @@ class BeforeTemplateRenderedListener implements IEventListener {
  /** @var IURLGenerator */
  protected $urlGenerator;
 
- public function __construct(SitesManager $sitesManager,
+ /** @var IInitialState */
+ private $initialState;
+
+ public function __construct(
+ SitesManager $sitesManager,
  INavigationManager $navigationManager,
- IURLGenerator $urlGenerator) {
+ IURLGenerator $urlGenerator,
+ IInitialState $initialState,
+ ) {
  $this->sitesManager = $sitesManager;
  $this->navigationManager = $navigationManager;
  $this->urlGenerator = $urlGenerator;
+ $this->initialState = $initialState;
  }
 
  public function handle(Event $event): void {
@@ -63,20 +71,36 @@ public function handle(Event $event): void {
  protected function loadQuotaInformationOnFilesApp(LoadAdditionalScriptsEvent $event): void {
  $sites = $this->sitesManager->getSitesToDisplay();
 
+ $data = [];
  foreach ($sites as $site) {
  if ($site['type'] === SitesManager::TYPE_QUOTA) {
- $link = $site['url'];
- if (!$site['redirect']) {
- $link = $this->urlGenerator->linkToRoute('external.site.showPage', ['id' => $site['id']]);
- }
-
- $event->addHiddenField('external_quota_link', $link);
- $event->addHiddenField('external_quota_name', $site['name']);
+ $image = $this->generateImageLink($site);
+ $href = $this->getHref($site);
 
- Util::addScript('external', 'quota-files-sidebar');
- return;
+ $data[] = ['name' => $site['name'], 'href' => $href, 'image' => $image];
  }
  }
+
+ if (count($data) > 0) {
+ $this->initialState->provideInitialState('external-quota-sites', $data);
+ Util::addScript('external', 'dist/quota-files-sidebar');
+ }
+ }
+
+ protected function generateImageLink(array $site): string {
+ if ($site['icon'] !== '') {
+ return $this->urlGenerator->linkToRoute('external.icon.showIcon', ['icon' => $site['icon']]);
+ }
+
+ return $this->urlGenerator->linkToRoute('external.icon.showIcon', ['icon' => 'external.svg']);
+ }
+
+ protected function getHref(array $site): string {
+ if (!$site['redirect']) {
+ return $this->urlGenerator->linkToRoute('external.site.showPage', ['id' => $site['id']]);
+ }
+
+ return $site['url'];
  }
 
  protected function generateNavigationLinks(): void {
@@ -88,16 +112,8 @@ protected function generateNavigationLinks(): void {
  }
 
  $this->navigationManager->add(function () use ($site) {
- if ($site['icon'] !== '') {
- $image = $this->urlGenerator->linkToRoute('external.icon.showIcon', ['icon' => $site['icon']]);
- } else {
- $image = $this->urlGenerator->linkToRoute('external.icon.showIcon', ['icon' => 'external.svg']);
- }
-
- $href = $site['url'];
- if (!$site['redirect']) {
- $href = $this->urlGenerator->linkToRoute('external.site.showPage', ['id' => $site['id']]);
- }
+ $image = $this->generateImageLink($site);
+ $href = $this->getHref($site);
 
  return [
  'id' => 'external_index' . $site['id'],