Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: redefine the actuator page as the overview page #5509

Merged
merged 2 commits into from Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/console-src/layouts/BasicLayout.vue
Expand Up @@ -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>
Expand Down
Expand Up @@ -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) || "",
},
{
Expand All @@ -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,
Expand Down Expand Up @@ -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>
Expand All @@ -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"
Expand All @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -331,15 +331,15 @@ 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>
<div class="border-t border-gray-200">
<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}`"
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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()">
Expand Down
@@ -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,
Expand All @@ -25,8 +25,8 @@ export default definePlugin({
children: [
{
path: "",
name: "Actuator",
component: Actuator,
name: "Overview",
component: Overview,
},
],
},
Expand Down
6 changes: 3 additions & 3 deletions ui/src/locales/en.yaml
Expand Up @@ -86,7 +86,7 @@ core:
plugins: Plugins
users: Users
settings: Settings
actuator: Actuator
overview: Overview
backup: Backup
tools: Tools
operations:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ui/src/locales/es.yaml
Expand Up @@ -69,7 +69,7 @@ core:
plugins: Complementos
users: Usuarios
settings: Configuraciones
actuator: Actuador
overview: Visión general
backup: Respaldo
operations:
logout:
Expand Down Expand Up @@ -953,8 +953,8 @@ core:
authentication_url: URL de inicio de sesión
setting:
title: Configuraciones
actuator:
title: Actuador
overview:
title: Visión general
actions:
copy:
toast_browser_not_supported: El navegador actual no admite la función de copiado
Expand Down
4 changes: 2 additions & 2 deletions ui/src/locales/zh-CN.yaml
Expand Up @@ -84,7 +84,7 @@ core:
plugins: 插件
users: 用户
settings: 设置
actuator: 概览
overview: 概览
backup: 备份
tools: 工具
operations:
Expand Down Expand Up @@ -1113,7 +1113,7 @@ core:
description: 确定要删除该消息吗?
setting:
title: 设置
actuator:
overview:
title: 系统概览
actions:
copy:
Expand Down
4 changes: 2 additions & 2 deletions ui/src/locales/zh-TW.yaml
Expand Up @@ -84,7 +84,7 @@ core:
plugins: 插件
users: 用戶
settings: 設置
actuator: 概覽
overview: 概覽
backup: 備份
tools: 工具
operations:
Expand Down Expand Up @@ -1101,7 +1101,7 @@ core:
title: 刪除訊息
setting:
title: 設置
actuator:
overview:
title: 系統概覽
actions:
copy:
Expand Down