fix pr comments, update actionkeybind types

Author: engbergandreas

src/redux/actions/actionsMiddleware.ts

@@ -11,7 +11,7 @@ export const getAllActions = createAsyncThunk('actions/getAll', async () => {
   });
   const data = await topic.next();
   if (data.type !== 'combined') {
-    throw new Error(`Expected keybinds in data, got '${data}'`);
+    throw new Error(`Expected keybinds in data, got '${JSON.stringify(data)}'`);
   }
   topic.cancel();
   return data;
@@ -24,7 +24,7 @@ export const getAction = createAsyncThunk('actions/get', async (uri: Uri) => {
   });
   const data = await topic.next();
   if (data.type !== 'action') {
-    throw new Error(`Expected action, got '${data}'`);
+    throw new Error(`Expected action, got '${JSON.stringify(data)}'`);
   }
   topic.cancel();
   return data.action;

src/redux/actions/actionsSlice.ts

@@ -2,12 +2,13 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { Action, Keybind } from 'openspace-api-js/generated';
 
 import { getAction, getAllActions } from './actionsMiddleware';
+import { KeybindModifiers, KeybindRedux } from '@/types/types';
 
 export interface ActionsState {
   isInitialized: boolean;
   navigationPath: string;
   actions: Action[];
-  keybinds: Keybind[];
+  keybinds: KeybindRedux[];
   showKeybinds: boolean;
 }
 
@@ -58,10 +59,11 @@ export const actionsSlice = createSlice({
       getAllActions.fulfilled,
       (state, action: PayloadAction<{ actions: Action[]; keybinds: Keybind[] }>) => {
         const { actions, keybinds } = action.payload;
-        const modifiedKeybinds: Keybind[] = keybinds.map((keybind) => {
+
+        const modifiedKeybinds: KeybindRedux[] = keybinds.map((keybind) => {
           const modifiers = Object.values(keybind.modifiers)
             .map((value, i) => (value ? Object.keys(keybind.modifiers)[i] : null))
-            .filter((value) => value !== null) as Keybind['modifiers'];
+            .filter((value) => value !== null) as KeybindModifiers;
 
           return {
             action: keybind.action,

src/redux/logging/loggingMiddleware.ts

@@ -67,7 +67,7 @@ function unsubscribe() {
 function logNotificationMessage(logMessage: LogMessage, showNotification: boolean) {
   const { category, level, message } = logMessage;
 
-  if (!level || !category) {
+  if (level === undefined || !category) {
     return;
   }
 

src/redux/missions/missionsSlice.ts

@@ -56,7 +56,7 @@ export const missionsSlice = createSlice({
       state.missions = {};
       state.isInitialized = true;
 
-      Object.entries(action.payload).map(([identifier, mission]) => {
+      Object.entries(action.payload).forEach(([identifier, mission]) => {
         state.missions[identifier] = convertMissionToUTC(mission);
       });
 

src/redux/propertytree/propertyTreeMiddleware.ts

@@ -148,7 +148,7 @@ const getRoot = createAsyncThunk('propertyTree/getRoot', async (_, thunkAPI) =>
   const response = await api.getProperty(rootOwnerKey);
 
   if (response.type !== 'propertyOwner') {
-    throw new Error(`Expected propertyOwner, got '${response.type}': ${response.value}'`);
+    throw new Error(`Expected propertyOwner, got '${JSON.stringify(response)}'`);
   }
 
   const { propertyOwners, properties } = flattenPropertyTree(response.value);

src/types/types.ts

@@ -14,13 +14,16 @@ export type LanguageInfo = {
   icon: React.JSX.Element;
 };
 
-export type KeybindModifiers = Keybind['modifiers'];
+export type KeybindModifiers = (keyof Keybind['modifiers'])[];
 
+export type KeybindRedux = Pick<Keybind, 'action' | 'key'> & {
+  modifiers: KeybindModifiers;
+};
 // @TODO (anden88 2026-04-07): This is currently not being used in favour of
 // `KeybindInfoType` does this concatenation of the Keybind and Action make sense?
-export type ActionOrKeybind = Action | Keybind;
+export type ActionOrKeybind = Action | KeybindRedux;
 
-export type KeybindInfoType = Keybind & Action;
+export type KeybindInfoType = KeybindRedux & Action;
 
 export interface Properties {
   [key: Uri]: AnyProperty | undefined;