From e6db6f70f5b4d1e94364b66dfd413117f91feb26 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Fri, 14 Jul 2023 21:11:30 +0200 Subject: [PATCH] Fix datetime string handler not matching default value for format option (#19168) * Default format to `long` to match display value Fixes #19152 * Add changeset --- .changeset/selfish-berries-whisper.md | 6 ++++++ app/src/displays/datetime/index.ts | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .changeset/selfish-berries-whisper.md diff --git a/.changeset/selfish-berries-whisper.md b/.changeset/selfish-berries-whisper.md new file mode 100644 index 0000000000..09d9d1528b --- /dev/null +++ b/.changeset/selfish-berries-whisper.md @@ -0,0 +1,6 @@ +--- +'@directus/app': patch +--- + +Fixed an issue that would prevent the "Download Page as CSV" option to function when using a datetime display with +missing options diff --git a/app/src/displays/datetime/index.ts b/app/src/displays/datetime/index.ts index e5483f72b5..f15a25ca80 100644 --- a/app/src/displays/datetime/index.ts +++ b/app/src/displays/datetime/index.ts @@ -35,16 +35,16 @@ export default defineDisplay({ } else { let format; - if (options?.format === 'long') { + if (options?.format === undefined || options.format === 'long') { format = `${i18n.global.t('date-fns_date')} ${i18n.global.t('date-fns_time')}`; if (field?.type === 'date') format = String(i18n.global.t('date-fns_date')); if (field?.type === 'time') format = String(i18n.global.t('date-fns_time')); - } else if (options?.format === 'short') { + } else if (options.format === 'short') { format = `${i18n.global.t('date-fns_date_short')} ${i18n.global.t('date-fns_time_short')}`; if (field?.type === 'date') format = String(i18n.global.t('date-fns_date_short')); if (field?.type === 'time') format = String(i18n.global.t('date-fns_time_short')); } else { - format = options?.format; + format = options.format; } return localizedFormat(value, format);