change typo

appinfo/info.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<info>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>side_menu</id>
     <name>Custom menu</name>
     <summary>Modify the display of the menu.</summary>
@@ -19,13 +20,17 @@ If you like this application and want to support the development:
 * ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
 * 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
+    <version>1.17.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.16.0</version>
     <namespace>SideMenu</namespace>
+    <documentation>
+        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
+    </documentation>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://deblan.cloud/index.php/call/fffxkc7h</discussion>
+    <discussion>https://matrix.to/#/!GhfQePnOSPYpYEunWM:neutralnetwork.org</discussion>
     <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
@@ -34,10 +39,6 @@ If you like this application and want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc18_menu_always_displayed.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
-    <documentation>
-        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
-        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
-    </documentation>
     <dependencies>
         <nextcloud min-version="18" max-version="20"/>
     </dependencies>

appinfo/routes.php

@@ -19,10 +19,12 @@
 
 return [
     'routes' => [
-		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
-		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
-		['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
-		['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
-		['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
+        ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+        ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+        ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
+        ['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
+        ['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
+        ['name' => 'AdminSetting#removeCache', 'url' => '/admin/cache/remove', 'verb' => 'GET'],
+        ['name' => 'AdminSetting#exportConfiguration', 'url' => '/admin/config/export', 'verb' => 'GET'],
     ],
 ];

css/sideMenu.css

@@ -175,6 +175,16 @@
     color: var(--side-menu-text-color, #fff);
 }
 
+.side-menu-loader {
+    text-align: center;
+}
+
+.side-menu-loader svg {
+    width: 38px;
+    margin: auto;
+    stroke: var(--side-menu-text-color, #fff);
+}
+
 .side-menu-big .side-menu-app-icon {
     vertical-align: middle;
     margin-top: -2px;

img/loader.svg

@@ -0,0 +1,17 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(1 1)" stroke-width="2">
+            <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+                <animateTransform
+                    attributeName="transform"
+                    type="rotate"
+                    from="0 18 18"
+                    to="360 18 18"
+                    dur="1s"
+                    repeatCount="indefinite"/>
+            </path>
+        </g>
+    </g>
+</svg>

lib/AppInfo/Application.php

@@ -72,7 +72,7 @@ class Application extends App
         $container = $this->getContainer();
 
         $container->registerService('AppRepository', function (ContainerInterface $c) {
-            return new AppRepository(new OC_App());
+            return new AppRepository();
         });
 
         $container->registerService('ConfigProxy', function (ContainerInterface $c) {

lib/Controller/AdminSettingController.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+
+class AdminSettingController extends Controller
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    public function __construct($appName, IRequest $request, IConfig $config, IURLGenerator $urlGenerator)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function removeCache()
+    {
+        $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
+
+        return new RedirectResponse($this->urlGenerator->linkToRoute('settings.AdminSettings.index', [
+            'section' => Application::APP_ID,
+        ]).'#more');
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    public function exportConfiguration()
+    {
+        $keys = $this->config->getAppKeys(Application::APP_ID);
+        $config = [];
+        $excludedKeys = [
+            'cache',
+            'cache-categories',
+        ];
+
+        foreach ($keys as $key) {
+            if (in_array($key, $excludedKeys)) {
+                continue;
+            }
+
+            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+        }
+
+        return new DataDownloadResponse(
+            json_encode($config, JSON_PRETTY_PRINT),
+            'config.json',
+            'text/json'
+        );
+    }
+}

lib/Controller/NavController.php

@@ -21,10 +21,12 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
+use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -37,6 +39,11 @@ class NavController extends Controller
      */
     protected $config;
 
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
     /**
      * @var AppRepository
      */
@@ -60,6 +67,7 @@ class NavController extends Controller
     public function __construct(
         string $appName,
         IRequest $request,
+        IConfig $iConfig,
         ConfigProxy $config,
         AppRepository $appRepository,
         CategoryFetcher $categoryFetcher,
@@ -70,6 +78,7 @@ class NavController extends Controller
         parent::__construct($appName, $request);
 
         $this->config = $config;
+        $this->iConfig = $iConfig;
         $this->appRepository = $appRepository;
         $this->categoryFetcher = $categoryFetcher;
         $this->l10nFactory = $l10nFactory;
@@ -87,9 +96,9 @@ class NavController extends Controller
     {
         $apps = $this->appRepository->getVisibleApps();
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-        $categoriesLabels = $this->categoryFetcher->get();
         $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
         $user = OC::$server[IUserSession::class]->getUser();
+        $isForced = $this->config->getAppValueBool('force', '0');
         $appsCategories = [];
         $categoriesAppsCount = [];
         $items = [];
@@ -100,10 +109,18 @@ class NavController extends Controller
             ]);
         }
 
+        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+
+        if (empty($categoriesLabels)) {
+            $categoriesLabels = $this->categoryFetcher->get();
+
+            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
+        }
+
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
 
-        if (!empty($userTopMenuApps)) {
+        if (!$isForced && !empty($userTopMenuApps)) {
             $topMenuApps = $userTopMenuApps;
         }
 
@@ -135,7 +152,7 @@ class NavController extends Controller
             foreach ($categories as $category) {
                 if (!isset($items[$category])) {
                     $items[$category] = [
-                        'name' => $categoriesLabels[$category],
+                        'name' => $categoriesLabels[$category] ?? $category,
                         'apps' => [],
                     ];
                 }

lib/Controller/PersonalSettingController.php

@@ -29,14 +29,19 @@ use OCA\SideMenu\Service\ConfigProxy;
 class PersonalSettingController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var IConfig
      */
     protected $config;
 
+    /**
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
     /**
      * @var IUserSession
      */
-    private $userSession;
+    protected $userSession;
 
     public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
     {

lib/Service/AppRepository.php

@@ -2,7 +2,6 @@
 
 namespace OCA\SideMenu\Service;
 
-use OC_App;
 use OCP\L10N\IFactory;
 
 /**
@@ -13,7 +12,7 @@ use OCP\L10N\IFactory;
 class AppRepository
 {
     /**
-     * @var OC_App
+     * @var \OC_App
      */
     protected $ocApp;
 
@@ -22,7 +21,7 @@ class AppRepository
      */
     protected $l10nFactory;
 
-    public function __construct(OC_App $ocApp, IFactory $l10nFactory)
+    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
     {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;

src/SideMenuBig.vue

@@ -23,6 +23,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
         <div class="side-menu-categories-wrapper">
             <div class="side-menu-categories">
+                <div v-if="!items.length" class="side-menu-loader">
+                    <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" fill-rule="evenodd">
+                            <g transform="translate(1 1)" stroke-width="2">
+                                <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+                                <path d="M36 18c0-9.94-8.06-18-18-18">
+                                    <animateTransform
+                                        attributeName="transform"
+                                        type="rotate"
+                                        from="0 18 18"
+                                        to="360 18 18"
+                                        dur="1s"
+                                        repeatCount="indefinite"/>
+                                </path>
+                            </g>
+                        </g>
+                    </svg>
+                </div>
+
                 <div class="side-menu-category" v-for="category in items">
                     <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
 

src/l10n/fixtures/de.yaml

@@ -59,3 +59,5 @@
 "Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
 "You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
 "Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"
+"Export the configuration": "Exportieren Sie die Konfiguration"
+"Purge the cache": "Leeren Sie den Cache"

src/l10n/fixtures/fr.yaml

@@ -59,3 +59,5 @@
 "Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
 "You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
 "Force this configuration to users": "Forcer cette configuration aux utilisateurs"
+"Export the configuration": "Exporter la configuration"
+"Purge the cache": "Purger le cache"

templates/js/_alwaysDisplayed.js

@@ -41,4 +41,28 @@ var alwaysDisplayed = function() {
     }
 }
 
-window.setTimeout(alwaysDisplayed, 200)
+let content = document.getElementById('content')
+
+if (content && content.classList.contains('app-settings')) {
+    let loaded = false
+    const config = {attributes: false, childList: true, subtree: true}
+    const observer = new MutationObserver(() => {
+        if (loaded) {
+            return;
+        }
+
+        const element = content.querySelector('#app-category-your-apps')
+            || content.querySelector('#app-navigation ul')
+
+        if (element) {
+            loaded = true
+
+            alwaysDisplayed()
+        }
+    })
+
+    observer.observe(content, config)
+} else {
+    window.setTimeout(alwaysDisplayed, 200)
+}
+

templates/js/_topMenuApps.js

@@ -108,6 +108,28 @@ var updateTopMenu = function() {
         k++
     })
 
+    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
+    menu.undelegate('li:not(#more-apps) > a', 'click')
+    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
+        var a = $(e.target)
+
+        if (!a.is('a')) {
+            a = a.closest('a')
+        }
+
+        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
+            a.find('svg').remove()
+            a.find('div').remove()
+            a.prepend(jQuery('<div/>').addClass(
+                OCA.Theming && OCA.Theming.inverted
+                ? 'icon-loading-small'
+                : 'icon-loading-small-dark'
+            ))
+
+            window.location.href = a.attr('href')
+        }
+    })
+
     jQuery('#apps li.app-external-site').each(function(i, app) {
         app = jQuery(app)
         var appId = app.attr('data-id')

templates/settings/admin-form.php

@@ -16,9 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use OCP\IURLGenerator;
+use OCP\IConfig;
+use OCA\SideMenu\AppInfo\Application;
+
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
+
+$urlGenerator = \OC::$server[IURLGenerator::class];
+$cacheSize = floor(mb_strlen(\OC::$server[IConfig::class]->getAppValue(Application::APP_ID, 'cache-categories', ''), '8bit') / 1024);
 
 $choicesYesNo = [
     'No' => '0',
@@ -31,6 +37,7 @@ $choicesSizes = [
     'Normal' => 'normal',
     'Big' => 'big',
 ];
+
 ?>
 
 <div id="side-menu-section">
@@ -489,9 +496,25 @@ $choicesSizes = [
 
         <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
 
-        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+        <button id="side-menu-save" class="btn btn-info">
+            <?php p($l->t('Save')); ?>
+        </button>
 
         <span id="side-menu-message" class="msg"></span>
+    </div>
+
+    <div class="section" id="more">
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
+            <button class="btn btn-primary" >
+                <?php p($l->t('Export the configuration')); ?>
+            </button>
+        </a>
+
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.removeCache') ?>">
+            <button class="btn btn-primary" >
+                <?php p($l->t('Purge the cache')); ?> (<?php echo $cacheSize ?> Kb)
+            </button>
+        </a>
 
         <div style="height: 30px"></div>
 

templates/settings/personal-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',