Port settings to Modal

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

2 files changed, 67 insertions, 52 deletions

diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index a87b4f9490a..e9d15018d03 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -39,6 +39,7 @@ namespace OCA\Files\Controller;
 
 use OC\Files\Node\Node;
 use OCA\Files\Service\TagService;
+use OCA\Files\Service\UserConfig;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -61,18 +62,13 @@ use OCP\Share\IShare;
  * @package OCA\Files\Controller
  */
 class ApiController extends Controller {
-	/** @var TagService */
-	private $tagService;
-	/** @var IManager * */
-	private $shareManager;
-	/** @var IPreview */
-	private $previewManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
-	/** @var Folder */
-	private $userFolder;
+	private TagService $tagService;
+	private IManager $shareManager;
+	private IPreview $previewManager;
+	private IUserSession $userSession;
+	private IConfig $config;
+	private Folder $userFolder;
+	private UserConfig $userConfig;
 
 	/**
 	 * @param string $appName
@@ -91,7 +87,8 @@ class ApiController extends Controller {
 								IPreview $previewManager,
 								IManager $shareManager,
 								IConfig $config,
-								Folder $userFolder) {
+								Folder $userFolder,
+								UserConfig $userConfig) {
 		parent::__construct($appName, $request);
 		$this->userSession = $userSession;
 		$this->tagService = $tagService;
@@ -99,6 +96,7 @@ class ApiController extends Controller {
 		$this->shareManager = $shareManager;
 		$this->config = $config;
 		$this->userFolder = $userFolder;
+		$this->userConfig = $userConfig;
 	}
 
 	/**
@@ -283,16 +281,47 @@ class ApiController extends Controller {
 	}
 
 	/**
+	 * Toggle default files user config
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @param bool $key
+	 * @param string|bool $value
+	 * @return JSONResponse
+	 */
+	public function setConfig(string $key, string|bool $value): JSONResponse {
+		try {
+			$this->userConfig->setConfig($key, $value);
+		} catch (\InvalidArgumentException $e) {
+			return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+		}
+
+		return new JSONResponse(['message' => 'ok', 'data' => ['key' => $key, 'value' => $value]]);
+	}
+
+
+	/**
+	 * Get the user config
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @return JSONResponse
+	 */
+	public function getConfigs(): JSONResponse {
+		return new JSONResponse(['message' => 'ok', 'data' => $this->userConfig->getConfigs()]);
+	}
+
+	/**
 	 * Toggle default for showing/hiding hidden files
 	 *
 	 * @NoAdminRequired
 	 *
-	 * @param bool $show
+	 * @param bool $value
 	 * @return Response
 	 * @throws \OCP\PreConditionNotMetException
 	 */
-	public function showHiddenFiles(bool $show): Response {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', $show ? '1' : '0');
+	public function showHiddenFiles(bool $value): Response {
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', $value ? '1' : '0');
 		return new Response();
 	}
 
@@ -301,12 +330,12 @@ class ApiController extends Controller {
 	 *
 	 * @NoAdminRequired
 	 *
-	 * @param bool $crop
+	 * @param bool $value
 	 * @return Response
 	 * @throws \OCP\PreConditionNotMetException
 	 */
-	public function cropImagePreviews(bool $crop): Response {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', $crop ? '1' : '0');
+	public function cropImagePreviews(bool $value): Response {
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', $value ? '1' : '0');
 		return new Response();
 	}
 
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 63863b3e367..4e81b630bab 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -36,8 +36,10 @@
 namespace OCA\Files\Controller;
 
 use OCA\Files\Activity\Helper;
+use OCA\Files\AppInfo\Application;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
+use OCA\Files\Service\UserConfig;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
@@ -65,32 +67,18 @@ use OCP\Share\IManager;
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	/** @var string */
-	protected $appName;
-	/** @var IRequest */
-	protected $request;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var IConfig */
-	protected $config;
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var Helper */
-	protected $activityHelper;
-	/** @var IInitialState */
-	private $initialState;
-	/** @var ITemplateManager */
-	private $templateManager;
-	/** @var IManager */
-	private $shareManager;
+	private IURLGenerator $urlGenerator;
+	private IL10N $l10n;
+	private IConfig $config;
+	private IEventDispatcher $eventDispatcher;
+	private IUserSession $userSession;
+	private IAppManager $appManager;
+	private IRootFolder $rootFolder;
+	private Helper $activityHelper;
+	private IInitialState $initialState;
+	private ITemplateManager $templateManager;
+	private IManager $shareManager;
+	private UserConfig $userConfig;
 
 	public function __construct(string $appName,
 		IRequest $request,
@@ -104,11 +92,10 @@ class ViewController extends Controller {
 		Helper $activityHelper,
 		IInitialState $initialState,
 		ITemplateManager $templateManager,
-		IManager $shareManager
+		IManager $shareManager,
+		UserConfig $userConfig
 	) {
 		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->request = $request;
 		$this->urlGenerator = $urlGenerator;
 		$this->l10n = $l10n;
 		$this->config = $config;
@@ -120,6 +107,7 @@ class ViewController extends Controller {
 		$this->initialState = $initialState;
 		$this->templateManager = $templateManager;
 		$this->shareManager = $shareManager;
+		$this->userConfig = $userConfig;
 	}
 
 	/**
@@ -236,7 +224,6 @@ class ViewController extends Controller {
 				'folderPosition' => $sortingValue,
 				'name' => basename($favElement),
 				'icon' => 'folder',
-				'quickaccesselement' => 'true'
 			];
 
 			array_push($favoritesSublistArray, $element);
@@ -266,11 +253,10 @@ class ViewController extends Controller {
 		$nav->assign('quota', $storageInfo['quota']);
 		$nav->assign('usage_relative', $storageInfo['relative']);
 
-		$nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . rawurlencode($userId)));
-
 		$contentItems = [];
 
 		$this->initialState->provideInitialState('navigation', $navItems);
+		$this->initialState->provideInitialState('config', $this->userConfig->getConfigs());
 
 		// render the container content for every navigation item
 		foreach ($navItems as $item) {
@@ -328,7 +314,7 @@ class ViewController extends Controller {
 		$params['hiddenFields'] = $event->getHiddenFields();
 
 		$response = new TemplateResponse(
-			$this->appName,
+			Application::APP_ID,
 			'index',
 			$params
 		);