clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-04-29 20:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nc-gui): combine date & dateTime convertCellData switch statement

Browse Source
This commit is contained in:
Ramesh Mane
2024-02-29 12:23:01 +00:00
parent 0e1bff094f
commit 283fac5c53
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/nc-gui/composables/useMultiSelect/convertCellData.ts
View File

@@ -55,38 +55,24 @@ export default function convertCellData(
if (strval === 'false' || strval === '0' || strval === '') return false
}
return null
case UITypes.Date: {
const isValid = validateDateWithUnknownFormat(value)
let parsedDate = dayjs(value, getDateTimeFormat(value))
if (isValid && !parsedDate.isValid()) {
parsedDate = dayjs(value, getDateFormat(value))
}
if (!(isValid && parsedDate.isValid())) {
if (isMultiple) {
return null
} else {
throw new Error('Not a valid date')
}
}
return parsedDate.format('YYYY-MM-DD')
}
case UITypes.Date:
case UITypes.DateTime: {
const isValid = validateDateWithUnknownFormat(value)
let parsedDateTime = dayjs(value, getDateTimeFormat(value))
if (isValid && !parsedDateTime.isValid()) {
parsedDateTime = dayjs(value, getDateFormat(value))
let parsedDateOrDateTime = dayjs(value, getDateTimeFormat(value))
if (!parsedDateOrDateTime.isValid()) {
parsedDateOrDateTime = dayjs(value, getDateFormat(value))
}
if (!(isValid && parsedDateTime.isValid())) {
if (!parsedDateOrDateTime.isValid()) {
if (isMultiple) {
return null
} else {
throw new Error('Not a valid datetime value')
throw new Error(`Not a valid '${to}' value`)
}
}
return parsedDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
return to === UITypes.Date
? parsedDateOrDateTime.format('YYYY-MM-DD')
: parsedDateOrDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
}
case UITypes.Time: {
let parsedTime = dayjs(value)