Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/overview/Overview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
<script>
import Controls from '../Controls.vue'
import CardItem from '../cards/CardItem.vue'
import { mapGetters } from 'vuex'
import GlobalSearchResults from '../search/GlobalSearchResults.vue'
import { useOverviewStore } from '../../stores/overview.js'
import { mapActions, mapState } from 'pinia'

const FILTER_UPCOMING = 'upcoming'

Expand Down Expand Up @@ -112,7 +113,7 @@ export default {
return ''
}
},
...mapGetters(['assignedCardsDashboard']),
...mapState(useOverviewStore, ['assignedCards']),
},
watch: {
'$route.params.filter'() {
Expand All @@ -123,19 +124,20 @@ export default {
this.getData()
},
methods: {
...mapActions(useOverviewStore, ['loadUpcoming']),
async getData() {
this.loading = true
try {
if (this.filter === FILTER_UPCOMING) {
await this.$store.dispatch('loadUpcoming')
await this.loadUpcoming()
}
} catch (e) {
console.error(e)
}
this.loading = false
},
filterCards(when) {
return this.assignedCardsDashboard[when]
return this.assignedCards[when]
},
sortCards(cards) {
if (!cards) {
Expand Down
2 changes: 0 additions & 2 deletions src/store/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { BoardApi } from '../services/BoardApi.js'
import stackModuleFactory from './stack.js'
import cardModuleFactory from './card.js'
import attachment from './attachment.js'
import overview from './overview.js'
Vue.use(Vuex)

const apiClient = new BoardApi()
Expand All @@ -35,7 +34,6 @@ export default function storeFactory() {
stack: stackModuleFactory(),
card: cardModuleFactory(),
attachment,
overview,
},
strict: debug,
state: {
Expand Down
49 changes: 0 additions & 49 deletions src/store/overview.js

This file was deleted.

35 changes: 35 additions & 0 deletions src/stores/overview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import { defineStore } from 'pinia'
import { OverviewApi } from '../services/OverviewApi.js'

const overviewApi = new OverviewApi()

export const useOverviewStore = defineStore('overview', {
state: () => ({
assignedCards: [],
loading: false,
}),
actions: {
async loadUpcoming() {
if (this.loading) {
return this.loading
}
const promise = (async () => {
this.$vuex.commit('setCurrentBoard', null)
const assignedCards = await overviewApi.get('upcoming')
const assignedCardsFlat = Object.values(assignedCards).flat()
for (const i in assignedCardsFlat) {
this.$vuex.commit('addCard', assignedCardsFlat[i])
}
this.assignedCards = assignedCards
this.loading = false
})()
this.loading = promise
return promise
},
},
})
Loading