Refactor/vue3

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
 	root: true,
 	extends: [
-		'@nextcloud',
+		'@nextcloud/eslint-config/vue3',
 	],
 	rules: {
 		'jsdoc/require-param-description': ['off'],
@@ -10,5 +10,6 @@ module.exports = {
 		'jsdoc/no-undefined-types': ['off'],
 		'jsdoc/require-property-description': ['off'],
 		'import/no-named-as-default-member': ['off'],
+		'@typescript-eslint/no-unused-vars': ['off'],
 	},
 }

cypress.config.js

@@ -2,6 +2,7 @@ const { defineConfig } = require('cypress')
 const cypressSplit = require('cypress-split')
 
 module.exports = defineConfig({
+	allowCypressEnv: false,
 	projectId: '1s7wkc',
 	viewportWidth: 1280,
 	viewportHeight: 720,

cypress/e2e/cardActions.js

@@ -9,14 +9,14 @@ const user = randUser()
 const boardData = sampleBoard()
 
 const auth = {
-	user: user.userId,
+	username: user.userId,
 	password: user.password,
 }
 
 const useModal = (useModal) => {
 	return cy.request({
 		method: 'POST',
-		url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
+		url: `${Cypress.expose('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
 		auth,
 		body: { value: useModal },
 	}).then((response) => {
@@ -92,6 +92,7 @@ describe('Card actions', function () {
 
 			cy.get('.app-sidebar-header .action-item__menutoggle').click()
 			cy.get('.v-popper__popper button:contains("Move/copy card")').click()
+			cy.get('.vs__dropdown-toggle span[title="MyTestBoard"]').should('be.visible').click()
 			cy.get('.vs__dropdown-menu span[title="MyTestBoard"]').should('be.visible').click()
 			cy.wait(3000) // wait for select component to load stacks
 			cy.get('[data-cy="select-stack"] .vs__dropdown-toggle').should('be.visible').click()

cypress/e2e/cardColor.js

@@ -9,14 +9,14 @@ const user = randUser()
 const boardData = sampleBoard()
 
 const auth = {
-	user: user.userId,
+	username: user.userId,
 	password: user.password,
 }
 
 const useModal = (useModal) => {
 	return cy.request({
 		method: 'POST',
-		url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
+		url: `${Cypress.expose('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
 		auth,
 		body: { value: useModal },
 	}).then((response) => {

cypress/e2e/cardFeatures.js

@@ -10,14 +10,14 @@ const user = randUser()
 const boardData = sampleBoard()
 
 const auth = {
-	user: user.userId,
+	username: user.userId,
 	password: user.password,
 }
 
 const useModal = (useModal) => {
 	return cy.request({
 		method: 'POST',
-		url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
+		url: `${Cypress.expose('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
 		auth,
 		body: { value: useModal },
 	}).then((response) => {
@@ -28,7 +28,7 @@ const useModal = (useModal) => {
 const addCardsAtTop = (enabled) => {
 	return cy.request({
 		method: 'POST',
-		url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/stackAddCardAtTop?format=json`,
+		url: `${Cypress.expose('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/stackAddCardAtTop?format=json`,
 		auth,
 		body: { value: enabled },
 	}).then((response) => {
@@ -100,7 +100,7 @@ describe('Card', function () {
 			})
 
 			cy.get('[data-cy="navigation:settings"]').click()
-			cy.get('[data-cy="setting:add-card-at-top"] input[role="switch"]').check({ force: true })
+			cy.get('[data-cy="setting:add-card-at-top"]').click({ force: true })
 			cy.wait('@setCardPosition')
 			cy.visit(`/apps/deck/#/board/${boardId}`)
 
@@ -126,7 +126,7 @@ describe('Card', function () {
 			})
 
 			cy.get('[data-cy="navigation:settings"]').click()
-			cy.get('[data-cy="setting:add-card-at-top"] input[role="switch"]').uncheck({ force: true })
+			cy.get('[data-cy="setting:add-card-at-top"]').click({ force: true })
 			cy.wait('@setCardPosition')
 			cy.visit(`/apps/deck/#/board/${boardId}`)
 			cy.get('.board .stack').eq(0).within(() => {
@@ -160,7 +160,7 @@ describe('Card', function () {
 		cy.get('.modal-mask.card-selector .multiselect-list').should('be.visible').click()
 		cy.get('.vs__dropdown-menu span[title="TestList"]').should('be.visible').click()
 
-		cy.get('.modal-mask.card-selector button.button-vue--vue-primary').should('be.visible').click()
+		cy.get('.modal-mask.card-selector button.button-vue--primary').should('be.visible').click()
 		cy.wait('@save', { timeout: 7000 })
 
 		cy.reload()
@@ -263,7 +263,7 @@ describe('Card', function () {
 			cy.get('.file-picker__main').should('be.visible')
 			cy.get('.file-picker__main [data-filename="welcome.txt"]', { timeout: 30000 }).should('be.visible')
 				.click()
-			cy.get('.dialog__actions button.button-vue--vue-primary').click()
+			cy.get('.dialog__actions button.button-vue--primary').click()
 			cy.get('.attachment-list .filename').contains('welcome')
 			cy.get('.attachment-list .filename .extension').contains('txt')
 		})
@@ -307,7 +307,7 @@ describe('Card', function () {
 			cy.get('.reference-picker-modal--content .reference-picker .card-title').should('be.visible').click().type(newCardTitle)
 			cy.get('.reference-picker-modal--content .reference-picker .multiselect-board').should('be.visible').contains(boardData.title)
 			cy.get('.reference-picker-modal--content .reference-picker .multiselect-list').should('be.visible').contains(boardData.stacks[0].title)
-			cy.get('.reference-picker-modal--content .reference-picker button.button-vue--vue-primary').should('be.visible').click()
+			cy.get('.reference-picker-modal--content .reference-picker button.button-vue--primary').should('be.visible').click()
 			cy.wait('@save', { timeout: 7000 })
 			cy.get('.modal__card .ProseMirror').contains('/index.php/apps/deck/card/').should('have.length', 1)
 

cypress/e2e/deckDashboard.js

@@ -27,7 +27,7 @@ describe('Deck dashboard', function() {
 
 		const defaultBoard = 'Welcome to Nextcloud Deck!'
 
-		cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+		cy.get('.app-navigation-entry-wrapper[data-cy-navigation-category="deck-navigation-all"]')
 			.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + defaultBoard + ')')
 			.first()
 			.contains(defaultBoard)

cypress/support/commands.js

@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { addCommands } from '@nextcloud/cypress'
-import axios from '@nextcloud/axios'
+import { addCommands } from '@nextcloud/e2e-test-server/cypress'
 
 addCommands()
 
 const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
-Cypress.env('baseUrl', url)
+Cypress.expose('baseUrl', url)
 
 // prepare main cypress window so we can use axios there
 // and it will successfully fetch csrf tokens when needed.
@@ -57,12 +56,12 @@ Cypress.Commands.add('deckCreateList', ({ user, password }, title) => {
 
 Cypress.Commands.add('createExampleBoard', ({ user, board }) => {
 	const auth = {
-		user: user.userId,
+		username: user.userId,
 		password: user.password,
 	}
 	cy.request({
 		method: 'POST',
-		url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards`,
+		url: `${Cypress.expose('baseUrl')}/index.php/apps/deck/api/v1.0/boards`,
 		auth,
 		body: { title: board.title, color: board.color ?? 'ff0000' },
 	}).then((boardResponse) => {
@@ -72,7 +71,7 @@ Cypress.Commands.add('createExampleBoard', ({ user, board }) => {
 			const stack = board.stacks[stackIndex]
 			cy.request({
 				method: 'POST',
-				url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks`,
+				url: `${Cypress.expose('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks`,
 				auth,
 				body: { title: stack.title, order: 0 },
 			}).then((stackResponse) => {
@@ -81,7 +80,7 @@ Cypress.Commands.add('createExampleBoard', ({ user, board }) => {
 					const card = stack.cards[cardIndex]
 					cy.request({
 						method: 'POST',
-						url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks/${stackData.id}/cards`,
+						url: `${Cypress.expose('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks/${stackData.id}/cards`,
 						auth,
 						body: { title: card.title, description: card.description ?? '' },
 					})
@@ -93,7 +92,7 @@ Cypress.Commands.add('createExampleBoard', ({ user, board }) => {
 })
 
 Cypress.Commands.add('getNavigationEntry', (boardTitle) => {
-	return cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+	return cy.get('[data-cy-navigation-category="deck-navigation-all"]').parent()
 		.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + boardTitle + ')')
 		.find('a.app-navigation-entry-link')
 })
@@ -116,9 +115,16 @@ Cypress.Commands.add('shareBoardWithUi', (query, userId=query) => {
 })
 
 Cypress.Commands.add('setUserEmail', (user, value) => {
-	Cypress.log()
-	return axios.put(
-		`${url}/ocs/v2.php/cloud/users/${user.userId}`,
-		{ key: 'email', value },
-	)
+	return cy.request({
+		method: 'PUT',
+		url: `${url}/ocs/v2.php/cloud/users/${user.userId}`,
+		auth: {
+			username: user.userId,
+			password: user.password,
+		},
+		headers: {
+			'OCS-APIRequest': 'true',
+		},
+		body: { key: 'email', value },
+	})
 })

cypress/utils/index.js

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { User } from '@nextcloud/cypress'
+import { User } from '@nextcloud/e2e-test-server/cypress'
 
 export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)
 export const randUser = () => new User(randHash(), randHash())

lib/Controller/CardOcsController.php

@@ -120,7 +120,7 @@ public function removeLabel(?int $boardId, int $cardId, int $labelId): DataRespo
 
 	#[NoAdminRequired]
 	#[PublicPage]
-	public function update(int $id, string $title, int $stackId, string $type, int $order, string $description, $duedate, $deletedAt, int $boardId, array|string|null $owner = null, $archived = null, $startdate = null): DataResponse {
+	public function update(int $id, string $title, int $stackId, string $type, int $order, string $description, $duedate, $deletedAt, ?int $boardId, array|string|null $owner = null, $archived = null, $startdate = null): DataResponse {
 		$done = array_key_exists('done', $this->request->getParams())
 			? new OptionalNullableValue($this->request->getParam('done', null))
 			: null;
@@ -135,22 +135,24 @@ public function update(int $id, string $title, int $stackId, string $type, int $
 			}
 		}
 
-		$localBoard = $this->boardService->find($boardId, false);
-		if ($localBoard->getExternalId()) {
-			return new DataResponse($this->externalBoardService->updateCardOnRemote(
-				$localBoard,
-				$id,
-				$title,
-				$stackId,
-				$type,
-				$owner,
-				$description,
-				$order,
-				$duedate,
-				$deletedAt,
-				$archived,
-				$done
-			));
+		if ($boardId) {
+			$localBoard = $this->boardService->find($boardId, false);
+			if ($localBoard->getExternalId()) {
+				return new DataResponse($this->externalBoardService->updateCardOnRemote(
+					$localBoard,
+					$id,
+					$title,
+					$stackId,
+					$type,
+					$owner,
+					$description,
+					$order,
+					$duedate,
+					$deletedAt,
+					$archived,
+					$done
+				));
+			}
 		}
 
 		return new DataResponse($this->cardService->update($id,