Merge branch 'main' into 7511-missing-icons-on-shared-boards-dropdown

Author: theoholl

.github/workflows/appstore-build-publish.yml

@@ -181,7 +181,7 @@ jobs:
           tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
 
       - name: Attach tarball to github release
-        uses: svenstaro/upload-release-action@b98a3b12e86552593f3e4e577ca8a62aa2f3f22b # v2.11.4
+        uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2.11.5
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress-e2e.yml

@@ -110,7 +110,7 @@ jobs:
           curl -v http://localhost:8081/index.php/login
 
       - name: Cypress run
-        uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
+        uses: cypress-io/github-action@4c06c48f3ffea349b7189aa06dfcda47a9fa7b92 # v7.1.8
         with:
           build: npm run dev
           record: false

appinfo/routes.php

@@ -135,7 +135,7 @@
 	'ocs' => [
 		['name' => 'board_ocs#index', 'url' => '/api/v{apiVersion}/boards', 'verb' => 'GET'],
 		['name' => 'board_ocs#read', 'url' => '/api/v{apiVersion}/board/{boardId}', 'verb' => 'GET'],
-		['name' => 'board_ocs#stacks', 'url' => '/api/v{apiVersion}/stacks/{boardId}', 'verb' => 'GET'],
+		['name' => 'stack_ocs#index', 'url' => '/api/v{apiVersion}/stacks/{boardId}', 'verb' => 'GET'],
 		['name' => 'board_ocs#create', 'url' => '/api/v{apiVersion}/boards', 'verb' => 'POST'],
 		['name' => 'board_ocs#addAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl', 'verb' => 'POST'],
 
@@ -146,6 +146,7 @@
 		['name' => 'card_ocs#reorder', 'url' => '/api/v{apiVersion}/cards/{cardId}/reorder', 'verb' => 'PUT'],
 
 		['name' => 'stack_ocs#create', 'url' => '/api/v{apiVersion}/stacks', 'verb' => 'POST'],
+		['name' => 'stack_ocs#setDoneStack', 'url' => '/api/v{apiVersion}/stacks/{stackId}/done', 'verb' => 'PUT'],
 		['name' => 'stack_ocs#delete', 'url' => '/api/v{apiVersion}/stacks/{stackId}/{boardId}', 'verb' => 'DELETE', 'defaults' => ['boardId' => null]],
 		['name' => 'stack_ocs#reorder', 'url' => '/api/v{apiVersion}/stacks/{stackId}/reorder', 'verb' => 'PUT'],
 

cypress/e2e/boardFeatures.js

@@ -180,6 +180,82 @@ describe('Board export', function() {
 	})
 })
 
