Refactor/vue3

cypress/e2e/cardActions.js

@@ -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/cardFeatures.js

@@ -84,7 +84,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()
@@ -187,7 +187,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')
 		})
@@ -231,7 +231,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/support/commands.js

@@ -4,7 +4,6 @@
  */
 
 import { addCommands } from '@nextcloud/cypress'
-import axios from '@nextcloud/axios'
 
 addCommands()
 
@@ -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: {
+			user: user.userId,
+			password: user.password,
+		},
+		headers: {
+			'OCS-APIRequest': 'true',
+		},
+		body: { key: 'email', value },
+	})
 })

lib/Controller/CardOcsController.php

@@ -113,7 +113,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;
@@ -128,22 +128,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,