Merge events bus into a single one

SakiiR · Jul 19, 2021 · edd65c2 · edd65c2
1 parent 72535ca
commit edd65c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/dockers/manager/front/src/components/Docker/Volume/VolumeMenu.vue b/dockers/manager/front/src/components/Docker/Volume/VolumeMenu.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { DownloaderBus, UploaderBus } from "src/eventBus.js";
+import { GlobalBus } from "src/eventBus.js";
 import api from "src/api";
 export default {
  props: {
@@ -47,21 +47,21 @@ export default {
  }
  },
  methods: {
- async downloadFile() {
+ downloadFile() {
  const info = {
  volume: this.volumeName,
  path: this.node.fullpath,
  file: this.node.file
  };
- await DownloaderBus.$emit("startDownload", info);
+ GlobalBus.$emit("startFileDownload", info);
  },
- async uploadFile() {
+ uploadFile() {
  const info = {
  volume: this.volumeName,
  path: this.folderPath
  };
 
- UploaderBus.$emit("startUpload", info);
+ GlobalBus.$emit("startFileUpload", info);
  },
  async deleteFile() {
  const input = {

diff --git a/dockers/manager/front/src/components/Downloader.vue b/dockers/manager/front/src/components/Downloader.vue
@@ -21,12 +21,15 @@
 </template>
 
 <script>
-import { DownloaderBus } from "src/eventBus.js";
+import { GlobalBus } from "src/eventBus.js";
 
 export default {
  data: () => ({ value: 0, downloading: [] }),
  created() {
- DownloaderBus.$on("startDownload", (info) => this.downloadFile(info));
+ GlobalBus.$on("startFileDownload", this.downloadFile);
+ },
+ destroyed() {
+ GlobalBus.$off("startFileDownload", this.downloadFile);
  },
  methods: {
  downloadBlob(blob, downloadInfo) {

diff --git a/dockers/manager/front/src/components/Uploader.vue b/dockers/manager/front/src/components/Uploader.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { UploaderBus } from "src/eventBus.js";
+import { GlobalBus } from "src/eventBus.js";
 
 export default {
  props: {},
@@ -31,11 +31,14 @@ export default {
  }
  ]
  },
- created() {
- UploaderBus.$on("startUpload", info => this.startUpload(info));
+ created () {
+ GlobalBus.$on("startFileUpload", this.startUpload);
+ },
+ destroyed () {
+ GlobalBus.$off("startFileUpload", this.startUpload);
  },
  methods: {
- startUpload({ volume, path }) {
+ startUpload ({ volume, path }) {
  const params = new URLSearchParams({ volume, path });
  this.url = `/file/upload?${params}`;
  this.title = `Upload in ${path}`;