Fix missed switches to dayjs and immutability change

Author: asavageiv

src/components/AppNavigation/Trashbin.vue

@@ -209,9 +209,9 @@ export default {
 				if (vobject.isEvent) {
 					const event = toRaw(vobject?.calendarComponent.getFirstComponent('VEVENT'))
 					if (event?.startDate.jsDate && event?.isAllDay()) {
-						subline += ' · ' + moment(event.startDate.jsDate).format('LL')
+						subline += ' · ' + dayjs(event.startDate.jsDate).format('LL')
 					} else if (event?.startDate.jsDate) {
-						subline += ' · ' + moment(event?.startDate.jsDate).format('LLL')
+						subline += ' · ' + dayjs(event?.startDate.jsDate).format('LLL')
 					}
 				}
 				const color = vobject.calendarComponent.getComponentIterator().next().value?.color

src/models/task.js

@@ -23,6 +23,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+import dayjs from 'dayjs'
 
 import ICAL from 'ical.js'
 import { randomUUID } from '../utils/crypto.js'
@@ -93,27 +94,27 @@ export default class Task {
 		this._priority = this.vtodo.getFirstPropertyValue('priority') || 0
 		this._complete = this.vtodo.getFirstPropertyValue('percent-complete') || 0
 		this._completedDate = this.vtodo.getFirstPropertyValue('completed')
-		this._completedDateMoment = moment(this._completedDate, 'YYYYMMDDTHHmmssZ')
+		this._completedDateMoment = dayjs(this._completedDate, 'YYYYMMDDTHHmmssZ')
 		this._completed = !!this._completedDate
 		this._status = this.vtodo.getFirstPropertyValue('status')
 		this._note = this.vtodo.getFirstPropertyValue('description') || ''
 		this._related = this.getParent()?.getFirstValue() || null
 		this._hideSubtaks = +this.vtodo.getFirstPropertyValue('x-oc-hidesubtasks') || 0
 		this._hideCompletedSubtaks = +this.vtodo.getFirstPropertyValue('x-oc-hidecompletedsubtasks') || 0
 		this._start = this.vtodo.getFirstPropertyValue('dtstart')
-		this._startMoment = moment(this._start, 'YYYYMMDDTHHmmssZ')
+		this._startMoment = dayjs(this._start, 'YYYYMMDDTHHmmssZ')
 		this._due = this.vtodo.getFirstPropertyValue('due')
-		this._dueMoment = moment(this._due, 'YYYYMMDDTHHmmssZ')
+		this._dueMoment = dayjs(this._due, 'YYYYMMDDTHHmmssZ')
 		const start = this.vtodo.getFirstPropertyValue('dtstart')
 		const due = this.vtodo.getFirstPropertyValue('due')
 		const d = due || start
 		this._allDay = d !== null && d.isDate
 		this._loaded = false
 		this._tags = this.getTags()
 		this._modified = this.vtodo.getFirstPropertyValue('last-modified')
-		this._modifiedMoment = moment(this._modified, 'YYYYMMDDTHHmmssZ')
+		this._modifiedMoment = dayjs(this._modified, 'YYYYMMDDTHHmmssZ')
 		this._created = this.vtodo.getFirstPropertyValue('created')
-		this._createdMoment = moment(this._created, 'YYYYMMDDTHHmmssZ')
+		this._createdMoment = dayjs(this._created, 'YYYYMMDDTHHmmssZ')
 		this._class = this.vtodo.getFirstPropertyValue('class') || 'PUBLIC'
 		this._pinned = this.vtodo.getFirstPropertyValue('x-pinned') === 'true'
 		this._location = this.vtodo.getFirstPropertyValue('location') || ''
@@ -314,11 +315,11 @@ export default class Task {
 			}
 			this.vtodo.updatePropertyWithValue('completed', completedDate)
 			this._completedDate = completedDate
-			this._completedDateMoment = moment(completedDate, 'YYYYMMDDTHHmmssZ')
+			this._completedDateMoment = dayjs(completedDate, 'YYYYMMDDTHHmmssZ')
 		} else {
 			this.vtodo.removeProperty('completed')
 			this._completedDate = null
-			this._completedDateMoment = moment(null)
+			this._completedDateMoment = dayjs(null)
 		}
 		this._completed = completed
 		this.updateLastModified()
@@ -502,7 +503,7 @@ export default class Task {
 			this.vtodo.removeProperty('dtstart')
 		}
 		this._start = start
-		this._startMoment = moment(start, 'YYYYMMDDTHHmmssZ')
+		this._startMoment = dayjs(start, 'YYYYMMDDTHHmmssZ')
 		this.updateLastModified()
 		// Check all day setting
 		const d = this._due || this._start
@@ -528,7 +529,7 @@ export default class Task {
 			this.vtodo.removeProperty('due')
 		}
 		this._due = due
-		this._dueMoment = moment(due, 'YYYYMMDDTHHmmssZ')
+		this._dueMoment = dayjs(due, 'YYYYMMDDTHHmmssZ')
 		this.updateLastModified()
 		// Check all day setting
 		const d = this._due || this._start
@@ -549,7 +550,7 @@ export default class Task {
 			start.isDate = allDay
 			if (!allDay) {
 				// If we converted to datetime, we set the hour to zero in the current timezone.
-				this.setStart(ICAL.Time.fromJSDate(moment(start, 'YYYYMMDDTHHmmssZ').toDate(), true))
+				this.setStart(ICAL.Time.fromJSDate(dayjs(start, 'YYYYMMDDTHHmmssZ').toDate(), true))
 			} else {
 				this.setStart(ICAL.Time.fromDateString(this._startMoment.format('YYYY-MM-DD')))
 			}
@@ -559,7 +560,7 @@ export default class Task {
 			due.isDate = allDay
 			if (!allDay) {
 				// If we converted to datetime, we set the hour to zero in the current timezone.
-				this.setDue(ICAL.Time.fromJSDate(moment(due, 'YYYYMMDDTHHmmssZ').toDate(), true))
+				this.setDue(ICAL.Time.fromJSDate(dayjs(due, 'YYYYMMDDTHHmmssZ').toDate(), true))
 			} else {
 				this.setDue(ICAL.Time.fromDateString(this._dueMoment.format('YYYY-MM-DD')))
 			}
@@ -707,7 +708,7 @@ export default class Task {
 		this.vtodo.updatePropertyWithValue('last-modified', now)
 		this.vtodo.updatePropertyWithValue('dtstamp', now)
 		this._modified = now
-		this._modifiedMoment = moment(now, 'YYYYMMDDTHHmmssZ')
+		this._modifiedMoment = dayjs(now, 'YYYYMMDDTHHmmssZ')
 	}
 
 	get modified() {
@@ -729,7 +730,7 @@ export default class Task {
 	set created(createdDate) {
 		this.vtodo.updatePropertyWithValue('created', createdDate)
 		this._created = createdDate
-		this._createdMoment = moment(createdDate, 'YYYYMMDDTHHmmssZ')
+		this._createdMoment = dayjs(createdDate, 'YYYYMMDDTHHmmssZ')
 		// Update the sortorder if necessary
 		if (this.vtodo.getFirstPropertyValue('x-apple-sort-order') === null) {
 			this._sortOrder = this.getSortOrder()

src/store/tasks.js

@@ -653,7 +653,7 @@ const mutations = {
 	setCompletedDate(state, { task, completedDate }) {
 		if (completedDate !== null) {
 			// Check that the completed date is in the past.
-			const now = moment(ICAL.Time.fromJSDate(new Date(), true), 'YYYYMMDDTHHmmssZ')
+			const now = dayjs(ICAL.Time.fromJSDate(new Date(), true), 'YYYYMMDDTHHmmssZ')
 			if (completedDate.isAfter(now)) {
 				showError(t('tasks', 'Completion date must be in the past.'))
 				return

src/utils/dateStrings.js

@@ -168,7 +168,7 @@ export function formatAlarm(alarm, isAllDay, currentUserTimezone, locale) {
 			date.setMinutes(alarm.relativeMinutesAllDay)
 			date.setSeconds(0)
 			date.setMilliseconds(0)
-			const formattedHourMinute = moment(date).locale(locale).format('LT')
+			const formattedHourMinute = dayjs(date).locale(locale).format('LT')
 
 			if (alarm.relativeTrigger < 0) {
 				if (alarm.relativeUnitAllDay === 'days') {
@@ -220,7 +220,7 @@ export function formatAlarm(alarm, isAllDay, currentUserTimezone, locale) {
 		// Absolute trigger
 		// There are no timezones in the VALARM component, since dates can only be relative or saved as UTC.
 		const currentUserTimezoneDate = convertTimeZone(alarm.absoluteDate, currentUserTimezone)
-		return moment(currentUserTimezoneDate).locale(locale).calendar(null, {
+		return dayjs(currentUserTimezoneDate).locale(locale).calendar(null, {
 			sameElse: 'LLL', // Overwrites the default `DD/MM/YYYY` (which misses the time)
 		})
 	}

src/views/AppSidebar.vue

@@ -290,6 +290,7 @@ import { startDateString, dueDateString } from '../utils/dateStrings.js'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import dayjs from 'dayjs'
+import calendar from 'dayjs/plugin/calendar'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActionLink from '@nextcloud/vue/components/NcActionLink'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
@@ -319,6 +320,8 @@ import Web from 'vue-material-design-icons/Web.vue'
 
 import { mapGetters, mapActions } from 'vuex'
 
+dayjs.extend(calendar)
+
 export default {
 	components: {
 		NcAppSidebar,
@@ -543,7 +546,7 @@ export default {
 			if (due.isBefore(reference)) {
 				reference = due.subtract(1, 'm')
 			}
-			reference.startOf(this.allDay ? 'day' : 'hour')
+			reference = reference.startOf(this.allDay ? 'day' : 'hour')
 			return reference.toDate()
 		},
 
@@ -824,7 +827,7 @@ export default {
 		 */
 		setStartDate({ task, value: start }) {
 			if (start) {
-				start = moment(start)
+				start = dayjs(start)
 			}
 			if (this.task.startMoment.isSame(start)) {
 				return
@@ -842,7 +845,7 @@ export default {
 		 */
 		setDueDate({ task, value: due }) {
 			if (due) {
-				due = moment(due)
+				due = dayjs(due)
 			}
 			if (this.task.dueMoment.isSame(due)) {
 				return
@@ -859,7 +862,7 @@ export default {
 		 */
 		 changeCompletedDate({ task, value: completedDate }) {
 			if (completedDate) {
-				completedDate = moment(completedDate)
+				completedDate = dayjs(completedDate)
 			}
 			if (this.task.completedDateMoment.isSame(completedDate)) {
 				return