feat: remove date-fns formatISO (#2899)
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
Co-authored-by: Dominik Pschenitschni <mail@celement.de> Reviewed-on: #2899 Co-authored-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de> Co-committed-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
This commit is contained in:
parent
c97ed67f50
commit
1f25386f54
@ -1,5 +1,5 @@
|
||||
import {createDateFromString} from '@/helpers/time/createDateFromString'
|
||||
import {format, formatDistanceToNow, formatISO as formatISOfns} from 'date-fns'
|
||||
import {format, formatDistanceToNow} from 'date-fns'
|
||||
|
||||
// FIXME: support all locales and load dynamically
|
||||
import {enGB, de, fr, ru} from 'date-fns/locale'
|
||||
@ -50,7 +50,7 @@ export const formatDateSince = (date) => {
|
||||
}
|
||||
|
||||
export function formatISO(date) {
|
||||
return date ? formatISOfns(date) : ''
|
||||
return date ? new Date(date).toISOString() : ''
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,3 @@
|
||||
import {formatISO} from 'date-fns'
|
||||
|
||||
import AbstractService from './abstractService'
|
||||
import AttachmentModel from '../models/attachment'
|
||||
|
||||
@ -19,7 +17,7 @@ export default class AttachmentService extends AbstractService<IAttachment> {
|
||||
processModel(model: IAttachment) {
|
||||
return {
|
||||
...model,
|
||||
created: formatISO(new Date(model.created)),
|
||||
created: new Date(model.created).toISOString(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
import AbstractService from './abstractService'
|
||||
import LabelModel from '@/models/label'
|
||||
import type {ILabel} from '@/modelTypes/ILabel'
|
||||
import {formatISO} from 'date-fns'
|
||||
import {colorFromHex} from '@/helpers/color/colorFromHex'
|
||||
|
||||
export default class LabelService extends AbstractService<ILabel> {
|
||||
@ -16,8 +15,8 @@ export default class LabelService extends AbstractService<ILabel> {
|
||||
}
|
||||
|
||||
processModel(label) {
|
||||
label.created = formatISO(new Date(label.created))
|
||||
label.updated = formatISO(new Date(label.updated))
|
||||
label.created = new Date(label.created).toISOString()
|
||||
label.updated = new Date(label.updated).toISOString()
|
||||
label.hexColor = colorFromHex(label.hexColor)
|
||||
return label
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
import AbstractService from '@/services/abstractService'
|
||||
import {formatISO} from 'date-fns'
|
||||
import NotificationModel from '@/models/notification'
|
||||
import type {INotification} from '@/modelTypes/INotification'
|
||||
|
||||
@ -16,8 +15,8 @@ export default class NotificationService extends AbstractService<INotification>
|
||||
}
|
||||
|
||||
beforeUpdate(model) {
|
||||
model.created = formatISO(new Date(model.created))
|
||||
model.readAt = formatISO(new Date(model.readAt))
|
||||
model.created = new Date(model.created).toISOString()
|
||||
model.readAt = new Date(model.readAt).toISOString()
|
||||
return model
|
||||
}
|
||||
}
|
@ -4,13 +4,12 @@ import type {ITask} from '@/modelTypes/ITask'
|
||||
import AttachmentService from './attachment'
|
||||
import LabelService from './label'
|
||||
|
||||
import {formatISO} from 'date-fns'
|
||||
import {colorFromHex} from '@/helpers/color/colorFromHex'
|
||||
import {SECONDS_A_DAY, SECONDS_A_HOUR, SECONDS_A_WEEK, SECONDS_A_MONTH, SECONDS_A_YEAR} from '@/constants/date'
|
||||
|
||||
const parseDate = date => {
|
||||
if (date) {
|
||||
return formatISO(new Date(date))
|
||||
return new Date(date).toISOString()
|
||||
}
|
||||
|
||||
return null
|
||||
@ -52,8 +51,8 @@ export default class TaskService extends AbstractService<ITask> {
|
||||
model.startDate = parseDate(model.startDate)
|
||||
model.endDate = parseDate(model.endDate)
|
||||
model.doneAt = parseDate(model.doneAt)
|
||||
model.created = formatISO(new Date(model.created))
|
||||
model.updated = formatISO(new Date(model.updated))
|
||||
model.created = new Date(model.created).toISOString()
|
||||
model.updated = new Date(model.updated).toISOString()
|
||||
|
||||
// remove all nulls, these would create empty reminders
|
||||
for (const index in model.reminderDates) {
|
||||
@ -65,7 +64,7 @@ export default class TaskService extends AbstractService<ITask> {
|
||||
// Make normal timestamps from js dates
|
||||
if (model.reminderDates.length > 0) {
|
||||
model.reminderDates = model.reminderDates.map(r => {
|
||||
return formatISO(new Date(r))
|
||||
return new Date(r).toISOString()
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
import {computed, ref} from 'vue'
|
||||
import {acceptHMRUpdate, defineStore} from 'pinia'
|
||||
import router from '@/router'
|
||||
import {formatISO} from 'date-fns'
|
||||
|
||||
import TaskService from '@/services/task'
|
||||
import TaskAssigneeService from '@/services/taskAssignee'
|
||||
@ -392,7 +391,7 @@ export const useTaskStore = defineStore('task', () => {
|
||||
const assignees = await findAssignees(parsedTask.assignees)
|
||||
|
||||
// I don't know why, but it all goes up in flames when I just pass in the date normally.
|
||||
const dueDate = parsedTask.date !== null ? formatISO(parsedTask.date) : null
|
||||
const dueDate = parsedTask.date !== null ? new Date(parsedTask.date).toISOString() : null
|
||||
|
||||
const task = new TaskModel({
|
||||
title: parsedTask.text,
|
||||
|
Reference in New Issue
Block a user