From 641d66bb147915d0b7cdc3e2b7eef2ad123a63c0 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 3 Dec 2024 20:04:59 +0530 Subject: [PATCH 1/4] fix: replaced luxon with dayjs --- frontend/src/utils/index.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js index b0e44f5e..744b5579 100644 --- a/frontend/src/utils/index.js +++ b/frontend/src/utils/index.js @@ -3,7 +3,7 @@ import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue' import { usersStore } from '@/stores/users' import { gemoji } from 'gemoji' import { useTimeAgo } from '@vueuse/core' -import { toast, convertToUserTimezone, luxonDate } from 'frappe-ui' +import { toast, dayjsLocal, dayjs } from 'frappe-ui' import { h } from 'vue' export function createToast(options) { @@ -39,8 +39,9 @@ export function formatTime(seconds) { } export function formatDate(date, format, onlyDate = false, onlyTime = false) { + if (!date) return '' format = getFormat(date, format, onlyDate, onlyTime, false) - return convertToUserTimezone(date, format) + return dayjsLocal(date).format(format) } export function getFormat( @@ -52,16 +53,19 @@ export function getFormat( ) { if (!date) return '' let dateFormat = - window.sysdefaults.date_format.replace('mm', 'MM') || 'yyyy-MM-dd' + window.sysdefaults.date_format + .replace('mm', 'MM') + .replace('yyyy', 'YYYY') + .replace('dd', 'DD') || 'YYYY-MM-DD' let timeFormat = window.sysdefaults.time_format || 'HH:mm:ss' - format = format || 'EEE, MMM d, yyyy h:mm a' + format = format || 'ddd, MMM d, YYYY h:mm a' if (onlyDate) format = dateFormat if (onlyTime) format = timeFormat if (onlyTime && onlyDate) format = `${dateFormat} ${timeFormat}` if (withDate) { - return luxonDate(date).toFormat(format) + return dayjs(date).format(format) } return format } From d2f99bae7561a9e977a490970abc73600b73fd90 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 3 Dec 2024 20:06:04 +0530 Subject: [PATCH 2/4] fix: updated date format to support dayjs --- frontend/src/components/Activities/CallArea.vue | 2 +- frontend/src/components/Activities/TaskArea.vue | 4 ++-- frontend/src/components/Activities/WhatsAppArea.vue | 2 +- frontend/src/components/FilesUploader/FilesUploaderArea.vue | 2 +- frontend/src/components/ListViews/TasksListView.vue | 4 ++-- frontend/src/pages/Tasks.vue | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Activities/CallArea.vue b/frontend/src/components/Activities/CallArea.vue index ee65bca4..48fe6f72 100644 --- a/frontend/src/components/Activities/CallArea.vue +++ b/frontend/src/components/Activities/CallArea.vue @@ -56,7 +56,7 @@
- + diff --git a/frontend/src/components/Activities/TaskArea.vue b/frontend/src/components/Activities/TaskArea.vue index 95b6990d..16fad217 100644 --- a/frontend/src/components/Activities/TaskArea.vue +++ b/frontend/src/components/Activities/TaskArea.vue @@ -19,11 +19,11 @@
-
{{ formatDate(task.due_date, 'd MMM, hh:mm a') }}
+
{{ formatDate(task.due_date, 'D MMM, hh:mm a') }}
diff --git a/frontend/src/components/Activities/WhatsAppArea.vue b/frontend/src/components/Activities/WhatsAppArea.vue index 91511f53..d704189b 100644 --- a/frontend/src/components/Activities/WhatsAppArea.vue +++ b/frontend/src/components/Activities/WhatsAppArea.vue @@ -127,7 +127,7 @@ />
- +
{{ formatDate(whatsapp.creation, 'hh:mm a') }}
diff --git a/frontend/src/components/FilesUploader/FilesUploaderArea.vue b/frontend/src/components/FilesUploader/FilesUploaderArea.vue index 473ddb35..8768f4e8 100644 --- a/frontend/src/components/FilesUploader/FilesUploaderArea.vue +++ b/frontend/src/components/FilesUploader/FilesUploaderArea.vue @@ -242,7 +242,7 @@ function captureImage() { } function uploadViaCamera() { - const nowDatetime = formatDate(new Date(), 'yyyy_MM_dd_HH_mm_ss') + const nowDatetime = formatDate(new Date(), 'YYYY_MM_DD_HH_mm_ss') let filename = `capture_${nowDatetime}.png` urlToFile(cameraImage.value, filename, 'image/png').then((file) => { addFiles([file]) diff --git a/frontend/src/components/ListViews/TasksListView.vue b/frontend/src/components/ListViews/TasksListView.vue index 347e7ed0..186e76b3 100644 --- a/frontend/src/components/ListViews/TasksListView.vue +++ b/frontend/src/components/ListViews/TasksListView.vue @@ -40,12 +40,12 @@ >
- {{ formatDate(item, 'd MMM, hh:mm a') }} + {{ formatDate(item, 'D MMM, hh:mm a') }}
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue index e86de996..0349c876 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -266,7 +266,7 @@ function parseRows(rows, columns = []) { if ( fieldType && ['Date', 'Datetime'].includes(fieldType) && - !['modified', 'creation'].includes(row) + !['modified', 'creation', 'due_date'].includes(row) ) { _rows[row] = formatDate(task[row], '', true, fieldType == 'Datetime') } From ba002c419e4f1379b513e65e5792f98ed4d8d108 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 3 Dec 2024 20:06:53 +0530 Subject: [PATCH 3/4] fix: set config to make timezone available in frappe-ui --- frontend/src/App.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index b735b073..aa666b0a 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,7 +9,7 @@ From c8999a0cc1005b54a49dbd5ca2d5ab70d6cc9922 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Dec 2024 16:34:37 +0530 Subject: [PATCH 4/4] build(deps): bump frappeui to 0.1.90 --- frontend/package.json | 2 +- frontend/src/App.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d91fa865..b481b37d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,7 +14,7 @@ "@vueuse/core": "^10.3.0", "@vueuse/integrations": "^10.3.0", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.89", + "frappe-ui": "^0.1.90", "gemoji": "^8.1.0", "lodash": "^4.17.21", "mime": "^4.0.1", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index aa666b0a..02c42926 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -26,5 +26,6 @@ const Layout = computed(() => { } }) -setConfig('timezone', window.timezone) +setConfig('systemTimezone', window.timezone?.system || null) +setConfig('localTimezone', window.timezone?.user || null)