Merge pull request #3061 from nextcloud/revert-3027-tasks-nomoment

Revert "Replace dependency on moment with dayjs"

Author: raimund-schluessler

package-lock.json

@@ -35,11 +35,11 @@
     "@nextcloud/initial-state": "3.0.0",
     "@nextcloud/l10n": "^3.4.1",
     "@nextcloud/logger": "^3.0.3",
+    "@nextcloud/moment": "^1.3.5",
     "@nextcloud/router": "^3.1.0",
     "@nextcloud/vue": "9.5.0",
     "@vueuse/components": "^14.2.1",
     "color-convert": "^3.1.3",
-    "dayjs": "^1.11.19",
     "debounce": "^3.0.0",
     "ical.js": "^2.2.0",
     "markdown-it": "^14.1.1",

package.json

@@ -64,7 +64,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { translate as t } from '@nextcloud/l10n'
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 import NcAppNavigationSettings from '@nextcloud/vue/components/NcAppNavigationSettings'
 
 import CalendarToday from 'vue-material-design-icons/CalendarToday.vue'
@@ -102,7 +102,7 @@ export default {
 					name: t('tasks', 'Automatic'),
 				},
 			],
-			dayOfMonth: dayjs().date(),
+			dayOfMonth: moment().date(),
 		}
 	},
 	computed: {

src/components/AppNavigation/AppNavigationSettings.vue

@@ -129,6 +129,7 @@ import { sort } from '../../store/storeHelper.js'
 
 import { showError } from '@nextcloud/dialogs'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
+import moment from '@nextcloud/moment'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
@@ -209,9 +210,9 @@ export default {
 				if (vobject.isEvent) {
 					const event = toRaw(vobject?.calendarComponent.getFirstComponent('VEVENT'))
 					if (event?.startDate.jsDate && event?.isAllDay()) {
-						subline += ' · ' + dayjs(event.startDate.jsDate).format('LL')
+						subline += ' · ' + moment(event.startDate.jsDate).format('LL')
 					} else if (event?.startDate.jsDate) {
-						subline += ' · ' + dayjs(event?.startDate.jsDate).format('LLL')
+						subline += ' · ' + moment(event?.startDate.jsDate).format('LLL')
 					}
 				}
 				const color = vobject.calendarComponent.getComponentIterator().next().value?.color

src/components/AppNavigation/Trashbin.vue

@@ -58,7 +58,7 @@ import SortorderDropdown from './SortorderDropdown.vue'
 import openNewTask from '../mixins/openNewTask.js'
 
 import { translate as t } from '@nextcloud/l10n'
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 
 import Plus from 'vue-material-design-icons/Plus.vue'
@@ -140,11 +140,11 @@ export default {
 			}
 			if (this.$route.params.collectionId === 'today'
 				|| this.$route.params.collectionId === 'week') {
-				taskProperties.due = dayjs().startOf('day').format('YYYY-MM-DDTHH:mm:ss')
+				taskProperties.due = moment().startOf('day').format('YYYY-MM-DDTHH:mm:ss')
 				taskProperties.allDay = this.$store.state.settings.settings.allDay
 			}
 			if (this.$route.params.collectionId === 'current') {
-				taskProperties.start = dayjs().format('YYYY-MM-DDTHH:mm:ss')
+				taskProperties.start = moment().format('YYYY-MM-DDTHH:mm:ss')
 			}
 			return taskProperties
 		},

src/components/HeaderBar.vue

@@ -197,7 +197,7 @@ import { startDateString } from '../utils/dateStrings.js'
 
 import { emit } from '@nextcloud/event-bus'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcProgressBar from '@nextcloud/vue/components/NcProgressBar'
@@ -694,10 +694,10 @@ export default {
 				taskProperties.priority = '1'
 			}
 			if (this.collectionId === 'today') {
-				taskProperties.due = dayjs().startOf('day').format('YYYY-MM-DDTHH:mm:ss')
+				taskProperties.due = moment().startOf('day').format('YYYY-MM-DDTHH:mm:ss')
 			}
 			if (this.collectionId === 'current') {
-				taskProperties.start = dayjs().format('YYYY-MM-DDTHH:mm:ss')
+				taskProperties.start = moment().format('YYYY-MM-DDTHH:mm:ss')
 			}
 			return taskProperties
 		},

