Merge branch 'master' into unread-counts

src/core/stores/deviceStore.ts

@@ -27,12 +27,18 @@ export type DialogVariant =
   | "nodeRemoval"
   | "pkiBackup"
   | "nodeDetails"
-  | "unsafeRoles";
+  | "unsafeRoles"
+  | "refreshKeys";
 
 type QueueStatus = {
   res: number, free: number, maxlen: number
 }
 
+type NodeError = {
+  node: number;
+  error: string;
+}
+
 export interface Device {
   id: number;
   status: Types.DeviceStatusEnum;
@@ -52,6 +58,7 @@ export interface Device {
     number,
     Types.PacketMetadata<Protobuf.Mesh.RouteDiscovery>[]
   >;
+  nodeErrors: Map<number, NodeError>;
   connection?: MeshDevice;
   activePage: Page;
   activeNode: number;
@@ -71,6 +78,7 @@ export interface Device {
     pkiBackup: boolean;
     nodeDetails: boolean;
     unsafeRoles: boolean;
+    refreshKeys: boolean;
   };
   unreadCounts: Map<number, number>;
 
@@ -111,6 +119,10 @@ export interface Device {
   setMessageDraft: (message: string) => void;
   setUnread: (id: number, count: number) => void;
   setQueueStatus: (status: QueueStatus) => void;
+  setNodeError: (nodeNum: number, error: string) => void;
+  clearNodeError: (nodeNum: number) => void;
+  getNodeError: (nodeNum: number) => NodeError | undefined;
+  hasNodeError: (nodeNum: number) => boolean
 }
 
 export interface DeviceState {
@@ -164,10 +176,12 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
             pkiBackup: false,
             nodeDetails: false,
             unsafeRoles: false,
+            refreshKeys: false,
           },
           pendingSettingsChanges: false,
           messageDraft: "",
           unreadCounts: new Map(),
+          nodeErrors: new Map(),
 
           setStatus: (status: Types.DeviceStatusEnum) => {
             set(
@@ -534,7 +548,6 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
           addTraceRoute: (traceroute) => {
             set(
               produce<DeviceState>((draft) => {
-                console.log("addTraceRoute called");
                 const device = draft.devices.get(id);
                 if (!device) {
                   return;
@@ -571,10 +584,8 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
           ) => {
             set(
               produce<DeviceState>((draft) => {
-                console.log("setMessageState called");
                 const device = draft.devices.get(id);
                 if (!device) {
-                  console.log("no device found for id");
                   return;
                 }
                 const messageGroup = device.messages[type];
@@ -585,7 +596,6 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
                 const messages = messageGroup.get(messageIndex);
 
                 if (!messages) {
-                  console.log("no messages found for id");
                   return;
                 }
 
@@ -680,7 +690,42 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
                 }
               }),
             );
-          }
+          },
+          setNodeError: (nodeNum, error) => {
+            set(
+              produce<DeviceState>((draft) => {
+                const device = draft.devices.get(id);
+                if (device) {
+                  device.nodeErrors.set(nodeNum, { node: nodeNum, error });
+                }
+              }),
+            );
+          },
+          clearNodeError: (nodeNum: number) => {
+            set(
+              produce<DeviceState>((draft) => {
+                const device = draft.devices.get(id);
+                if (device) {
+                  device.nodeErrors.delete(nodeNum);
+                }
+              }),
+            );
+          },
+          getNodeError: (nodeNum: number) => {
+            const device = get().devices.get(id);
+            if (!device) {
+              throw new Error("Device not found");
+            }
+            return device.nodeErrors.get(nodeNum);
+          },
+          hasNodeError: (nodeNum: number) => {
+            const device = get().devices.get(id);
+            if (!device) {
+              throw new Error("Device not found");
+            }
+            return device.nodeErrors.has(nodeNum);
+          },
+
         });
       }),
     );