From 25bb1eacba728b316c89068397463f01a5cfafb2 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Thu, 14 Mar 2024 12:33:30 +0800
Subject: [PATCH 1/2] chore: redefine the actuator page as the overview page

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 ui/console-src/layouts/BasicLayout.vue        |  2 +-
 .../Actuator.vue => overview/Overview.vue}    | 52 +++++++++----------
 .../system/{actuator => overview}/module.ts   | 14 ++---
 ui/src/locales/en.yaml                        |  6 +--
 ui/src/locales/es.yaml                        |  4 +-
 ui/src/locales/zh-CN.yaml                     |  4 +-
 ui/src/locales/zh-TW.yaml                     |  4 +-
 7 files changed, 43 insertions(+), 43 deletions(-)
 rename ui/console-src/modules/system/{actuator/Actuator.vue => overview/Overview.vue} (88%)
 rename ui/console-src/modules/system/{actuator => overview}/module.ts (66%)

diff --git a/ui/console-src/layouts/BasicLayout.vue b/ui/console-src/layouts/BasicLayout.vue
index 862179444f..c5f0ef4afc 100644
--- a/ui/console-src/layouts/BasicLayout.vue
+++ b/ui/console-src/layouts/BasicLayout.vue
@@ -209,7 +209,7 @@ onMounted(() => {
         class="mt-auto p-4 text-center text-sm"
       >
         <span class="text-gray-600">Powered by </span>
-        <RouterLink to="/actuator" class="hover:text-gray-600">
+        <RouterLink to="/overview" class="hover:text-gray-600">
           Halo
         </RouterLink>
       </footer>
diff --git a/ui/console-src/modules/system/actuator/Actuator.vue b/ui/console-src/modules/system/overview/Overview.vue
similarity index 88%
rename from ui/console-src/modules/system/actuator/Actuator.vue
rename to ui/console-src/modules/system/overview/Overview.vue
index 4f0b898720..475213a730 100644
--- a/ui/console-src/modules/system/actuator/Actuator.vue
+++ b/ui/console-src/modules/system/overview/Overview.vue
@@ -110,25 +110,25 @@ interface CopyItem {
 
 const handleCopy = () => {
   if (!isSupported.value) {
-    Toast.warning(t("core.actuator.actions.copy.toast_browser_not_supported"));
+    Toast.warning(t("core.overview.actions.copy.toast_browser_not_supported"));
     return;
   }
 
   const copyItems: CopyItem[] = [
     {
-      label: t("core.actuator.fields.external_url"),
+      label: t("core.overview.fields.external_url"),
       value: globalInfo.value?.externalUrl || "",
     },
     {
-      label: t("core.actuator.fields.start_time"),
+      label: t("core.overview.fields.start_time"),
       value: formatDatetime(startup.value?.timeline.startTime) || "",
     },
     {
-      label: t("core.actuator.fields.version"),
+      label: t("core.overview.fields.version"),
       value: info.value?.build?.version || "",
     },
     {
-      label: t("core.actuator.fields.build_time"),
+      label: t("core.overview.fields.build_time"),
       value: formatDatetime(info.value?.build?.time) || "",
     },
     {
@@ -144,28 +144,28 @@ const handleCopy = () => {
           .trim() || "",
     },
     {
-      label: t("core.actuator.fields.database"),
+      label: t("core.overview.fields.database"),
       value:
         [info.value?.database.name, info.value?.database.version]
           .filter(Boolean)
           .join(" / ") || "",
     },
     {
-      label: t("core.actuator.fields.os"),
+      label: t("core.overview.fields.os"),
       value:
         [info.value?.os.name, info.value?.os.version]
           .filter(Boolean)
           .join(" / ") || "",
     },
     {
-      label: t("core.actuator.fields.activated_theme"),
+      label: t("core.overview.fields.activated_theme"),
       value: themeStore.activatedTheme?.spec.displayName || "",
       href:
         themeStore.activatedTheme?.spec.repo ||
         themeStore.activatedTheme?.spec.homepage,
     },
     {
-      label: t("core.actuator.fields.enabled_plugins"),
+      label: t("core.overview.fields.enabled_plugins"),
       children: plugins.value?.map((plugin) => ({
         value: plugin.spec.displayName,
         href: plugin.spec.repo || plugin.spec.homepage,
@@ -223,7 +223,7 @@ const handleDownloadLogfile = () => {
 </script>
 
 <template>
-  <VPageHeader :title="$t('core.actuator.title')">
+  <VPageHeader :title="$t('core.overview.title')">
     <template #icon>
       <IconTerminalBoxLine class="mr-2 self-center" />
     </template>
@@ -245,18 +245,18 @@ const handleDownloadLogfile = () => {
         >
           <div>
             <h3 class="text-lg font-medium leading-6 text-gray-900">
-              {{ $t("core.actuator.header.titles.general") }}
+              {{ $t("core.overview.header.titles.general") }}
             </h3>
           </div>
         </div>
         <div class="border-t border-gray-200">
           <VDescription>
-            <VDescriptionItem :label="$t('core.actuator.fields.external_url')">
+            <VDescriptionItem :label="$t('core.overview.fields.external_url')">
               <span v-if="globalInfo?.externalUrl">
                 {{ globalInfo?.externalUrl }}
               </span>
               <span v-else>
-                {{ $t("core.actuator.fields_values.external_url.not_setup") }}
+                {{ $t("core.overview.fields_values.external_url.not_setup") }}
               </span>
               <VAlert
                 v-if="!isExternalUrlValid"
@@ -266,18 +266,18 @@ const handleDownloadLogfile = () => {
                 :closable="false"
               >
                 <template #description>
-                  {{ $t("core.actuator.alert.external_url_invalid") }}
+                  {{ $t("core.overview.alert.external_url_invalid") }}
                 </template>
               </VAlert>
             </VDescriptionItem>
             <VDescriptionItem
               v-if="startup?.timeline.startTime"
-              :label="$t('core.actuator.fields.start_time')"
+              :label="$t('core.overview.fields.start_time')"
               :content="formatDatetime(startup?.timeline.startTime)"
             />
             <VDescriptionItem
               v-if="themeStore.activatedTheme"
-              :label="$t('core.actuator.fields.activated_theme')"
+              :label="$t('core.overview.fields.activated_theme')"
             >
               <VTag @click="$router.push({ name: 'ThemeDetail' })">
                 <template v-if="themeStore.activatedTheme.spec.logo" #leftIcon>
@@ -292,7 +292,7 @@ const handleDownloadLogfile = () => {
             </VDescriptionItem>
             <VDescriptionItem
               v-permission="['system:plugins:view']"
-              :label="$t('core.actuator.fields.enabled_plugins')"
+              :label="$t('core.overview.fields.enabled_plugins')"
             >
               <VLoading v-if="isPluginsLoading" />
               <span v-else-if="!plugins?.length">
@@ -331,7 +331,7 @@ const handleDownloadLogfile = () => {
         >
           <div>
             <h3 class="text-lg font-medium leading-6 text-gray-900">
-              {{ $t("core.actuator.header.titles.environment") }}
+              {{ $t("core.overview.header.titles.environment") }}
             </h3>
           </div>
         </div>
@@ -339,7 +339,7 @@ const handleDownloadLogfile = () => {
           <VDescription>
             <VDescriptionItem
               v-if="info.build"
-              :label="$t('core.actuator.fields.version')"
+              :label="$t('core.overview.fields.version')"
             >
               <a
                 :href="`https://github.com/halo-dev/halo/releases/tag/v${info.build.version}`"
@@ -351,7 +351,7 @@ const handleDownloadLogfile = () => {
             </VDescriptionItem>
             <VDescriptionItem
               v-if="info.build"
-              :label="$t('core.actuator.fields.build_time')"
+              :label="$t('core.overview.fields.build_time')"
               :content="formatDatetime(info.build.time)"
             />
             <VDescriptionItem v-if="info.git" label="Git Commit">
@@ -369,7 +369,7 @@ const handleDownloadLogfile = () => {
                 [info.java.runtime.name, info.java.runtime.version].join(' / ')
               "
             />
-            <VDescriptionItem :label="$t('core.actuator.fields.database')">
+            <VDescriptionItem :label="$t('core.overview.fields.database')">
               <span>
                 {{ [info.database.name, info.database.version].join(" / ") }}
               </span>
@@ -381,23 +381,23 @@ const handleDownloadLogfile = () => {
                 :closable="false"
               >
                 <template #description>
-                  {{ $t("core.actuator.alert.h2_warning") }}
+                  {{ $t("core.overview.alert.h2_warning") }}
                 </template>
               </VAlert>
             </VDescriptionItem>
-            <VDescriptionItem :label="$t('core.actuator.fields.os')">
+            <VDescriptionItem :label="$t('core.overview.fields.os')">
               {{ info.os.name }} {{ info.os.version }} / {{ info.os.arch }}
             </VDescriptionItem>
             <VDescriptionItem
-              :label="$t('core.actuator.fields.timezone')"
+              :label="$t('core.overview.fields.timezone')"
               :content="globalInfo?.timeZone"
             />
             <VDescriptionItem
-              :label="$t('core.actuator.fields.locale')"
+              :label="$t('core.overview.fields.locale')"
               :content="globalInfo?.locale"
             />
             <VDescriptionItem
-              :label="$t('core.actuator.fields.log')"
+              :label="$t('core.overview.fields.log')"
               vertical-center
             >
               <VButton size="sm" @click="handleDownloadLogfile()">
diff --git a/ui/console-src/modules/system/actuator/module.ts b/ui/console-src/modules/system/overview/module.ts
similarity index 66%
rename from ui/console-src/modules/system/actuator/module.ts
rename to ui/console-src/modules/system/overview/module.ts
index ffa9e38073..3a2f592562 100644
--- a/ui/console-src/modules/system/actuator/module.ts
+++ b/ui/console-src/modules/system/overview/module.ts
@@ -1,22 +1,22 @@
 import { definePlugin } from "@halo-dev/console-shared";
 import { IconTerminalBoxLine } from "@halo-dev/components";
 import BasicLayout from "@console/layouts/BasicLayout.vue";
-import Actuator from "./Actuator.vue";
+import Overview from "./Overview.vue";
 import { markRaw } from "vue";
 
 export default definePlugin({
   components: {},
   routes: [
     {
-      path: "/actuator",
-      name: "OverviewRoot", // fixme: actuator will be renamed to overview in the future
+      path: "/overview",
+      name: "OverviewRoot",
       component: BasicLayout,
       meta: {
-        title: "core.actuator.title",
+        title: "core.overview.title",
         searchable: true,
         permissions: ["system:actuator:manage"],
         menu: {
-          name: "core.sidebar.menu.items.actuator",
+          name: "core.sidebar.menu.items.overview",
           group: "system",
           icon: markRaw(IconTerminalBoxLine),
           priority: 3,
@@ -25,8 +25,8 @@ export default definePlugin({
       children: [
         {
           path: "",
-          name: "Actuator",
-          component: Actuator,
+          name: "Overview",
+          component: Overview,
         },
       ],
     },
diff --git a/ui/src/locales/en.yaml b/ui/src/locales/en.yaml
index a1dc374c4a..cf4bb1888e 100644
--- a/ui/src/locales/en.yaml
+++ b/ui/src/locales/en.yaml
@@ -86,7 +86,7 @@ core:
         plugins: Plugins
         users: Users
         settings: Settings
-        actuator: Actuator
+        overview: Overview
         backup: Backup
         tools: Tools
     operations:
@@ -1171,8 +1171,8 @@ core:
         title: Delete
   setting:
     title: Settings
-  actuator:
-    title: Actuator
+  overview:
+    title: Overview
     actions:
       copy:
         toast_browser_not_supported: The current browser does not support copying
diff --git a/ui/src/locales/es.yaml b/ui/src/locales/es.yaml
index a77b1838b4..dc4b6e0824 100644
--- a/ui/src/locales/es.yaml
+++ b/ui/src/locales/es.yaml
@@ -69,7 +69,7 @@ core:
         plugins: Complementos
         users: Usuarios
         settings: Configuraciones
-        actuator: Actuador
+        overview: Actuador
         backup: Respaldo
     operations:
       logout:
@@ -953,7 +953,7 @@ core:
         authentication_url: URL de inicio de sesión
   setting:
     title: Configuraciones
-  actuator:
+  overview:
     title: Actuador
     actions:
       copy:
diff --git a/ui/src/locales/zh-CN.yaml b/ui/src/locales/zh-CN.yaml
index d4e5240221..bcb5cc581a 100644
--- a/ui/src/locales/zh-CN.yaml
+++ b/ui/src/locales/zh-CN.yaml
@@ -84,7 +84,7 @@ core:
         plugins: 插件
         users: 用户
         settings: 设置
-        actuator: 概览
+        overview: 概览
         backup: 备份
         tools: 工具
     operations:
@@ -1113,7 +1113,7 @@ core:
         description: 确定要删除该消息吗？
   setting:
     title: 设置
-  actuator:
+  overview:
     title: 系统概览
     actions:
       copy:
diff --git a/ui/src/locales/zh-TW.yaml b/ui/src/locales/zh-TW.yaml
index accf601d61..9163c6f8ed 100644
--- a/ui/src/locales/zh-TW.yaml
+++ b/ui/src/locales/zh-TW.yaml
@@ -84,7 +84,7 @@ core:
         plugins: 插件
         users: 用戶
         settings: 設置
-        actuator: 概覽
+        overview: 概覽
         backup: 備份
         tools: 工具
     operations:
@@ -1101,7 +1101,7 @@ core:
         title: 刪除訊息
   setting:
     title: 設置
-  actuator:
+  overview:
     title: 系統概覽
     actions:
       copy:

From 94c571c41b592b477f345146f8f9f43bfeaf2815 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Thu, 14 Mar 2024 16:33:41 +0800
Subject: [PATCH 2/2] Fix es i18n

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 ui/src/locales/es.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/locales/es.yaml b/ui/src/locales/es.yaml
index dc4b6e0824..28588bd148 100644
--- a/ui/src/locales/es.yaml
+++ b/ui/src/locales/es.yaml
@@ -69,7 +69,7 @@ core:
         plugins: Complementos
         users: Usuarios
         settings: Configuraciones
-        overview: Actuador
+        overview: Visión general
         backup: Respaldo
     operations:
       logout:
@@ -954,7 +954,7 @@ core:
   setting:
     title: Configuraciones
   overview:
-    title: Actuador
+    title: Visión general
     actions:
       copy:
         toast_browser_not_supported: El navegador actual no admite la función de copiado