Merge pull request #40065 from nextcloud/bugfix/files/navigation-api

Author: skjnldsv

apps/files/lib/Controller/ViewController.php

@@ -172,7 +172,7 @@ public function showFile(string $fileid = null): Response {
 	 * @NoCSRFRequired
 	 * @NoAdminRequired
 	 * @UseSession
-	 * 
+	 *
 	 * @param string $dir
 	 * @param string $view
 	 * @param string $fileid
@@ -219,7 +219,6 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 		// Load the files we need
 		\OCP\Util::addInitScript('files', 'init');
 		\OCP\Util::addStyle('files', 'merged');
-		\OCP\Util::addScript('files', 'merged-index', 'files');
 		\OCP\Util::addScript('files', 'main');
 
 		$userId = $this->userSession->getUser()->getUID();
@@ -393,7 +392,7 @@ private function redirectToFile(int $fileId) {
 			}
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.indexViewFileid', $params));
 		}
-	
+
 		throw new NotFoundException();
 	}
 }

apps/files/src/services/FileInfo.js

@@ -34,9 +34,9 @@ export default async function(url) {
 	})
 
 	// TODO: create new parser or use cdav-lib when available
-	const file = OCA.Files.App.fileList.filesClient._client.parseMultiStatus(response.data)
+	const file = OC.Files.getClient()._client.parseMultiStatus(response.data)
 	// TODO: create new parser or use cdav-lib when available
-	const fileInfo = OCA.Files.App.fileList.filesClient._parseFileInfo(file[0])
+	const fileInfo = OC.Files.getClient()._parseFileInfo(file[0])
 
 	// TODO remove when no more legacy backbone is used
 	fileInfo.get = (key) => fileInfo[key]