Merge pull request #1670 from nextcloud/bugfix/noid/fix-card-order

Fix filtering and sorting of stacks that caused card reordering

src/components/board/Stack.vue

@@ -77,7 +77,7 @@
 			:drag-handle-selector="dragHandleSelector"
 			@should-accept-drop="canEdit"
 			@drop="($event) => onDropCard(stack.id, $event)">
-			<Draggable v-for="card in cardsByStack(stack.id)" :key="card.id">
+			<Draggable v-for="card in cardsByStack" :key="card.id">
 				<CardItem v-if="card" :id="card.id" />
 			</Draggable>
 		</Container>
@@ -122,7 +122,7 @@ export default {
 			'canEdit',
 		]),
 		cardsByStack() {
-			return (id) => this.$store.getters.cardsByStack(id)
+			return this.$store.getters.cardsByStack(this.stack.id)
 		},
 		dragHandleSelector() {
 			return this.canEdit ? null : '.no-drag'
@@ -150,7 +150,7 @@ export default {
 		},
 		payloadForCard(stackId) {
 			return index => {
-				return this.cardsByStack(stackId)[index]
+				return this.cardsByStack[index]
 			}
 		},
 		deleteStack(stack) {

src/store/card.js

@@ -76,10 +76,16 @@ export default {
 
 				return true
 			})
-				.filter((card) => card.stackId === id && (getters.getSearchQuery === ''
+				.filter((card) => card.stackId === id)
-					|| (card.title.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
+				.filter((card) => {
-					|| card.description.toLowerCase().includes(getters.getSearchQuery.toLowerCase()))
+					if (getters.getSearchQuery === '') {
-						.sort((a, b) => a.order - b.order)))
+						return true
+					}
+
+					return card.title.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
+						|| card.description.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
+				})
+				.sort((a, b) => a.order - b.order)
 		},
 		cardById: state => (id) => {
 			return state.cards.find((card) => card.id === id)