fixup! fix(files): VirtualList rendering for scrolling calculations

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

Author: skjnldsv

cypress/e2e/files/FilesUtils.ts

@@ -293,6 +293,12 @@ export function enableGridMode() {
 export function calculateViewportHeight(rows: number): Cypress.Chainable<number> {
 	cy.visit('/apps/files')
 
+	cy.get('[data-cy-files-list]')
+		.should('be.visible')
+
+	cy.get('[data-cy-files-list-tbody] tr', { timeout: 5000 })
+		.and('be.visible')
+
 	return cy.get('[data-cy-files-list]')
 		.should('be.visible')
 		.then((filesList) => {

cypress/e2e/files/scrolling.cy.ts

@@ -3,40 +3,23 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { User } from '@nextcloud/cypress'
 import { calculateViewportHeight, enableGridMode, getRowForFile } from './FilesUtils.ts'
 import { beFullyInViewport, notBeFullyInViewport } from '../core-utils.ts'
 
-describe('files: Scrolling to selected file in file list', { testIsolation: true }, () => {
+describe('files: Scrolling to selected file in file list', () => {
 	const fileIds = new Map<number, string>()
-	let user: User
 	let viewportHeight: number
 
 	before(() => {
-		cy.createRandomUser().then(($user) => {
-			user = $user
-
-			cy.rm(user, '/welcome.txt')
-			for (let i = 1; i <= 10; i++) {
-				cy.uploadContent(user, new Blob([]), 'text/plain', `/${i}.txt`)
-					.then((response) => fileIds.set(i, Number.parseInt(response.headers['oc-fileid']).toString()))
-			}
-
-			cy.login(user)
-			cy.viewport(1200, 800)
-			// Calculate height to ensure that those 10 elements can not be rendered in one list (only 6 will fit the screen)
-			calculateViewportHeight(6)
-				.then((height) => {
-					// Set viewport height to the calculated height
-					cy.log(`Setting viewport height to ${height}px`)
-					viewportHeight = height
-				})
-		})
+		initFilesAndViewport(fileIds)
+			.then((_viewportHeight) => {
+				cy.log(`Saving viewport height to ${_viewportHeight}px`)
+				viewportHeight = _viewportHeight
+			})
 	})
 
 	beforeEach(() => {
 		cy.viewport(1200, viewportHeight)
-		cy.login(user)
 	})
 
 	it('Can see first file in list', () => {
@@ -127,45 +110,17 @@ describe('files: Scrolling to selected file in file list', { testIsolation: true
 	}
 })
 
-describe('files: Scrolling to selected file in file list (GRID MODE)', { testIsolation: true }, () => {
+describe('files: Scrolling to selected file in file list (GRID MODE)', () => {
 	const fileIds = new Map<number, string>()
-	let user: User
 	let viewportHeight: number
 
 	before(() => {
-		cy.wrap(Cypress.automation('remote:debugger:protocol', {
-			command: 'Network.clearBrowserCache',
-		  }))
-
-		cy.createRandomUser().then(($user) => {
-			user = $user
-
-			cy.rm(user, '/welcome.txt')
-			for (let i = 1; i <= 12; i++) {
-				cy.uploadContent(user, new Blob([]), 'text/plain', `/${i}.txt`)
-					.then((response) => fileIds.set(i, Number.parseInt(response.headers['oc-fileid']).toString()))
-			}
-
-			// Set grid mode
-			cy.login(user)
-			cy.visit('/apps/files')
-			enableGridMode()
-
-			// 768px width will limit the columns to 3
-			cy.viewport(768, 800)
-			// Calculate height to ensure that those 12 elements can not be rendered in one list (only 3 will fit the screen)
-			calculateViewportHeight(3)
-				.then((height) => {
-					// Set viewport height to the calculated height
-					cy.log(`Setting viewport height to ${height}px`)
-					viewportHeight = height
-				})
-		})
+		initFilesAndViewport(fileIds, true)
+			.then((_viewportHeight) => { viewportHeight = _viewportHeight })
 	})
 
 	beforeEach(() => {
-		cy.viewport(768, viewportHeight ?? 800)
-		cy.login(user)
+		cy.viewport(768, viewportHeight)
 	})
 
 	// First row
@@ -296,3 +251,29 @@ function beOverlappedByTableHeader($el: JQuery<HTMLElement>, expected = true) {
 function notBeOverlappedByTableHeader($el: JQuery<HTMLElement>) {
 	return beOverlappedByTableHeader($el, false)
 }
+
+function initFilesAndViewport(fileIds: Map<number, string>, gridMode = false): Cypress.Chainable<number> {
+	return cy.createRandomUser().then((user) => {
+		cy.rm(user, '/welcome.txt')
+		for (let i = 1; i <= 10; i++) {
+			cy.uploadContent(user, new Blob([]), 'text/plain', `/${i}.txt`)
+				.then((response) => fileIds.set(i, Number.parseInt(response.headers['oc-fileid']).toString()))
+		}
+
+		cy.login(user)
+		cy.viewport(1200, 800)
+
+		// If grid mode is requested, enable it
+		if (gridMode) {
+			enableGridMode()
+		}
+
+		// Calculate height to ensure that those 10 elements can not be rendered in one list (only 6 will fit the screen)
+		return calculateViewportHeight(6)
+			.then((height) => {
+				// Set viewport height to the calculated height
+				cy.log(`Setting viewport height to ${height}px`)
+				cy.wrap(height)
+			})
+	})
+}