rectangle

Author: kellerza

src/components/div_graph.vue

@@ -26,10 +26,10 @@
       <template #override-node="{ nodeId, scale, config, ...slotProps }">
         <rect
           v-if="getNodeProps(nodeId).type == 'rect'"
-          :x="(-config.width * scale) / 2"
-          :y="(-config.height * scale) / 2"
-          :width="config.width * scale"
-          :height="config.height * scale"
+          :x="-config.radius * scale"
+          :y="-config.radius * scale"
+          :width="config.radius * scale * 2"
+          :height="config.radius * scale * 2"
           :fill="config.color"
           v-bind="slotProps"
         />

src/stores/mainStore.ts

@@ -65,6 +65,9 @@ export const useMainStore = defineStore("main", {
     split_vars: useLocalStorage("split_vars", true),
     /** dark theme */
     dark: useLocalStorage("dark_mode", false),
+
+    /** last save time */
+    lastSave: 0,
   }),
   // optional getters
   getters: {
@@ -156,6 +159,10 @@ export const useMainStore = defineStore("main", {
         console.warn("no data to load")
         return
       }
+      if (Date.now() - this.lastSave < 800) {
+        console.debug("ignoring changes from server")
+        return
+      }
       this.context = data.context as Context
       console.debug("load layouts+", data.options)
       this.optHeight = Math.max(400, Math.min(900, data.options.height || 450))
@@ -256,6 +263,7 @@ export const useMainStore = defineStore("main", {
     save() {
       console.debug("save layouts+", this.wsState.uidata)
       wsSend(this.wsState)
+      this.lastSave = Date.now()
     },
 
     /* process a received websock message */
@@ -318,17 +326,6 @@ export const useMainStore = defineStore("main", {
         this.fetch_templates()
         return
       }
-      if (this.context.topofile.endsWith(`/${name}`)) {
-        console.error("topo file updated, should have received a WS msg")
-        return
-      }
-      if (
-        this.context.topofile.endsWith(`/${name.replace(".labctl.", ".clab.")}`)
-      ) {
-        // updated when we move nodes
-        // MsgWarning(`labctl file updated, you need to restart the labctl server`)
-        return
-      }
 
       MsgWarning(`unhandled file change: ${name}`)
     },