Merge pull request #40 from fdm-monster/bugfix/36-printers-placed-on-…

…grid-are-not-showing-up fix: printers are now placed and hot updated using floor.printers
fdm-monster · Apr 15, 2023 · 15cef69 · 15cef69
2 parents 44fffe1 + 613875a
commit 15cef69
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fdm-monster/client",
-  "version": "1.0.0-rc6",
+  "version": "1.0.0-rc7",
   "private": false,
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",

diff --git a/src/components/Generic/Dialogs/CreatePrinterDialog.vue b/src/components/Generic/Dialogs/CreatePrinterDialog.vue
@@ -52,7 +52,7 @@ import { generateInitials } from "@/constants/noun-adjectives.data";
 import { infoMessageEvent } from "@/event-bus/alert.events";
 import { usePrintersStore } from "@/store/printers.store";
 import { Printer } from "@/models/printers/printer.model";
-import { sseTestPrinterUpdate } from "@/event-bus/sse.events";
+import { sseTestPrinterUpdate } from "../../../event-bus/socketio.events";
 import {
   SocketIoTestPrinterMessage,
   TestProgressDetails,

diff --git a/src/components/Generic/Dialogs/UpdatePrinterDialog.vue b/src/components/Generic/Dialogs/UpdatePrinterDialog.vue
@@ -49,7 +49,7 @@
 import { defineComponent } from "vue";
 import { ValidationObserver } from "vee-validate";
 import { Printer } from "@/models/printers/printer.model";
-import { sseTestPrinterUpdate } from "@/event-bus/sse.events";
+import { sseTestPrinterUpdate } from "../../../event-bus/socketio.events";
 import {
   SocketIoTestPrinterMessage,
   TestProgressDetails,

diff --git a/src/components/PrinterGrid/PrinterGrid.vue b/src/components/PrinterGrid/PrinterGrid.vue
@@ -53,7 +53,7 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { sseGroups, sseMessageGlobal } from "@/event-bus/sse.events";
+import { socketIoFloors } from "../../event-bus/socketio.events";
 import PrinterGridTile from "@/components/PrinterGrid/PrinterGridTile.vue";
 import {
   largeGridcolumnCount,
@@ -129,15 +129,15 @@ export default defineComponent({
     updateGridMatrix() {
       this.printerMatrix = this.printersStore.gridSortedPrinters;
     },
-    onSseMessage() {
+    onSocketIoFloorMessage() {
       this.updateGridMatrix();
     },
   },
   async mounted() {
-    this.$bus.on(sseGroups, this.onSseMessage);
+    this.$bus.on(socketIoFloors, this.onSocketIoFloorMessage);
   },
   beforeDestroy() {
-    this.$bus.off(sseMessageGlobal, this.onSseMessage);
+    this.$bus.off(socketIoFloors, this.onSocketIoFloorMessage);
   },
 });
 </script>

diff --git a/src/event-bus/sse.events.ts → src/event-bus/socketio.events.ts b/src/event-bus/sse.events.ts → src/event-bus/socketio.events.ts
@@ -1,4 +1,4 @@
 export const sseMessageGlobal = "sse-message-global";
-export const sseGroups = "sse-groups";
+export const socketIoFloors = "sse-floors";
 export const sseTestPrinterUpdate = (correlationToken: string) =>
   `sse-message-test-printer-${correlationToken}`;
diff --git a/src/services/socketio.service.ts b/src/services/socketio.service.ts
@@ -1,11 +1,14 @@
 import { io, Socket } from "socket.io-client";
-import Vue from "vue";
 import { VueBus } from "vue-bus";
 import {
   SocketIoTestPrinterMessage,
   SocketIoUpdateMessage,
 } from "@/models/sse-messages/printer-sse-message.model";
-import { sseGroups, sseMessageGlobal, sseTestPrinterUpdate } from "@/event-bus/sse.events";
+import {
+  socketIoFloors,
+  sseMessageGlobal,
+  sseTestPrinterUpdate,
+} from "../event-bus/socketio.events";
 import { InfoEventType, uploadMessageEvent } from "@/event-bus/alert.events";
 import { updatedPrinterEvent } from "@/event-bus/printer.events";
 import { useOutletCurrentStore } from "@/store/outlet-current.store";
@@ -60,6 +63,7 @@ export class SocketIoService {
 
     if (message.floors) {
       this.printersStore.saveFloors(message.floors);
+      this.$bus.emit(socketIoFloors, message.floors);
     }
 
     if (message.printers) {
@@ -73,7 +77,6 @@ export class SocketIoService {
         this.$bus.emit(updatedPrinterEvent(p.id), p);
       });
     }
-
     const outletStore = useOutletCurrentStore();
     if (message.outletCurrentValues) {
       outletStore.setOutletCurrentValues(message.outletCurrentValues);

diff --git a/src/store/printers.store.ts b/src/store/printers.store.ts
@@ -73,7 +73,7 @@ export const usePrintersStore = defineStore("Printers", {
             row.push(undefined);
           } else {
             const printer = this.printers.find((p) => p.id === position.printerId);
-            row.push(printer || undefined);
+            row.push(printer);
           }
         }
       }
@@ -164,6 +164,10 @@ export const usePrintersStore = defineStore("Printers", {
       this.floors = floors.sort((f, f2) => f.floor - f2.floor);
       if (!this.selectedFloor) {
         this.selectedFloor = this.floors[0];
+      } else {
+        const floorId = this.selectedFloor?._id;
+        const foundFloor = this.floors.find((f) => f._id === floorId);
+        this.selectedFloor = foundFloor ? this.floors[0] : foundFloor;
       }
     },
     async changeSelectedFloorByIndex(selectedPrinterFloorIndex: number) {

diff --git a/src/views/PrintersView.vue b/src/views/PrintersView.vue
@@ -69,9 +69,9 @@
           {{ item.printerName || item.printerURL }}
         </v-chip>
       </template>
-      <template v-slot:item.group="{ item }">
+      <template v-slot:item.floor="{ item }">
         <v-chip v-if="item.id" color="primary" dark>
-          {{ groupOfPrinter(item.id)?.name }}
+          {{ floorOfPrinter(item.id)?.name }}
         </v-chip>
       </template>
       <template v-slot:item.actions="{ item }">
@@ -199,7 +199,7 @@ export default defineComponent({
         sortable: true,
         value: "printerName",
       },
-      { text: "Assigned Group", value: "group", sortable: false },
+      { text: "Floor", value: "floor", sortable: false },
       { text: "Actions", value: "actions", sortable: false },
       { text: "", value: "data-table-expand" },
     ],