From 3f2a307226655bdb1f3de1815f4633f1670dad68 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 12 Aug 2020 16:27:43 +0200
Subject: [PATCH] refactoring

---
 lib/Controller/NavController.php | 21 +++++++++------------
 lib/Service/AppRepository.php    |  8 ++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index 4f58086..e00ce6f 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -124,6 +124,11 @@ class NavController extends Controller
 
         $categoriesLabels['external_links'] = $this->trans->t('External sites');
 
+        $items['other'] = [
+            'name' => '',
+            'apps' => [],
+        ];
+
         foreach ($apps as $app) {
             if (in_array($app['id'], $topMenuApps)) {
                 continue;
@@ -132,8 +137,11 @@ class NavController extends Controller
             $categories = (array) $app['category'];
             $appsCategories[$app['id']] = [];
 
-            foreach ($categories as $category) {
+            if (empty($categories)) {
+                $categories = ['other'];
+            }
 
+            foreach ($categories as $category) {
                 if (!isset($items[$category])) {
                     $items[$category] = [
                         'name' => $categoriesLabels[$category],
@@ -185,17 +193,6 @@ class NavController extends Controller
             }
         }
 
-        $items['other'] = [
-            'name' => '',
-            'apps' => [
-                'files' => [
-                    'name' => 'Files',
-                    'href' => $this->router->linkTo('files', ''),
-                    'icon' => '/apps/files/img/app.svg',
-                ]
-            ],
-        ];
-
         foreach ($items as $category => $value) {
             ksort($items[$category]['apps']);
         }
diff --git a/lib/Service/AppRepository.php b/lib/Service/AppRepository.php
index bfe5085..93d3104 100644
--- a/lib/Service/AppRepository.php
+++ b/lib/Service/AppRepository.php
@@ -54,6 +54,14 @@ class AppRepository
                         'external_links',
                     ],
                 ];
+            } elseif ($app['id'] === 'files') {
+                $visibleApps[$app['id']] = [
+                    'id' => $app['id'],
+                    'name' => $app['name'],
+                    'preview' => $app['icon'],
+                    'previewAsIcon' => true,
+                    'category' => [],
+                ];
             }
         }