chore(files): Fix ESLint issues with files and files_sharing app

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Jul 9, 2024 · d0951b4 · d0951b4
1 parent 24c0169
commit d0951b4
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 17 deletions.
diff --git a/apps/files/src/actions/favoriteAction.spec.ts b/apps/files/src/actions/favoriteAction.spec.ts
@@ -20,8 +20,8 @@ const favoriteView = {
 	name: 'Favorites',
 } as View
 
-global.window.OC = {
-	// @ts-expect-error This constant is currently missing in @nextcloud/typings
+window.OC = {
+	...window.OC,
 	TAG_FAVORITE: '_$!<Favorite>!$_',
 }
 

diff --git a/apps/files/src/actions/openFolderAction.spec.ts b/apps/files/src/actions/openFolderAction.spec.ts
@@ -115,7 +115,7 @@ describe('Open folder action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/FooBar' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/FooBar' })
 	})
 
 	test('Open folder fails without node', async () => {

diff --git a/apps/files/src/actions/openFolderAction.ts b/apps/files/src/actions/openFolderAction.ts
@@ -38,7 +38,7 @@ export const action = new FileAction({
 
 		window.OCP.Files.Router.goToRoute(
 			null,
-			{ view: view.id, fileid: node.fileid },
+			{ view: view.id, fileid: String(node.fileid) },
 			{ dir: node.path },
 		)
 		return null

diff --git a/apps/files/src/actions/openInFilesAction.spec.ts b/apps/files/src/actions/openInFilesAction.spec.ts
@@ -60,7 +60,7 @@ describe('Open in files action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/Foo', openfile: 'true' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/Foo', openfile: 'true' })
 	})
 
 	test('Open in files with folder', async () => {
@@ -81,6 +81,6 @@ describe('Open in files action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/Foo/Bar', openfile: 'true' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/Foo/Bar', openfile: 'true' })
 	})
 })
diff --git a/apps/files/src/actions/openInFilesAction.ts b/apps/files/src/actions/openInFilesAction.ts
@@ -24,7 +24,7 @@ export const action = new FileAction({
 
 		window.OCP.Files.Router.goToRoute(
 			null, // use default route
-			{ view: 'files', fileid: node.fileid },
+			{ view: 'files', fileid: String(node.fileid) },
 			{ dir, openfile: 'true' },
 		)
 		return null

diff --git a/apps/files/src/actions/sidebarAction.spec.ts b/apps/files/src/actions/sidebarAction.spec.ts
@@ -126,7 +126,7 @@ describe('Open sidebar action exec tests', () => {
 		expect(openMock).toBeCalledWith('/foobar.txt')
 		expect(goToRouteMock).toBeCalledWith(
 			null,
-			{ view: view.id, fileid: 1 },
+			{ view: view.id, fileid: '1' },
 			{ dir: '/' },
 			true,
 		)

diff --git a/apps/files/src/actions/sidebarAction.ts b/apps/files/src/actions/sidebarAction.ts
@@ -42,7 +42,7 @@ export const action = new FileAction({
 			// Silently update current fileid
 			window.OCP.Files.Router.goToRoute(
 				null,
-				{ view: view.id, fileid: node.fileid },
+				{ view: view.id, fileid: String(node.fileid) },
 				{ ...window.OCP.Files.Router.query, dir },
 				true,
 			)

diff --git a/apps/files/src/actions/viewInFolderAction.spec.ts b/apps/files/src/actions/viewInFolderAction.spec.ts
@@ -129,7 +129,7 @@ describe('View in folder action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/' })
 	})
 
 	test('View in (sub) folder', async () => {
@@ -150,7 +150,7 @@ describe('View in folder action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/Foo/Bar' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/Foo/Bar' })
 	})
 
 	test('View in folder fails without node', async () => {

diff --git a/apps/files/src/actions/viewInFolderAction.ts b/apps/files/src/actions/viewInFolderAction.ts
@@ -44,7 +44,7 @@ export const action = new FileAction({
 
 		window.OCP.Files.Router.goToRoute(
 			null,
-			{ view: 'files', fileid: node.fileid },
+			{ view: 'files', fileid: String(node.fileid) },
 			{ dir: node.dirname },
 		)
 		return null

diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue
@@ -134,7 +134,7 @@ export default defineComponent({
 		},
 
 		fileId() {
-			return parseInt(this.$route.params.fileid) || null
+			return Number.parseInt(this.$route.params.fileid ?? '0') || null
 		},
 
 		/**

diff --git a/apps/files/src/views/favorites.spec.ts b/apps/files/src/views/favorites.spec.ts
@@ -18,7 +18,8 @@ jest.mock('webdav/dist/node/request.js', () => ({
 	request: jest.fn(),
 }))
 
-global.window.OC = {
+window.OC = {
+	...window.OC,
 	TAG_FAVORITE: '_$!<Favorite>!$_',
 }
 

diff --git a/apps/files_sharing/src/actions/openInFilesAction.spec.ts b/apps/files_sharing/src/actions/openInFilesAction.spec.ts
@@ -73,6 +73,6 @@ describe('Open in files action execute tests', () => {
 		// Silent action
 		expect(exec).toBe(null)
 		expect(goToRouteMock).toBeCalledTimes(1)
-		expect(goToRouteMock).toBeCalledWith(null, { fileid: 1, view: 'files' }, { dir: '/Foo', openfile: 'true' })
+		expect(goToRouteMock).toBeCalledWith(null, { fileid: '1', view: 'files' }, { dir: '/Foo', openfile: 'true' })
 	})
 })
diff --git a/apps/files_sharing/src/actions/openInFilesAction.ts b/apps/files_sharing/src/actions/openInFilesAction.ts
@@ -26,7 +26,7 @@ export const action = new FileAction({
 	async exec(node: Node) {
 		window.OCP.Files.Router.goToRoute(
 			null, // use default route
-			{ view: 'files', fileid: node.fileid },
+			{ view: 'files', fileid: String(node.fileid) },
 			{ dir: node.dirname, openfile: 'true' },
 		)
 		return null

diff --git a/apps/files_sharing/src/services/SharingService.spec.ts b/apps/files_sharing/src/services/SharingService.spec.ts
@@ -12,7 +12,8 @@ import { getContents } from './SharingService'
 import { File, Folder } from '@nextcloud/files'
 import logger from './logger'
 
-global.window.OC = {
+window.OC = {
+	...window.OC,
 	TAG_FAVORITE: '_$!<Favorite>!$_',
 }