Update fetchTimeRanges store usages

Signed-off-by: Grigory V <[email protected]>

src/fullcalendar/eventSources/eventSource.js

@@ -26,14 +26,14 @@ import getTimezoneManager from '../../services/timezoneDataProviderService.js'
 import { getUnixTimestampFromDate } from '../../utils/date.js'
 import { eventSourceFunction } from './eventSourceFunction.js'
 import logger from '../../utils/logger.js'
+import useFetchedTimeRangesStore from '../../store/fetchedTimeRanges.js'
 
 /**
  * Returns a function to generate a FullCalendar event-source based on the Vuex calendar model
  *
- * @param {object} store The Vuex store
  * @return {function(*=): {backgroundColor: *, borderColor: *, className: *, id: *, textColor: *, events: events}}
  */
-export default function(store) {
+export default function() {
 	return function(calendar) {
 		const source = {
 			id: calendar.id,
@@ -50,10 +50,11 @@ export default function(store) {
 				}
 
 				// This code assumes that once a time range has been fetched it won't be changed
-				// outside of the vuex store. Triggering a refetch will just update all known
+				// outside of the vuex(Pinia) store. Triggering a refetch will just update all known
 				// calendar objects inside this time range. New events that were added to a cached
 				// time range externally will not be fetched and have to be added manually.
-				const timeRange = store.getters.getTimeRangeForCalendarCoveringRange(calendar.id, getUnixTimestampFromDate(start), getUnixTimestampFromDate(end))
+				const fetchedTimeRangesStore = useFetchedTimeRangesStore()
+				const timeRange = fetchedTimeRangesStore.getTimeRangeForCalendarCoveringRange(calendar.id, getUnixTimestampFromDate(start), getUnixTimestampFromDate(end))
 				if (!timeRange) {
 					let timeRangeId
 					try {
@@ -67,10 +68,10 @@ export default function(store) {
 						return
 					}
 
-					const calendarObjects = store.getters.getCalendarObjectsByTimeRangeId(timeRangeId)
+					const calendarObjects = fetchedTimeRangesStore.getCalendarObjectsByTimeRangeId(timeRangeId)
 					successCallback(eventSourceFunction(calendarObjects, calendar, start, end, timezoneObject))
 				} else {
-					const calendarObjects = store.getters.getCalendarObjectsByTimeRangeId(timeRange.id)
+					const calendarObjects = fetchedTimeRangesStore.getCalendarObjectsByTimeRangeId(timeRange.id)
 					successCallback(eventSourceFunction(calendarObjects, calendar, start, end, timezoneObject))
 				}
 			},

src/store/calendarObjects.js

@@ -32,6 +32,7 @@ import {
 	getTimezoneManager,
 	DateTimeValue,
 } from '@nextcloud/calendar-js'
+import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
 
 const state = {
 	calendarObjects: {},
@@ -169,6 +170,8 @@ const actions = {
 			return
 		}
 
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
+
 		const oldCalendarObjectId = calendarObject.id
 		const oldCalendarId = calendarObject.calendarId
 
@@ -196,7 +199,7 @@ const actions = {
 			},
 			calendarObjectId: calendarObject.id,
 		})
-		context.commit('addCalendarObjectIdToAllTimeRangesOfCalendar', {
+		fetchedTimeRangesStore.addCalendarObjectIdToAllTimeRangesOfCalendar({
 			calendarId: newCalendarId,
 			calendarObjectId: calendarObject.id,
 		})
@@ -207,7 +210,7 @@ const actions = {
 			},
 			calendarObjectId: oldCalendarObjectId,
 		})
-		context.commit('removeCalendarObjectIdFromAllTimeRangesOfCalendar', {
+		fetchedTimeRangesStore.removeCalendarObjectIdFromAllTimeRangesOfCalendar({
 			calendarId: oldCalendarId,
 			calendarObjectId: oldCalendarObjectId,
 		})
@@ -224,11 +227,13 @@ const actions = {
 	 * @return {Promise<void>}
 	 */
 	async updateCalendarObject(context, { calendarObject }) {
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
+
 		if (calendarObject.existsOnServer) {
 			calendarObject.dav.data = calendarObject.calendarComponent.toICS()
 			await calendarObject.dav.update()
 
-			context.commit('addCalendarObjectIdToAllTimeRangesOfCalendar', {
+			fetchedTimeRangesStore.addCalendarObjectIdToAllTimeRangesOfCalendar({
 				calendarId: calendarObject.calendarId,
 				calendarObjectId: calendarObject.id,
 			})
@@ -251,7 +256,7 @@ const actions = {
 			},
 			calendarObjectId: calendarObject.id,
 		})
-		context.commit('addCalendarObjectIdToAllTimeRangesOfCalendar', {
+		fetchedTimeRangesStore.addCalendarObjectIdToAllTimeRangesOfCalendar({
 			calendarId: calendarObject.calendarId,
 			calendarObjectId: calendarObject.id,
 		})
@@ -271,6 +276,9 @@ const actions = {
 	async createCalendarObjectFromFork(context, { eventComponent, calendarId }) {
 		const calendar = context.getters.getCalendarById(calendarId)
 		const calendarObject = mapCalendarJsToCalendarObject(eventComponent.root, calendar.id)
+
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
+
 		calendarObject.dav = await calendar.dav.createVObject(calendarObject.calendarComponent.toICS())
 		calendarObject.existsOnServer = true
 		context.commit('updateCalendarObjectId', { calendarObject })
@@ -282,7 +290,7 @@ const actions = {
 			},
 			calendarObjectId: calendarObject.id,
 		})
-		context.commit('addCalendarObjectIdToAllTimeRangesOfCalendar', {
+		fetchedTimeRangesStore.addCalendarObjectIdToAllTimeRangesOfCalendar({
 			calendarId: calendar.id,
 			calendarObjectId: calendarObject.id,
 		})
@@ -298,6 +306,7 @@ const actions = {
 	 * @return {Promise<void>}
 	 */
 	async deleteCalendarObject(context, { calendarObject }) {
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
 		// If this calendar-object was not created on the server yet,
 		// no need to send requests to the server
 		if (calendarObject.existsOnServer) {
@@ -311,9 +320,10 @@ const actions = {
 			},
 			calendarObjectId: calendarObject.id,
 		})
-		context.commit('removeCalendarObjectIdFromAnyTimeRange', {
+		fetchedTimeRangesStore.removeCalendarObjectIdFromAnyTimeRange({
 			calendarObjectId: calendarObject.id,
 		})
+
 		context.commit('incrementModificationCount')
 	},
 

src/store/calendars.js

@@ -51,6 +51,8 @@ import {
 import { showError } from '@nextcloud/dialogs'
 import useImportStateStore from './importState.js'
 import useImportFilesStore from './importFiles.js'
+import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
+import fetchedTimeRanges from './fetchedTimeRanges.js'
 
 const state = {
 	calendars: [],
@@ -788,7 +790,8 @@ const actions = {
 		commit('removeDeletedCalendar', { calendar })
 	},
 
-	async restoreCalendarObject({ commit, state, getters }, { vobject }) {
+	async restoreCalendarObject({ commit, state }, { vobject }) {
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
 		await state.trashBin.restore(vobject.uri)
 
 		// Clean up the data locally
@@ -797,7 +800,7 @@ const actions = {
 		// Delete cached time range that includes the restored event
 		const calendarObject = mapCDavObjectToCalendarObject(vobject.dav, undefined)
 		const component = calendarObject.calendarComponent.getFirstComponent(vobject.objectType)
-		const timeRange = getters.getTimeRangeForCalendarCoveringRange(
+		const timeRange = fetchedTimeRangesStore.getTimeRangeForCalendarCoveringRange(
 			vobject.calendar.id,
 			component.startDate?.unixTime,
 			component.endDate?.unixTime,
@@ -807,7 +810,7 @@ const actions = {
 				calendar: vobject.calendar,
 				fetchedTimeRangeId: timeRange.id,
 			})
-			commit('removeTimeRange', {
+			fetchedTimeRangesStore.removeTimeRange({
 				timeRangeId: timeRange.id,
 			})
 		}
@@ -970,13 +973,14 @@ const actions = {
 	 * @return {Promise<void>}
 	 */
 	async getEventsFromCalendarInTimeRange(context, { calendar, from, to }) {
+		const fetchedTimeRangesStore = useFetchedTimeRangesStore()
 		context.commit('markCalendarAsLoading', { calendar })
 		const response = await calendar.dav.findByTypeInTimeRange('VEVENT', from, to)
 		let responseTodo = []
 		if (context.rootState.settings.showTasks) {
 			responseTodo = await calendar.dav.findByTypeInTimeRange('VTODO', from, to)
 		}
-		context.commit('addTimeRange', {
+		fetchedTimeRangesStore.addTimeRange({
 			calendarId: calendar.id,
 			from: getUnixTimestampFromDate(from),
 			to: getUnixTimestampFromDate(to),
@@ -1005,7 +1009,7 @@ const actions = {
 
 		context.commit('appendCalendarObjects', { calendarObjects })
 		context.commit('appendCalendarObjectsToCalendar', { calendar, calendarObjectIds })
-		context.commit('appendCalendarObjectIdsToTimeFrame', {
+		fetchedTimeRangesStore.appendCalendarObjectIdsToTimeFrame({
 			timeRangeId: insertId,
 			calendarObjectIds,
 		})
@@ -1105,6 +1109,7 @@ const actions = {
 			const calendarId = context.rootState.importFiles.importCalendarRelation[file.id]
 			const calendar = context.getters.getCalendarById(calendarId)
 			const importStateStore = useImportStateStore()
+			const fetchedTimeRangesStore = useFetchedTimeRangesStore()
 
 			for (const item of file.parser.getItemIterator()) {
 				requests.push(limit(async () => {
@@ -1125,7 +1130,7 @@ const actions = {
 						calendar,
 						calendarObjectId: calendarObject.id,
 					})
-					context.commit('addCalendarObjectIdToAllTimeRangesOfCalendar', {
+					fetchedTimeRangesStore.addCalendarObjectIdToAllTimeRangesOfCalendar({
 						calendarId: calendar.id,
 						calendarObjectId: calendarObject.id,
 					})

src/store/fetchedTimeRanges.js

@@ -19,9 +19,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import Vue from 'vue'
 import { defineStore } from 'pinia'
-import useCalendarObjectsStore from './calendarObjects'
+import useCalendarObjectsStore from './calendarObjects.js'
 
 export default defineStore('fetchedTimeRanges', {
 	state: () => {
@@ -62,7 +61,6 @@ export default defineStore('fetchedTimeRanges', {
 		getAllTimeRangesOlderThan: (state) => (olderThan) =>
 			state.fetchedTimeRanges.filter(f => (f.lastFetched <= olderThan)),
 
-
 		/**
 		 *
 		 * @param {object} state The Pinia state
@@ -154,7 +152,7 @@ export default defineStore('fetchedTimeRanges', {
 		 * @param {string} data.calendarObjectId The id of the calendar-object to remove
 		 */
 		removeCalendarObjectIdFromTimeRange({ timeRangeId, calendarObjectId }) {
-			const index = state.fetchedTimeRangesById[timeRangeId]
+			const index = this.fetchedTimeRangesById[timeRangeId]
 				.calendarObjectIds
 				.indexOf(calendarObjectId)
 			if (index !== -1) {
@@ -183,17 +181,6 @@ export default defineStore('fetchedTimeRanges', {
 			}
 		},
 
-		/**
-		 * Updates the last-fetched timestamp of a time-range
-		 *
-		 * @param {object} data The destructuring object
-		 * @param {number} data.timeRangeId The id of the timerange
-		 * @param {number} data.lastFetched Timestamp of last-fetched
-		 */
-		updateTimestampOfLastFetched({ timeRangeId, lastFetched }) {
-			this.fetchedTimeRangesById[timeRangeId].lastFetched = lastFetched
-		},
-
 		/**
 		 * Adds a calendar-object-id to all time-ranges of a given caloendar
 		 *
@@ -202,19 +189,19 @@ export default defineStore('fetchedTimeRanges', {
 		 * @param {string} data.calendarId The id of the calendar
 		 */
 		addCalendarObjectIdToAllTimeRangesOfCalendar({ calendarObjectId, calendarId }) {
-			for (const timerange of this.fetchedTimeRanges) {
-				if (timerange.calendarId !== calendarId) {
+			for (const timeRange of this.fetchedTimeRanges) {
+				if (timeRange.calendarId !== calendarId) {
 					continue
 				}
 
-				if (timerange.calendarObjectIds.indexOf(calendarObjectId) === -1) {
-					timerange.calendarObjectIds.push(calendarObjectId)
+				if (timeRange.calendarObjectIds.indexOf(calendarObjectId) === -1) {
+					timeRange.calendarObjectIds.push(calendarObjectId)
 				}
 			}
 		},
 
 		/**
-		 * Removes a calendar-object-id to all time-ranges of a given caloendar
+		 * Removes a calendar-object-id to all time-ranges of a given calendar
 		 *
 		 * @param {object} data The destructuring object
 		 * @param {string} data.calendarObjectId The id of the calendar-object

src/store/settings.js

@@ -31,6 +31,7 @@ import { defineStore } from 'pinia'
 import getTimezoneManager from '../services/timezoneDataProviderService.js'
 import * as AttachmentService from '../services/attachmentService.js'
 import usePrincipalsStore from './principals.js'
+import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
 
 export default defineStore('settings', {
 	state: () => {
@@ -153,18 +154,19 @@ export default defineStore('settings', {
 		},
 
 		/**
-		 * TODO make this work with eventual calendarObjects.js and fetchedTimeRanges.js
+		 * TODO make this work with eventual calendarObjects.js
 		 * Updates the user's setting for visibility of tasks
 		 *
 		 * @return {Promise<void>}
 		 */
 		async toggleTasksEnabled() {
+			const fetchedTimeRangesStore = useFetchedTimeRangesStore()
 			const newState = !this.showTasks
 			const value = newState ? 'yes' : 'no'
 
 			await setConfig('showTasks', value)
 			this.showTasks = !this.showTasks
-			commit('clearFetchedTimeRanges')
+			fetchedTimeRangesStore.clearFetchedTimeRanges()
 			commit('incrementModificationCount')
 		},
 

src/views/Calendar.vue

@@ -105,6 +105,8 @@ import {
 import '@nextcloud/dialogs/dist/index.css'
 import Trashbin from '../components/AppNavigation/CalendarList/Trashbin.vue'
 import AppointmentConfigList from '../components/AppNavigation/AppointmentConfigList.vue'
+import useFetchedTimeRangesStore from '../store/fetchedTimeRanges.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'Calendar',
@@ -132,6 +134,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useFetchedTimeRangesStore()),
 		...mapGetters({
 			timezoneId: 'getResolvedTimezone',
 			hasTrashBin: 'hasTrashBin',
@@ -190,10 +193,10 @@ export default {
 	created() {
 		this.timeFrameCacheExpiryJob = setInterval(() => {
 			const timestamp = (getUnixTimestampFromDate(dateFactory()) - 60 * 10)
-			const timeRanges = this.$store.getters.getAllTimeRangesOlderThan(timestamp)
+			const timeRanges = this.fetchedTimeRangesStore.getAllTimeRangesOlderThan(timestamp)
 
 			for (const timeRange of timeRanges) {
-				this.$store.commit('removeTimeRange', {
+				this.fetchedTimeRangesStore.removeTimeRange({
 					timeRangeId: timeRange.id,
 				})
 				this.$store.commit('deleteFetchedTimeRangeFromCalendar', {