src/components/TaskBody.vue

@@ -23,7 +23,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import dayjs from 'dayjs'
+
+import moment from '@nextcloud/moment'
 
 import ICAL from 'ical.js'
 import { randomUUID } from '../utils/crypto.js'
@@ -94,27 +95,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 = dayjs(this._completedDate, 'YYYYMMDDTHHmmssZ')
+		this._completedDateMoment = moment(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 = dayjs(this._start, 'YYYYMMDDTHHmmssZ')
+		this._startMoment = moment(this._start, 'YYYYMMDDTHHmmssZ')
 		this._due = this.vtodo.getFirstPropertyValue('due')
-		this._dueMoment = dayjs(this._due, 'YYYYMMDDTHHmmssZ')
+		this._dueMoment = moment(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 = dayjs(this._modified, 'YYYYMMDDTHHmmssZ')
+		this._modifiedMoment = moment(this._modified, 'YYYYMMDDTHHmmssZ')
 		this._created = this.vtodo.getFirstPropertyValue('created')
-		this._createdMoment = dayjs(this._created, 'YYYYMMDDTHHmmssZ')
+		this._createdMoment = moment(this._created, 'YYYYMMDDTHHmmssZ')
 		this._class = this.vtodo.getFirstPropertyValue('class') || 'PUBLIC'
 		this._pinned = this.vtodo.getFirstPropertyValue('x-pinned') === 'true'
 		this._location = this.vtodo.getFirstPropertyValue('location') || ''
@@ -315,11 +316,11 @@ export default class Task {
 			}
 			this.vtodo.updatePropertyWithValue('completed', completedDate)
 			this._completedDate = completedDate
-			this._completedDateMoment = dayjs(completedDate, 'YYYYMMDDTHHmmssZ')
+			this._completedDateMoment = moment(completedDate, 'YYYYMMDDTHHmmssZ')
 		} else {
 			this.vtodo.removeProperty('completed')
 			this._completedDate = null
-			this._completedDateMoment = dayjs(null)
+			this._completedDateMoment = moment(null)
 		}
 		this._completed = completed
 		this.updateLastModified()
@@ -503,7 +504,7 @@ export default class Task {
 			this.vtodo.removeProperty('dtstart')
 		}
 		this._start = start
-		this._startMoment = dayjs(start, 'YYYYMMDDTHHmmssZ')
+		this._startMoment = moment(start, 'YYYYMMDDTHHmmssZ')
 		this.updateLastModified()
 		// Check all day setting
 		const d = this._due || this._start
@@ -529,7 +530,7 @@ export default class Task {
 			this.vtodo.removeProperty('due')
 		}
 		this._due = due
-		this._dueMoment = dayjs(due, 'YYYYMMDDTHHmmssZ')
+		this._dueMoment = moment(due, 'YYYYMMDDTHHmmssZ')
 		this.updateLastModified()
 		// Check all day setting
 		const d = this._due || this._start
@@ -550,7 +551,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(dayjs(start, 'YYYYMMDDTHHmmssZ').toDate(), true))
+				this.setStart(ICAL.Time.fromJSDate(moment(start, 'YYYYMMDDTHHmmssZ').toDate(), true))
 			} else {
 				this.setStart(ICAL.Time.fromDateString(this._startMoment.format('YYYY-MM-DD')))
 			}
@@ -560,7 +561,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(dayjs(due, 'YYYYMMDDTHHmmssZ').toDate(), true))
+				this.setDue(ICAL.Time.fromJSDate(moment(due, 'YYYYMMDDTHHmmssZ').toDate(), true))
 			} else {
 				this.setDue(ICAL.Time.fromDateString(this._dueMoment.format('YYYY-MM-DD')))
 			}
