Upgraded navigation submenu management and api + created sharing submenu

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

2 files changed, 47 insertions, 41 deletions

diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index aae1bec2e78..fd63d545151 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -291,29 +291,28 @@ class ApiController extends Controller {
 	}
 
 	/**
-	 * Toggle default for showing/hiding QuickAccess folder
+	 * Toggle default for showing/hiding xxx folder
 	 *
 	 * @NoAdminRequired
 	 *
-	 * @param bool $show
+	 * @param bool $show 
+	 * @param bool $key the key of the folder
 	 *
 	 * @return Response
 	 */
-	public function showQuickAccess($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', (int)$show);
-		return new Response();
-	}
-
-	/**
-	 * Toggle default for showing/hiding QuickAccess folder
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return String
-	 */
-	public function getShowQuickAccess() {
-
-		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 0);
+	public function toggleShowFolder(int $show, string $key) {
+		// ensure the edited key exists
+		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
+		foreach ($navItems as $item) {
+			// check if data is valid
+			if (($show === 0 || $show === 1) && isset($item['expandedState']) && $key === $item['expandedState']) {
+				$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', $key, (int)$show);
+				return new Response();
+			}
+		}
+		$response = new Response();
+		$response->setStatus(Http::STATUS_FORBIDDEN);
+		return $response;
 	}
 
 	/**
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index f240e04c721..063d16c62d7 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -156,6 +156,7 @@ class ViewController extends Controller {
 
 		$user = $this->userSession->getUser()->getUID();
 
+		// Get all the user favorites to create a submenu
 		try {
 			$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
 		} catch (\RuntimeException $e) {
@@ -193,27 +194,20 @@ class ViewController extends Controller {
 		}
 
 
-		// show_Quick_Access stored as string
-		$defaultExpandedState = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', '0') === '1';
-
-		\OCA\Files\App::getNavigationManager()->add(
-			[
-				'id' => 'favorites',
-				'appname' => 'files',
-				'script' => 'simplelist.php',
-				'classes' => $collapseClasses,
-				'order' => 5,
-				'name' => $this->l10n->t('Favorites'),
-				'sublist' => $favoritesSublistArray,
-				'defaultExpandedState' => $defaultExpandedState,
-				'enableMenuButton' => 0,
-			]
-		);
-
 		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-		usort($navItems, function ($item1, $item2) {
-			return $item1['order'] - $item2['order'];
-		});
+
+		// transform the favorites entry in menu
+		$navItems['favorites']['sublist'] = $favoritesSublistArray;
+		$navItems['favorites']['classes'] = $collapseClasses;
+
+
+		// parse every menu and add the expandedState user value
+		foreach ($navItems as $key => $item) {
+			if (isset($item['expandedState'])) {
+				$defaultValue = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', $item['expandedState'], '0') === '1';
+				$navItems[$key]['defaultExpandedState'] = $defaultValue;
+			}
+		}
 
 		$nav->assign('navigationItems', $navItems);
 
@@ -235,10 +229,23 @@ class ViewController extends Controller {
 			if (isset($item['script'])) {
 				$content = $this->renderScript($item['appname'], $item['script']);
 			}
-			$contentItem = [];
-			$contentItem['id'] = $item['id'];
-			$contentItem['content'] = $content;
-			$contentItems[] = $contentItem;
+			// parse submenus
+			if (isset($item['sublist'])) {
+				foreach ($item['sublist'] as $subitem) {
+					$subcontent = '';
+					if (isset($subitem['script'])) {
+						$subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
+					}
+					$contentItems[$subitem['id']] = [
+						'id' => $subitem['id'],
+						'content' =>$subcontent
+					];
+				}
+			}
+			$contentItems[$item['id']] = [
+				'id' => $item['id'],
+				'content' =>$content
+			];
 		}
 
 		$event = new GenericEvent(null, ['hiddenFields' => []]);