ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #1903 from nextcloud/bugfix/1814

Browse Source
This commit is contained in:
Julius Härtl
2020-05-15 15:57:59 +02:00
committed by GitHub
parent c88ad6e968 8f0d35548a
commit b65788515a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/store/card.js
View File

@@ -122,8 +122,8 @@ export default {
for (const newCard of cards) { for (const newCard of cards) {
const existingIndex = state.cards.findIndex(_card => _card.id === newCard.id) const existingIndex = state.cards.findIndex(_card => _card.id === newCard.id)
if (existingIndex !== -1) { if (existingIndex !== -1) {
const newCardObject = Object.assign({}, state.cards[existingIndex], { id: newCard.id, order: newCard.order, stackId: newCard.stackId }) Vue.set(state.cards[existingIndex], 'order', newCard.order)
Vue.set(state.cards, existingIndex, newCardObject) Vue.set(state.cards[existingIndex], 'stackId', newCard.stackId)
} }
} }
}, },
@@ -176,21 +176,24 @@ export default {
}, },
async reorderCard({ commit, getters }, card) { async reorderCard({ commit, getters }, card) {
let i = 0 let i = 0
const newCards = []
for (const c of getters.cardsByStack(card.stackId)) { for (const c of getters.cardsByStack(card.stackId)) {
if (c.id === card.id) { if (c.id === card.id) {
await commit('updateCardsReorder', [card]) newCards.push(card)
} }
if (i === card.order) { if (i === card.order) {
i++ i++
} }
if (c.id !== card.id) { if (c.id !== card.id) {
await commit('updateCardsReorder', [{ ...c, order: i++ }]) newCards.push({ ...c, order: i++ })
} }
} }
await commit('updateCardsReorder', [card]) newCards.push(card)
await commit('updateCardsReorder', newCards)
const cards = await apiClient.reorderCard(card) apiClient.reorderCard(card).then((cards) => {
await commit('updateCardsReorder', Object.values(cards)) commit('updateCardsReorder', Object.values(cards))
})
}, },
async deleteCard({ commit }, card) { async deleteCard({ commit }, card) {
await apiClient.deleteCard(card.id) await apiClient.deleteCard(card.id)