From 022580bbb244f5b9c09eda3d83238cc46f141ad9 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 6 Jan 2025 18:16:22 +0800
Subject: [PATCH] feat(common): Standardize Event Bus (#7650)

---
 agent/cmd/server/nginx_conf/website_default.conf         | 3 +--
 frontend/src/components/task-log/index.vue               | 2 ++
 frontend/src/{views/app-store => global}/bus.ts          | 0
 frontend/src/layout/components/Sidebar/index.vue         | 7 +++++++
 frontend/src/layout/index.vue                            | 2 +-
 frontend/src/views/app-store/detail/install/index.vue    | 5 ++---
 frontend/src/views/app-store/index.vue                   | 2 +-
 frontend/src/views/app-store/installed/delete/index.vue  | 2 +-
 frontend/src/views/app-store/installed/upgrade/index.vue | 2 +-
 9 files changed, 16 insertions(+), 9 deletions(-)
 rename frontend/src/{views/app-store => global}/bus.ts (100%)

diff --git a/agent/cmd/server/nginx_conf/website_default.conf b/agent/cmd/server/nginx_conf/website_default.conf
index 57c439312..a965fb53e 100644
--- a/agent/cmd/server/nginx_conf/website_default.conf
+++ b/agent/cmd/server/nginx_conf/website_default.conf
@@ -16,8 +16,7 @@ server {
     access_log /www/sites/domain/log/access.log main;
     error_log /www/sites/domain/log/error.log;
 
-    location ^~ /.well-known/acme-challenge {
+    location ~ \.well-known{
         allow all;
-        root /usr/share/nginx/html;
     }
 }
diff --git a/frontend/src/components/task-log/index.vue b/frontend/src/components/task-log/index.vue
index 5d331e609..c0e08e35a 100644
--- a/frontend/src/components/task-log/index.vue
+++ b/frontend/src/components/task-log/index.vue
@@ -15,6 +15,7 @@
 </template>
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
+import bus from '@/global/bus';
 
 defineProps({
     showClose: {
@@ -50,6 +51,7 @@ const openWithTaskID = (id: string, tail: boolean) => {
         config.tail = tail;
     }
     open.value = true;
+    bus.emit('refreshTask', true);
 };
 
 const openWithResourceID = (taskType: string, taskOperate: string, resourceID: number) => {
diff --git a/frontend/src/views/app-store/bus.ts b/frontend/src/global/bus.ts
similarity index 100%
rename from frontend/src/views/app-store/bus.ts
rename to frontend/src/global/bus.ts
diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue
index 5559bd2b1..22e9e63c4 100644
--- a/frontend/src/layout/components/Sidebar/index.vue
+++ b/frontend/src/layout/components/Sidebar/index.vue
@@ -78,6 +78,7 @@ import { isString } from '@vueuse/core';
 import { getSettingInfo, listNodeOptions } from '@/api/modules/setting';
 import { countExecutingTask } from '@/api/modules/log';
 import { compareVersion } from '@/utils/version';
+import bus from '@/global/bus';
 
 const route = useRoute();
 const menuStore = MenuStore();
@@ -85,6 +86,12 @@ const globalStore = GlobalStore();
 const nodes = ref([]);
 const nodeChangeRef = ref<DropdownInstance>();
 const version = ref();
+
+bus.on('refreshTask', () => {
+    console.log('on bus message');
+    checkTask();
+});
+
 defineProps({
     menuRouter: {
         type: Boolean,
diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index 0bda024d9..c6443320d 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -25,8 +25,8 @@ import { getSystemAvailable } from '@/api/modules/setting';
 import { useRoute, useRouter } from 'vue-router';
 import { loadMasterProductProFromDB, loadProductProFromDB } from '@/utils/xpack';
 import { useTheme } from '@/global/use-theme';
-const { switchTheme } = useTheme();
 import TaskList from '@/components/task-list/index.vue';
+const { switchTheme } = useTheme();
 
 useResize();
 
diff --git a/frontend/src/views/app-store/detail/install/index.vue b/frontend/src/views/app-store/detail/install/index.vue
index 24a9a2276..2b81d207f 100644
--- a/frontend/src/views/app-store/detail/install/index.vue
+++ b/frontend/src/views/app-store/detail/install/index.vue
@@ -136,16 +136,15 @@ import TaskLog from '@/components/task-log/index.vue';
 import { newUUID } from '@/utils/util';
 import { computeSizeFromMB } from '@/utils/util';
 
-const router = useRouter();
-
 interface InstallRrops {
     params?: App.AppParams;
     app: any;
 }
-
 const installData = ref<InstallRrops>({
     app: {},
 });
+
+const router = useRouter();
 const open = ref(false);
 const rules = ref<FormRules>({
     name: [Rules.appName],
diff --git a/frontend/src/views/app-store/index.vue b/frontend/src/views/app-store/index.vue
index 573c4ada3..9a2bfaaf4 100644
--- a/frontend/src/views/app-store/index.vue
+++ b/frontend/src/views/app-store/index.vue
@@ -13,7 +13,7 @@
 import i18n from '@/lang';
 import { onMounted, ref } from 'vue';
 import { SearchAppInstalled } from '@/api/modules/app';
-import bus from './bus';
+import bus from '@/global/bus';
 let showButton = ref(false);
 
 const buttons = [
diff --git a/frontend/src/views/app-store/installed/delete/index.vue b/frontend/src/views/app-store/installed/delete/index.vue
index 211b6524d..0f182c326 100644
--- a/frontend/src/views/app-store/installed/delete/index.vue
+++ b/frontend/src/views/app-store/installed/delete/index.vue
@@ -49,7 +49,7 @@ import { onBeforeUnmount, ref } from 'vue';
 import { App } from '@/api/interface/app';
 import { InstalledOp } from '@/api/modules/app';
 import i18n from '@/lang';
-import bus from '../../bus';
+import bus from '@/global/bus';
 import TaskLog from '@/components/task-log/index.vue';
 import { v4 as uuidv4 } from 'uuid';
 
diff --git a/frontend/src/views/app-store/installed/upgrade/index.vue b/frontend/src/views/app-store/installed/upgrade/index.vue
index 20e1105fe..696f759c5 100644
--- a/frontend/src/views/app-store/installed/upgrade/index.vue
+++ b/frontend/src/views/app-store/installed/upgrade/index.vue
@@ -87,7 +87,7 @@ import { reactive, ref, onBeforeUnmount } from 'vue';
 import { MsgSuccess } from '@/utils/message';
 import { Rules } from '@/global/form-rules';
 import Diff from './diff/index.vue';
-import bus from '../../bus';
+import bus from '@/global/bus';
 import CodemirrorPro from '@/components/codemirror-pro/index.vue';
 import TaskLog from '@/components/task-log/index.vue';
 import { v4 as uuidv4 } from 'uuid';