test(tables): update e2e tests for added column order and sorting on table entity

AI-assistant: GitHub Copilot v0.43.0 (Claude Sonnet 4.6)

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

cypress/e2e/tables-table.cy.js

@@ -71,7 +71,7 @@ describe('Manage a table', () => {
 		// Updating the title is flaky, so skipping it for now
 		// cy.get('[data-cy="editTableModal"] [data-cy="editTableTitleInput"]').should('be.visible').should('be.enabled')
 		// cy.get('[data-cy="editTableModal"] [data-cy="editTableTitleInput"]').clear().type('ToDo list')
-		cy.get('.modal__content #description-editor .tiptap.ProseMirror').type('Updated ToDo List description')
+		cy.get('#description-editor .tiptap.ProseMirror').type('Updated ToDo List description')
 		cy.get('[data-cy="editTableSaveBtn"]').should('be.enabled').click()
 
 		cy.wait(10).get('.toastify.toast-success').should('be.visible')

playwright/e2e/tables-import-export-scheme.spec.ts

@@ -25,6 +25,11 @@ interface SchemeColumnSetting {
 	mandatory?: boolean
 }
 
+interface SchemeColumnOrderEntry {
+	columnId: number
+	order?: number
+}
+
 interface SchemeSort {
 	columnId: number
 	mode: string
@@ -51,6 +56,8 @@ interface TableScheme extends Record<string, unknown> {
 	columns: SchemeColumn[]
 	views: SchemeView[]
 	tablesVersion?: string
+	columnOrder?: SchemeColumnOrderEntry[]
+	sort?: SchemeSort[]
 }
 
 async function getTutorialScheme(page: Page): Promise<TableScheme> {
@@ -110,6 +117,18 @@ function normalizeViews(views: SchemeView[], columns: SchemeColumn[]) {
 	}))
 }
 
+function normalizeTableLevelFields(scheme: TableScheme, columns: SchemeColumn[]) {
+	const columnTitleById = new Map(columns.map((column) => [column.id, column.title]))
+	scheme.columnOrder = (scheme.columnOrder ?? []).map((entry) => ({
+		title: columnTitleById.get(entry.columnId) ?? entry.columnId,
+		order: entry.order,
+	})) as unknown as SchemeColumnOrderEntry[]
+	scheme.sort = (scheme.sort ?? []).map((sort) => ({
+		title: columnTitleById.get(sort.columnId) ?? sort.columnId,
+		mode: sort.mode,
+	})) as unknown as SchemeSort[]
+}
+
 function formatOperatorLabel(operator: string) {
 	return operator
 		.replaceAll('-', ' ')
@@ -287,6 +306,8 @@ test.describe('Import Export Scheme', () => {
 		content.columns = omitSubFields(content.columns, columnFieldsToIgnore) as SchemeColumn[]
 		sourceScheme.views = normalizeViews(sourceScheme.views, sourceColumns) as SchemeView[]
 		content.views = normalizeViews(content.views, contentColumns) as SchemeView[]
+		normalizeTableLevelFields(sourceScheme, sourceColumns)
+		normalizeTableLevelFields(content, contentColumns)
 		content.tablesVersion = ''
 		sourceScheme.tablesVersion = ''
 

playwright/e2e/tables-table.spec.ts

@@ -5,7 +5,7 @@
 
 import { test, expect } from '../support/fixtures'
 import { createRandomUser } from '../support/api'
-import { createTable, deleteTable, loadTable } from '../support/commands'
+import { createTable, createTextLineColumn, deleteTable, loadTable } from '../support/commands'
 import { login } from '../support/login'
 
 test.describe('Manage a table', () => {
@@ -42,7 +42,7 @@ test.describe('Manage a table', () => {
 		await page.getByRole('menuitem', { name: 'Edit table' }).click()
 
 		await expect(page.locator('[data-cy="editTableModal"]')).toBeVisible()
-		await page.locator('.modal__content #description-editor .tiptap.ProseMirror').fill('Updated ToDo List description')
+		await page.locator('#description-editor .tiptap.ProseMirror').fill('Updated ToDo List description')
 		await expect(page.locator('[data-cy="editTableSaveBtn"]')).toBeEnabled()
 		await page.locator('[data-cy="editTableSaveBtn"]').click()
 
@@ -110,4 +110,81 @@ test.describe('Manage a table', () => {
 		await page.goto('/index.php/apps/tables')
 		await expect(page.locator('.app-navigation__list').filter({ hasText: 'test table' })).toBeVisible()
 	})
+
+	test('Set column order in Edit Table modal', async ({ userPage: { page } }) => {
+		await page.goto('/index.php/apps/tables')
+		await createTable(page, 'Column order test table')
+		await createTextLineColumn(page, 'colFirst', '', '', true)
+		await createTextLineColumn(page, 'colSecond', '', '', false)
+
+		const tableItem = page.locator('[data-cy="navigationTableItem"]').filter({ hasText: 'Column order test table' }).first()
+		await tableItem.getByRole('button', { name: /Actions|Open menu/i }).click({ force: true })
+		await page.getByRole('menuitem', { name: 'Edit table' }).click()
+
+		await expect(page.locator('[data-cy="editTableModal"]')).toBeVisible()
+
+		const columnOrderSection = page.locator('#settings-section_column-order')
+		await columnOrderSection.scrollIntoViewIfNeeded()
+
+		const columnEntries = columnOrderSection.locator('.column-entry')
+		await expect(columnEntries.filter({ hasText: 'colFirst' })).toBeVisible()
+		await expect(columnEntries.filter({ hasText: 'colSecond' })).toBeVisible()
+
+		// Move colFirst down so colSecond becomes first
+		const colFirstEntry = columnEntries.filter({ hasText: 'colFirst' })
+		await colFirstEntry.hover()
+		await colFirstEntry.getByRole('button', { name: 'Move down' }).click()
+
+		await expect(columnEntries.nth(0)).toContainText('colSecond')
+		await expect(columnEntries.nth(1)).toContainText('colFirst')
+
+		const updateReqPromise = page.waitForResponse(
+			(response) => response.url().includes('/apps/tables/api/2/tables/') && response.request().method() === 'PUT',
+		)
+		await page.locator('[data-cy="editTableSaveBtn"]').click()
+		const updateResponse = await updateReqPromise
+		expect(updateResponse.ok()).toBeTruthy()
+		const body = await updateResponse.json()
+		expect(body.ocs.data.columnOrder).toHaveLength(2)
+
+		await expect(page.locator('.toastify.toast-success').first()).toBeVisible()
+	})
+
+	test('Set default sort in Edit Table modal', async ({ userPage: { page } }) => {
+		await page.goto('/index.php/apps/tables')
+		await createTable(page, 'Default sort test table')
+		await createTextLineColumn(page, 'name', '', '', true)
+
+		const tableItem = page.locator('[data-cy="navigationTableItem"]').filter({ hasText: 'Default sort test table' }).first()
+		await tableItem.getByRole('button', { name: /Actions|Open menu/i }).click({ force: true })
+		await page.getByRole('menuitem', { name: 'Edit table' }).click()
+
+		await expect(page.locator('[data-cy="editTableModal"]')).toBeVisible()
+
+		const defaultSortSection = page.locator('#settings-section_default-sort')
+		await defaultSortSection.scrollIntoViewIfNeeded()
+
+		await defaultSortSection.getByRole('button', { name: 'Add new sorting rule' }).click()
+
+		const sortEntry = defaultSortSection.locator('.sort-entry').first()
+		await sortEntry.locator('.select-field').click()
+		await page.locator('ul.vs__dropdown-menu li span[title="name"]').click()
+
+		await expect(sortEntry.locator('.checkbox-radio-switch__input[value="ASC"]')).toBeChecked()
+
+		await sortEntry.locator('.checkbox-radio-switch__label').filter({ hasText: 'Descending' }).click()
+		await expect(sortEntry.locator('.checkbox-radio-switch__input[value="DESC"]')).toBeChecked()
+
+		const updateReqPromise = page.waitForResponse(
+			(response) => response.url().includes('/apps/tables/api/2/tables/') && response.request().method() === 'PUT',
+		)
+		await page.locator('[data-cy="editTableSaveBtn"]').click()
+		const updateResponse = await updateReqPromise
+		expect(updateResponse.ok()).toBeTruthy()
+		const body = await updateResponse.json()
+		expect(body.ocs.data.sort).toHaveLength(1)
+		expect(body.ocs.data.sort[0].mode).toBe('DESC')
+
+		await expect(page.locator('.toastify.toast-success').first()).toBeVisible()
+	})
 })