+describe('Board title editing', function() {
+	before(function() {
+		cy.createUser(user)
+	})
+
+	it('Shows updated board title immediately on the opened board', function() {
+		const originalTitle = `Live rename ${Date.now()}`
+		const updatedTitle = `${originalTitle} updated`
+
+		cy.createExampleBoard({ user, board: sampleBoard(originalTitle) }).then((board) => {
+			cy.login(user)
+			cy.visit(`/apps/deck/board/${board.id}`)
+
+			cy.intercept({ method: 'PUT', url: `**/apps/deck/boards/${board.id}` }).as('updateBoard')
+
+			cy.get(`.app-navigation__list .app-navigation-entry:contains("${originalTitle}")`)
+				.parent()
+				.find('button[aria-label="Actions"]')
+				.click()
+
+			cy.get('button:contains("Edit board")').click()
+
+			cy.get('.board-edit form input[type=text]')
+				.clear()
+				.type(updatedTitle)
+
+			cy.get('.board-edit form button[title="Save board"]').click()
+
+			cy.get('.board-title h2').contains(updatedTitle)
+
+			cy.wait('@updateBoard').its('response.statusCode').should('equal', 200)
+
+			cy.get('.app-navigation__list .app-navigation-entry')
+				.contains(updatedTitle)
+				.should('be.visible')
+		})
+	})
+
+	it('Does not change the opened board title when editing another board', function() {
+		const boardATitle = `Active board ${Date.now()}`
+		const boardBTitle = `Background board ${Date.now()}`
+		const boardBUpdatedTitle = `${boardBTitle} updated`
+
+		cy.createExampleBoard({ user, board: sampleBoard(boardATitle) }).then((boardA) => {
+			cy.createExampleBoard({ user, board: sampleBoard(boardBTitle) }).then((boardB) => {
+				cy.login(user)
+				cy.visit(`/apps/deck/board/${boardA.id}`)
+
+				cy.intercept({ method: 'PUT', url: `**/apps/deck/boards/${boardB.id}` }).as('updateBoardOther')
+
+				cy.get('.board-title h2').should('contain', boardATitle)
+
+				cy.get(`.app-navigation__list .app-navigation-entry:contains("${boardBTitle}")`)
+					.parent()
+					.find('button[aria-label="Actions"]')
+					.click({ force: true }) // element is only visible on hover, and cypress can't hover
+
+				cy.get('button:contains("Edit board")').click()
+
+				cy.get('.board-edit form input[type=text]')
+					.clear()
+					.type(boardBUpdatedTitle)
+
+				cy.get('.board-edit form button[title="Save board"]').click()
+
+				cy.wait('@updateBoardOther').its('response.statusCode').should('equal', 200)
+
+				cy.get('.board-title h2').should('contain', boardATitle)
+				cy.get('.app-navigation__list .app-navigation-entry')
+					.contains(boardBUpdatedTitle)
+					.should('be.visible')
+			})
+		})
+	})
+})
+
 describe('Board import', function() {
 	before(function () {
 		cy.createUser(user)

l10n/cs.js

@@ -97,6 +97,7 @@ OC.L10N.register(
     "{user} has mentioned you in a comment on {deck-card}." : "{user} vás zmínil(a) v komentáři na kartě {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "Uživatel %s vám nasdílel(a) tabuli „%s“.",
     "{user} has shared {deck-board} with you." : "{user} vám nasdílel(a) tabuli {deck-board}.",
+    "The remote board %1$s has been shared with you by %2$s" : "Vzdálená tabule %1$s vám byla nasdílena uživatelem %2$s",
     "Deck board" : "Tabule aplikace Deck",
     "Owned by %1$s" : "Vlastní %1$s",
     "Deck boards, cards and comments" : "Tabule, karty a komentáře aplikace Deck",
@@ -236,6 +237,8 @@ OC.L10N.register(
     "Edit list title" : "Upravit nadpis seznamu",
     "Archive all cards" : "Archivovat všechny karty",
     "Unarchive all cards" : "Zrušit archivaci všech karet",
+    "Do not set cards as \"done\"" : "Nenastavovat karty jako „dokončeno“",
+    "Set cards as \"done\"" : "Nastavit karty jako „hotovo“",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
     "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
@@ -345,6 +348,8 @@ OC.L10N.register(
     "Export board" : "Exportovat tabuli",
     "Turn on due date reminders" : "Zapnout upomínky termínů",
     "Turn off due date reminders" : "Vypnout upomínky termínů",
+    "Remove as default board" : "Odebrat jako výchozí tabuli",
+    "Set as default board" : "Nastavit jako výchozí tabuli",
     "Due date reminders" : "Upomínky termínů",
     "Assigned cards" : "Přiřazené karty",
     "No notifications" : "Žádná upozornění",

l10n/cs.json

@@ -95,6 +95,7 @@
     "{user} has mentioned you in a comment on {deck-card}." : "{user} vás zmínil(a) v komentáři na kartě {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "Uživatel %s vám nasdílel(a) tabuli „%s“.",
     "{user} has shared {deck-board} with you." : "{user} vám nasdílel(a) tabuli {deck-board}.",
+    "The remote board %1$s has been shared with you by %2$s" : "Vzdálená tabule %1$s vám byla nasdílena uživatelem %2$s",
     "Deck board" : "Tabule aplikace Deck",
     "Owned by %1$s" : "Vlastní %1$s",
     "Deck boards, cards and comments" : "Tabule, karty a komentáře aplikace Deck",
@@ -234,6 +235,8 @@
     "Edit list title" : "Upravit nadpis seznamu",
     "Archive all cards" : "Archivovat všechny karty",
     "Unarchive all cards" : "Zrušit archivaci všech karet",
+    "Do not set cards as \"done\"" : "Nenastavovat karty jako „dokončeno“",
+    "Set cards as \"done\"" : "Nastavit karty jako „hotovo“",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
     "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
@@ -343,6 +346,8 @@
     "Export board" : "Exportovat tabuli",
     "Turn on due date reminders" : "Zapnout upomínky termínů",
     "Turn off due date reminders" : "Vypnout upomínky termínů",
+    "Remove as default board" : "Odebrat jako výchozí tabuli",
+    "Set as default board" : "Nastavit jako výchozí tabuli",
     "Due date reminders" : "Upomínky termínů",
     "Assigned cards" : "Přiřazené karty",
     "No notifications" : "Žádná upozornění",

l10n/de.js

@@ -237,6 +237,8 @@ OC.L10N.register(
     "Edit list title" : "Listentitel bearbeiten",
     "Archive all cards" : "Alle Karten archivieren",
     "Unarchive all cards" : "Alle Karten dearchivieren",
+    "Do not set cards as \"done\"" : "Karten nicht als \"erledigt\" markieren",
+    "Set cards as \"done\"" : "Karten als \"erledigt\" markieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
     "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",

l10n/de.json

@@ -235,6 +235,8 @@
     "Edit list title" : "Listentitel bearbeiten",
     "Archive all cards" : "Alle Karten archivieren",
     "Unarchive all cards" : "Alle Karten dearchivieren",
+    "Do not set cards as \"done\"" : "Karten nicht als \"erledigt\" markieren",
+    "Set cards as \"done\"" : "Karten als \"erledigt\" markieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
     "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",

l10n/de_DE.js

@@ -237,6 +237,8 @@ OC.L10N.register(
     "Edit list title" : "Listentitel bearbeiten",
     "Archive all cards" : "Alle Karten archivieren",
     "Unarchive all cards" : "Alle Karten dearchivieren",
+    "Do not set cards as \"done\"" : "Karten nicht als \"erledigt\" markieren",
+    "Set cards as \"done\"" : "Karten als \"erledigt\" markieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
     "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",

l10n/de_DE.json

@@ -235,6 +235,8 @@
     "Edit list title" : "Listentitel bearbeiten",
     "Archive all cards" : "Alle Karten archivieren",
     "Unarchive all cards" : "Alle Karten dearchivieren",
+    "Do not set cards as \"done\"" : "Karten nicht als \"erledigt\" markieren",
+    "Set cards as \"done\"" : "Karten als \"erledigt\" markieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
     "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",