Merge branch 'master' into traceroute

src/core/stores/appStore.ts

@@ -26,6 +26,7 @@ interface AppState {
   rasterSources: RasterSource[];
   commandPaletteOpen: boolean;
   darkMode: boolean;
+  nodeNumToBeRemoved: number;
   accent: AccentColor;
   connectDialogOpen: boolean;
 
@@ -38,6 +39,7 @@ interface AppState {
   removeDevice: (deviceId: number) => void;
   setCommandPaletteOpen: (open: boolean) => void;
   setDarkMode: (enabled: boolean) => void;
+  setNodeNumToBeRemoved: (nodeNum: number) => void;
   setAccent: (color: AccentColor) => void;
   setConnectDialogOpen: (open: boolean) => void;
 }
@@ -51,6 +53,7 @@ export const useAppStore = create<AppState>()((set) => ({
   darkMode: window.matchMedia("(prefers-color-scheme: dark)").matches,
   accent: "orange",
   connectDialogOpen: false,
+  nodeNumToBeRemoved: 0,
 
   setRasterSources: (sources: RasterSource[]) => {
     set(
@@ -99,6 +102,10 @@ export const useAppStore = create<AppState>()((set) => ({
       }),
     );
   },
+  setNodeNumToBeRemoved: (nodeNum) =>
+    set((state) => ({
+      nodeNumToBeRemoved: nodeNum
+    })),
   setAccent(color) {
     set(
       produce<AppState>((draft) => {

src/core/stores/deviceStore.ts

@@ -24,7 +24,8 @@ export type DialogVariant =
   | "QR"
   | "shutdown"
   | "reboot"
-  | "deviceName";
+  | "deviceName"
+  | "nodeRemoval";
 
 export interface Device {
   id: number;
@@ -55,6 +56,7 @@ export interface Device {
     shutdown: boolean;
     reboot: boolean;
     deviceName: boolean;
+    nodeRemoval: boolean;
   };
 
   setStatus: (status: Types.DeviceStatusEnum) => void;
@@ -76,6 +78,7 @@ export interface Device {
   addMessage: (message: MessageWithState) => void;
   addTraceRoute: (traceroute: Types.PacketMetadata<Protobuf.Mesh.RouteDiscovery>) => void;
   addMetadata: (from: number, metadata: Protobuf.Mesh.DeviceMetadata) => void;
+  removeNode: (nodeNum: number) => void;
   setMessageState: (
     type: "direct" | "broadcast",
     channelIndex: Types.ChannelNumber,
@@ -133,6 +136,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
             shutdown: false,
             reboot: false,
             deviceName: false,
+            nodeRemoval: false,
           },
           pendingSettingsChanges: false,
           messageDraft: "",
@@ -518,6 +522,14 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
               }),
             );
           },
+          removeNode: (nodeNum) => {
+            set(
+              produce<DeviceState>((draft) => {
+
+                device.nodes.delete(nodeNum);
+              })
+            )
+          },
           setMessageState: (
             type: "direct" | "broadcast",
             channelIndex: Types.ChannelNumber,