Merge pull request #6354 from nextcloud/release/1.11.7

bump version to 1.11.7

CHANGELOG.md

@@ -1,9 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.11.7
+
+### Fixed
+ - fix: Load archived card if URL is opened directly #6323
+
+## 1.11.6
+
+### Fixed
+
+- fix: Avoid optional before required parameter [#6094](https://github.com/nextcloud/deck/pull/6094)
+- use deleted_users for users that do not exist [#6202](https://github.com/nextcloud/deck/pull/6202)
+
 ## 1.11.5
 
-### Fixed 
+### Fixed
 - don't reset update time when no update was written to db #6036
 - fix: Avoid conflicts on deck attachments folder name #5709
 - fix: permission check for cloning board #5856

appinfo/info.xml

@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.11.5</version>
+    <version>1.11.7</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <documentation>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "deck",
-  "version": "1.11.5",
+  "version": "1.11.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "deck",
-      "version": "1.11.5",
+      "version": "1.11.7",
       "license": "agpl",
       "dependencies": {
         "@babel/polyfill": "^7.12.1",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "deck",
   "description": "",
-  "version": "1.11.5",
+  "version": "1.11.7",
   "authors": [
     {
       "name": "Julius Härtl",
@@ -105,4 +105,4 @@
       "<rootDir>/node_modules/jest-serializer-vue"
     ]
   }
-}
+}

src/components/board/Board.vue

@@ -160,6 +160,16 @@ export default {
 				await this.$store.dispatch('loadBoardById', this.id)
 				await this.$store.dispatch('loadStacks', this.id)
 
+				const routeCardId = parseInt(this.$route.params.cardId)
+				// If an archived card is requested, and we cannot find it in the current we load the archived stacks instead
+				if (routeCardId && !this.$store.getters.cardById(routeCardId)) {
+					await this.$store.dispatch('loadArchivedStacks', this.id)
+
+					if (this.$store.getters.cardById(routeCardId)) {
+						this.$store.commit('toggleShowArchived', true)
+					}
+				}
+
 				this.session?.close()
 				this.session = createSession(this.id)
 			} catch (e) {

src/store/main.js

@@ -179,8 +179,8 @@ export default new Vuex.Store({
 				}
 			})
 		},
-		toggleShowArchived(state) {
-			state.showArchived = !state.showArchived
+		toggleShowArchived(state, newState = undefined) {
+			state.showArchived = newState !== undefined ? newState : !state.showArchived
 		},
 		/*
 		 * Adds or replaces a board in the store.

src/store/stack.js

@@ -95,6 +95,21 @@ export default {
 			}
 			commit('setCards', cards)
 		},
+		async loadArchivedStacks({ commit, getters }, boardId) {
+			const archivedStacks = await apiClient.loadArchivedStacks(boardId)
+			const cards = []
+			for (const i in archivedStacks) {
+				const stack = archivedStacks[i]
+				for (const j in stack.cards) {
+					cards.push(stack.cards[j])
+				}
+				delete stack.cards
+				if (!getters.stackById(stack.id)) {
+					commit('addStack', stack)
+				}
+			}
+			commit('setCards', cards)
+		},
 		createStack({ commit }, stack) {
 			stack.boardId = this.state.currentBoard.id
 			apiClient.createStack(stack)