@@ -708,7 +709,7 @@ export default class Task {
 		this.vtodo.updatePropertyWithValue('last-modified', now)
 		this.vtodo.updatePropertyWithValue('dtstamp', now)
 		this._modified = now
-		this._modifiedMoment = dayjs(now, 'YYYYMMDDTHHmmssZ')
+		this._modifiedMoment = moment(now, 'YYYYMMDDTHHmmssZ')
 	}
 
 	get modified() {
@@ -730,7 +731,7 @@ export default class Task {
 	set created(createdDate) {
 		this.vtodo.updatePropertyWithValue('created', createdDate)
 		this._created = createdDate
-		this._createdMoment = dayjs(createdDate, 'YYYYMMDDTHHmmssZ')
+		this._createdMoment = moment(createdDate, 'YYYYMMDDTHHmmssZ')
 		// Update the sortorder if necessary
 		if (this.vtodo.getFirstPropertyValue('x-apple-sort-order') === null) {
 			this._sortOrder = this.getSortOrder()

src/models/task.js

@@ -27,7 +27,7 @@
 
 import Task from '../models/task.js'
 
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 
 import ICAL from 'ical.js'
 
@@ -105,7 +105,7 @@ function isTaskPriority(task) {
  * @return {boolean}
  */
 function isTaskCurrent(task) {
-	return !task.startMoment.isValid() || task.startMoment.diff(dayjs(), 'days', true) < 0 || task.dueMoment.diff(dayjs(), 'days', true) < 0
+	return !task.startMoment.isValid() || task.startMoment.diff(moment(), 'days', true) < 0 || task.dueMoment.diff(moment(), 'days', true) < 0
 }
 
 /**
@@ -121,11 +121,11 @@ function isTaskToday(task) {
 /**
  * Checks if a date is today
  *
- * @param {dayjs} date The date as moment
+ * @param {moment} date The date as moment
  * @return {boolean}
  */
 function today(date) {
-	return date.isValid() && date.diff(dayjs().startOf('day'), 'days', true) < 1
+	return date.isValid() && date.diff(moment().startOf('day'), 'days', true) < 1
 }
 
 /**
@@ -141,11 +141,11 @@ function isTaskWeek(task) {
 /**
  * Checks if a date lies within the next week
  *
- * @param {dayjs} date The date as moment
+ * @param {moment} date The date as moment
  * @return {boolean}
  */
 function week(date) {
-	return date.isValid() && date.diff(dayjs().startOf('day'), 'days', true) < 7
+	return date.isValid() && date.diff(moment().startOf('day'), 'days', true) < 7
 }
 
 /**
@@ -174,19 +174,19 @@ function dayOfTask(task) {
 
 	// Add all tasks whose start date will be reached at that day.
 	if (start.isValid() && !due.isValid()) {
-		diff = start.diff(dayjs().startOf('day'), 'days')
+		diff = start.diff(moment().startOf('day'), 'days')
 	}
 
 	// Add all tasks whose due date will be reached at that day.
 	if (due.isValid() && !start.isValid()) {
-		diff = due.diff(dayjs().startOf('day'), 'days')
+		diff = due.diff(moment().startOf('day'), 'days')
 	}
 
 	// Add all tasks whose due or start date will be reached at that day.
 	// Add the task to the day at which either due or start date are reached first.
 	if (start.isValid() && due.isValid()) {
-		startdiff = start.diff(dayjs().startOf('day'), 'days')
-		duediff = due.diff(dayjs().startOf('day'), 'days')
+		startdiff = start.diff(moment().startOf('day'), 'days')
+		duediff = due.diff(moment().startOf('day'), 'days')
 		// chose the date that is reached first
 		diff = (startdiff < duediff) ? startdiff : duediff
 	}
@@ -197,11 +197,11 @@ function dayOfTask(task) {
 /**
  * Checks if a date is overdue
  *
- * @param {dayjs} date The date
+ * @param {moment} date The date
  * @return {boolean}
  */
 function overdue(date) {
-	return date.isValid() && date.diff(dayjs()) < 0
+	return date.isValid() && date.diff(moment()) < 0
 }
 
 /**
@@ -467,7 +467,7 @@ function sortByDeletedAt(taskA, taskB) {
 /**
  * Function to convert a moment to a ICAL Time
  *
- * @param {dayjs} moment The moment to convert
+ * @param {moment} moment The moment to convert
  * @param {boolean} asDate Is the moment all day
  * @return {ICAL.Time}
  */

src/store/storeHelper.js

@@ -30,7 +30,7 @@ import Task from '../models/task.js'
 import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { translate as t } from '@nextcloud/l10n'
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 
 import ICAL from 'ical.js'
 
@@ -586,7 +586,7 @@ const mutations = {
 	 * @param {object} state The store data
 	 * @param {object} data Destructuring object
 	 * @param {Task} data.task The task
-	 * @param {dayjs} data.due The due date moment
+	 * @param {moment} data.due The due date moment
 	 * @param {boolean} data.allDay Whether the date is all-day
 	 */
 	setDue(state, { task, due, allDay }) {
@@ -600,7 +600,7 @@ const mutations = {
 			if (start.isValid() && due.isBefore(start)) {
 				const currentdue = task.dueMoment
 				if (currentdue.isValid()) {
-					start = start.subtract(currentdue.diff(due), 'ms')
+					start.subtract(currentdue.diff(due), 'ms')
 				} else {
 					start = due.clone()
 				}
@@ -617,7 +617,7 @@ const mutations = {
 	 * @param {object} state The store data
 	 * @param {object} data Destructuring object
 	 * @param {Task} data.task The task
-	 * @param {dayjs} data.start The start date moment
+	 * @param {moment} data.start The start date moment
 	 * @param {boolean} data.allDay Whether the date is all-day
 	 */
 	setStart(state, { task, start, allDay }) {
@@ -631,7 +631,7 @@ const mutations = {
 			if (due.isValid() && start.isAfter(due)) {
 				const currentstart = task.startMoment
 				if (currentstart.isValid()) {
-					due = due.add(start.diff(currentstart), 'ms')
+					due.add(start.diff(currentstart), 'ms')
 				} else {
 					due = start.clone()
 				}
@@ -653,7 +653,7 @@ const mutations = {
 	setCompletedDate(state, { task, completedDate }) {
 		if (completedDate !== null) {
 			// Check that the completed date is in the past.
-			const now = dayjs(ICAL.Time.fromJSDate(new Date(), true), 'YYYYMMDDTHHmmssZ')
+			const now = moment(ICAL.Time.fromJSDate(new Date(), true), 'YYYYMMDDTHHmmssZ')
 			if (completedDate.isAfter(now)) {
 				showError(t('tasks', 'Completion date must be in the past.'))
 				return
@@ -1433,12 +1433,12 @@ const actions = {
 	async setDate(context, { task, day }) {
 		const start = task.startMoment.startOf('day')
 		const due = task.dueMoment.startOf('day')
-		day = dayjs().startOf('day').add(day, 'days')
+		day = moment().startOf('day').add(day, 'days')
 
 		let diff
 		// Adjust start date
 		if (start.isValid()) {
-			diff = start.diff(dayjs().startOf('day'), 'days')
+			diff = start.diff(moment().startOf('day'), 'days')
 			diff = diff < 0 ? 0 : diff
 			if (diff !== day) {
 				const newStart = task.startMoment.year(day.year()).month(day.month()).date(day.date())
@@ -1447,7 +1447,7 @@ const actions = {
 			}
 		// Adjust due date
 		} else if (due.isValid()) {
-			diff = due.diff(dayjs().startOf('day'), 'days')
+			diff = due.diff(moment().startOf('day'), 'days')
 			diff = diff < 0 ? 0 : diff
 			if (diff !== day) {
 				const newDue = task.dueMoment.year(day.year()).month(day.month()).date(day.date())

src/store/tasks.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import dayjs from 'dayjs'
+import moment from '@nextcloud/moment'
 
 /**
  * Get the factor for a given unit
@@ -215,7 +215,7 @@ export function getDefaultAlarms(allDay = false) {
  */
 export function getDefaultAbsoluteAlarms() {
 	return [
-		dayjs().add(1, 'day').startOf('day').add(9, 'hours').toDate(),
+		moment().add(1, 'day').startOf('day').add(9, 'hours').toDate(),
 	]
 }