From 26f6c28c71553725221b89f3fabb890ccc536c64 Mon Sep 17 00:00:00 2001
From: iamvann <sovannsean9@gmail.com>
Date: Fri, 16 May 2025 23:27:25 +0800
Subject: [PATCH] fix: add import server to editable_text.js

---
 src/public/app/services/utils.js                     | 12 +++++++-----
 src/public/app/widgets/type_widgets/editable_text.js |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js
index 59e7f22c4..99871035a 100644
--- a/src/public/app/services/utils.js
+++ b/src/public/app/services/utils.js
@@ -81,23 +81,25 @@ function formatDateISO(date) {
 // In utils.js
 // import dayjs from 'dayjs'; // Assuming dayjs is available in this scope
 
+// new version
 function formatDateTime(date, userSuppliedFormat) {
-    const DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
-    let formatToUse = DEFAULT_FORMAT; 
+    let formatToUse;
 
     if (userSuppliedFormat && typeof userSuppliedFormat === 'string' && userSuppliedFormat.trim() !== "") {
         formatToUse = userSuppliedFormat.trim();
+    } else {
+        formatToUse = 'YYYY-MM-DD HH:mm'; // Trilium's default format
     }
 
     if (!date) {
-        date = new Date(); 
+        date = new Date();
     }
 
     try {
         return dayjs(date).format(formatToUse);
     } catch (e) {
-        console.warn(`Trilium: Day.js encountered an error with format string "${formatToUse}". Falling back to default. Error: ${e.message}`);
-        return dayjs(date).format(DEFAULT_FORMAT); 
+        console.warn(`Day.js: Invalid format string "${formatToUse}". Falling back. Error:`, e.message);
+        return dayjs(date).format('YYYY-MM-DD HH:mm');
     }
 }
 
diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index 1867a58d9..897add401 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -9,6 +9,7 @@ import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
 import link from "../../services/link.js";
 import appContext from "../../components/app_context.js";
 import dialogService from "../../services/dialog.js";
+import server from '../../services/server.js';
 
 const ENABLE_INSPECTOR = false;