refactor: initialize session with store instance

Signed-off-by: Luka Trovic <[email protected]>

Author: luka-nextcloud

src/main.js

@@ -13,13 +13,14 @@ import { subscribe } from '@nextcloud/event-bus'
 import ClickOutside from 'vue-click-outside'
 import './shared-init.js'
 import './models/index.js'
-import './sessions.js'
+import { initSessions } from './sessions.js'
 
 // the server snap.js conflicts with vertical scrolling so we disable it
 document.body.setAttribute('data-snap-ignore', 'true')
 
 const store = storeFactory()
 sync(store, router)
+initSessions(store)
 
 Vue.prototype.t = translate
 Vue.prototype.n = translatePlural

src/sessions.js

@@ -5,7 +5,6 @@
 
 import { listen } from '@nextcloud/notify_push'
 import { sessionApi } from './services/SessionApi.js'
-import storeFactory from './store/main.js'
 import axios from '@nextcloud/axios'
 
 const SESSION_INTERVAL = 90 // in seconds
@@ -14,7 +13,7 @@ let hasPush = false
 
 let syncRunning = false
 
-const store = storeFactory()
+let store = null
 
 /**
  * used to verify, whether an event is originated by ourselves
@@ -30,28 +29,35 @@ function isOurSessionToken(token) {
 	}
 }
 
-hasPush = listen('deck_board_update', (name, body) => {
-	// ignore update events which we have triggered ourselves
-	if (isOurSessionToken(body._causingSessionToken)) return
+/**
+ *
+ * @param storeInstance
+ */
+export function initSessions(storeInstance) {
+	store = storeInstance
+	hasPush = listen('deck_board_update', (name, body) => {
+		// ignore update events which we have triggered ourselves
+		if (isOurSessionToken(body._causingSessionToken)) return
 
-	// only handle update events for the currently open board
-	const currentBoardId = store.state.currentBoard?.id
-	if (body.id !== currentBoardId) return
+		// only handle update events for the currently open board
+		const currentBoardId = store.state.currentBoard?.id
+		if (body.id !== currentBoardId) return
 
-	store.dispatch('refreshBoard', currentBoardId)
-})
+		store.dispatch('refreshBoard', currentBoardId)
+	})
 
-listen('deck_card_update', (name, body) => {
+	listen('deck_card_update', (name, body) => {
 
-	// ignore update events which we have triggered ourselves
-	if (isOurSessionToken(body._causingSessionToken)) return
+		// ignore update events which we have triggered ourselves
+		if (isOurSessionToken(body._causingSessionToken)) return
 
-	// only handle update events for the currently open board
-	const currentBoardId = store.state.currentBoard?.id
-	if (body.boardId !== currentBoardId) return
+		// only handle update events for the currently open board
+		const currentBoardId = store.state.currentBoard?.id
+		if (body.boardId !== currentBoardId) return
 
-	store.dispatch('loadStacks', currentBoardId)
-})
+		store.dispatch('loadStacks', currentBoardId)
+	})
+}
 
 /**
  * is the notify_push app active and can

src/store/card.js

@@ -188,39 +188,13 @@ export default function cardModuleFactory() {
 				return state.cards.find((card) => card.id === id)
 			},
 		},
-		cardById: state => (id) => {
-			return state.cards.find((card) => card.id === id)
-		},
-	},
-	mutations: {
-		addCard(state, card) {
-			card.labels = card.labels || []
-			card.assignedUsers = card.assignedUsers || []
-			const existingIndex = state.cards.findIndex(_card => _card.id === card.id)
-			if (existingIndex !== -1) {
-				const existingCard = state.cards.find(_card => _card.id === card.id)
-				Vue.set(state.cards, existingIndex, Object.assign({}, existingCard, card))
-			} else {
-				state.cards.push(card)
-			}
-		},
-		deleteCard(state, card) {
-			const existingIndex = state.cards.findIndex(_card => _card.id === card.id)
-			if (existingIndex !== -1) {
-				state.cards.splice(existingIndex, 1)
-			}
-		},
-		updateCard(state, card) {
-			const existingIndex = state.cards.findIndex(_card => _card.id === card.id)
-			if (existingIndex !== -1) {
-				Vue.set(state.cards, existingIndex, Object.assign({}, state.cards[existingIndex], card))
-			}
-		},
-		updateCardsReorder(state, cards) {
-			for (const newCard of cards) {
-				const existingIndex = state.cards.findIndex(_card => _card.id === newCard.id)
+		mutations: {
+			addCard(state, card) {
+				card.labels = card.labels || []
+				card.assignedUsers = card.assignedUsers || []
+				const existingIndex = state.cards.findIndex(_card => _card.id === card.id)
 				if (existingIndex !== -1) {
-					const existingCard = state.cards[existingIndex]
+					const existingCard = state.cards.find(_card => _card.id === card.id)
 					Vue.set(state.cards, existingIndex, Object.assign({}, existingCard, card))
 				} else {
 					state.cards.push(card)