V1.1.5

- Fix critical bug when emitting global event bus - Add Exit DenoMan button - Enhanced terminal tab
fakoua · Feb 20, 2024 · 4b7cbbc · 4b7cbbc
1 parent 54aec4a
commit 4b7cbbc
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 76 deletions.
diff --git a/q-manui/package.json b/q-manui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "q-manui",
-  "version": "1.1.4",
-  "description": "DenoMan 1.1.4",
+  "version": "1.1.5",
+  "description": "DenoMan 1.1.5",
   "productName": "DenoMan",
   "author": "Sameh Fakoua <s.fakoua@gmail.com>",
   "private": true,

diff --git a/q-manui/src/components/ServerComponent.vue b/q-manui/src/components/ServerComponent.vue
@@ -199,22 +199,21 @@ export default defineComponent({
     },
   },
 
-  setup() {
+  setup(props) {
     const doubleClickedService = ref<ServiceModel | undefined>(undefined);
     const selectedService = ref<ServiceModel | undefined>(undefined);
     const isDialogOpen = ref(false);
     const serviceWindow = ref<HTMLDialogElement | null>(null);
 
     onMounted(async () => {
-      bus.on('controlService', async () => {
+      bus.on(`${props.host.hostname}:controlService`, async () => {
         if (isDialogOpen.value) {
-          //(serviceWindow.value as HTMLDialogElement).close();
           if (serviceWindow.value) {
             serviceWindow.value.close();
           }
         }
       });
-      bus.on('serviceChanged', (service) => {
+      bus.on(`${props.host.hostname}:serviceChanged`, (service) => {
         selectedService.value = service;
         if (isDialogOpen.value) {
           doubleClickedService.value = service;

diff --git a/q-manui/src/components/performance/PerfmonComponent.vue b/q-manui/src/components/performance/PerfmonComponent.vue
@@ -72,6 +72,8 @@
 
 <script lang="ts">
 import { PropType, defineComponent, onMounted, onUnmounted, ref } from 'vue';
+import { bus } from 'boot/bus';
+
 import CpuComponent from './CpuComponent.vue';
 import MemoryComponent from './MemoryComponent.vue';
 import DiskComponent from './DiskComponent.vue';
@@ -139,6 +141,12 @@ export default defineComponent({
     onMounted(async () => {
       systemInfo.value = await loadSystem();
       await updateData();
+      bus.on('app:shutdown', () => {
+        if (timeoutId !== -1) {
+          runTimer = false;
+          window.clearTimeout(timeoutId);
+        }
+      });
     });
 
     onUnmounted(() => {

diff --git a/q-manui/src/components/service-window/GeneralTabComponent.vue b/q-manui/src/components/service-window/GeneralTabComponent.vue
@@ -115,7 +115,7 @@ div.footer {
 import { PropType, defineComponent } from 'vue';
 import { bus } from 'boot/bus';
 
-import { ControlAction, ServiceModel } from '../models';
+import { ControlAction, ServiceModel, WinRMPayload } from '../models';
 
 export default defineComponent({
   name: 'GeneralTabComponent',
@@ -125,11 +125,15 @@ export default defineComponent({
       type: Object as PropType<ServiceModel>,
       required: false,
     },
+    host: {
+      type: Object as PropType<WinRMPayload>,
+      required: true,
+    },
   },
 
   methods: {
     async controlService(action: ControlAction) {
-      bus.emit('controlService', {
+      bus.emit(`${this.host.hostname}:controlService`, {
         action: action,
         name: this.service?.name,
       });

diff --git a/q-manui/src/components/service-window/ServiceDetailsComponent.vue b/q-manui/src/components/service-window/ServiceDetailsComponent.vue
@@ -190,7 +190,7 @@ export default defineComponent({
       this.$emit('onOpenService', this.service);
     },
     async controlService(action: ControlAction) {
-      bus.emit('controlService', {
+      bus.emit(`${this.host.hostname}:controlService`, {
         action: action,
         name: this.service?.name,
       });

diff --git a/q-manui/src/components/service-window/ServiceWindowComponent.vue b/q-manui/src/components/service-window/ServiceWindowComponent.vue
@@ -22,6 +22,7 @@
           <q-tab-panel name="general">
             <general-tab-component
               :service="service"
+              :host="host"
               v-on:on-hide-dialog="$emit('onHideDialog')"
               v-on:on-show-dialog="
                 (svr) => {

diff --git a/q-manui/src/components/service-window/ServicesListComponent.vue b/q-manui/src/components/service-window/ServicesListComponent.vue
@@ -438,7 +438,7 @@ export default defineComponent({
     },
     controlService(action: ControlAction) {
       if (this.selected && this.selected.length > 0) {
-        bus.emit('controlService', {
+        bus.emit(`${this.host.hostname}:controlService`, {
           action: action,
           name: (this.selected[0] as ServiceModel).name,
         });
@@ -544,15 +544,15 @@ export default defineComponent({
       isLoading.value = false;
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      bus.on('controlService', async (action: any) => {
+      bus.on(`${props.host.hostname}:controlService`, async (action: any) => {
         $q.loading.show();
         const res = await serviceApi.controlService(
           props.host,
           action.action,
           action.name,
         );
         await loadServices();
-        bus.emit('serviceChanged', res);
+        bus.emit(`${props.host.hostname}:serviceChanged`, res);
         if (res) {
           setDisabledControls(res);
         }