From c1adcfbfc2e9b71a37cf4bf7ec1cb7f6ad1b5442 Mon Sep 17 00:00:00 2001 From: Vivek Pandey <52068103+Vivek-Py@users.noreply.github.com> Date: Sat, 26 Jul 2025 13:36:51 +0530 Subject: [PATCH] feat(ui): Convert interval seconds to days, hours, minutes, and seconds (#5220) Co-authored-by: Frank Elsinga --- server/server.js | 11 + src/mixins/lang.js | 10 +- src/pages/Details.vue | 466 +++++++++++++++++++++++++++++--------- src/pages/EditMonitor.vue | 8 +- src/util-frontend.js | 75 ++++++ 5 files changed, 463 insertions(+), 107 deletions(-) diff --git a/server/server.js b/server/server.js index 3fd0585d4..55289b55a 100644 --- a/server/server.js +++ b/server/server.js @@ -720,6 +720,17 @@ let needSetup = false; monitor.rabbitmqNodes = JSON.stringify(monitor.rabbitmqNodes); + /* + * List of frontend-only properties that should not be saved to the database. + * Should clean up before saving to the database. + */ + const frontendOnlyProperties = [ "humanReadableInterval" ]; + for (const prop of frontendOnlyProperties) { + if (prop in monitor) { + delete monitor[prop]; + } + } + bean.import(monitor); bean.user_id = socket.userID; diff --git a/src/mixins/lang.js b/src/mixins/lang.js index 9061e7d3d..0fff8cdc8 100644 --- a/src/mixins/lang.js +++ b/src/mixins/lang.js @@ -1,5 +1,5 @@ import { currentLocale } from "../i18n"; -import { setPageLocale } from "../util-frontend"; +import { setPageLocale, relativeTimeFormatter } from "../util-frontend"; const langModules = import.meta.glob("../lang/*.json"); export default { @@ -28,11 +28,13 @@ export default { * @returns {Promise} */ async changeLang(lang) { - let message = (await langModules["../lang/" + lang + ".json"]()).default; + let message = (await langModules["../lang/" + lang + ".json"]()) + .default; this.$i18n.setLocaleMessage(lang, message); this.$i18n.locale = lang; localStorage.locale = lang; setPageLocale(); - } - } + relativeTimeFormatter.updateLocale(lang); + }, + }, }; diff --git a/src/pages/Details.vue b/src/pages/Details.vue index 1d068b92e..732d58e31 100644 --- a/src/pages/Details.vue +++ b/src/pages/Details.vue @@ -1,7 +1,9 @@