Rename openFileInfo to fileInfo

And check if openFile is set in the URL before opening a file.

Signed-off-by: Louis Chemineau <louis@chmn.me>

Author: artonge

apps/files/lib/Controller/ViewController.php

@@ -292,7 +292,7 @@ private function provideInitialState(string $dir, ?string $fileid): void {
 		}
 
 		$this->initialState->provideInitialState(
-			'openFileInfo', [
+			'fileInfo', [
 				'id' => $node->getId(),
 				'name' => $isRoot ? '' : $node->getName(),
 				'path' => $path,

apps/files/src/components/FilesListVirtual.vue

@@ -207,7 +207,7 @@ export default defineComponent({
 		mainContent.addEventListener('dragover', this.onDragOver)
 
 		// handle initially opening a given file
-		const { id } = loadState<{ id?: number }>('files', 'openFileInfo', {})
+		const { id } = loadState<{ id?: number }>('files', 'fileInfo', {})
 		this.scrollToFile(id ?? this.fileId)
 		this.openSidebarForFile(id ?? this.fileId)
 		this.handleOpenFile(id ?? null)
@@ -248,6 +248,10 @@ export default defineComponent({
 		 * @param fileId File to open
 		 */
 		handleOpenFile(fileId: number|null) {
+			if (!this.openFile) {
+				return
+			}
+
 			if (fileId === null || this.openFileId === fileId) {
 				return
 			}