feat: gets levelcontrolslist working for DSP and other level control

src/lib/shared/hooks/interfaces/useILevelControls.ts

@@ -1,13 +1,16 @@
-import { useGetDevice } from 'src/lib/store';
+import { useGetDevice, useRoomLevelControls } from 'src/lib/store';
 import { LevelControlsState } from 'src/lib/types/state/state/LevelControlsState';
 import { useWebsocketContext } from 'src/lib/utils/useWebsocketContext';
 
 
 export function useILevelControls(key: string): ILevelControlsReturn | undefined {
   const { sendMessage, sendSimpleMessage } = useWebsocketContext();
   const device = useGetDevice<LevelControlsState>(key);
+  const room = useRoomLevelControls(key);
 
-  if (!device) return undefined;
+  const state: LevelControlsState | undefined = device || room;
+
+  if (!state) return undefined;
 
   const setLevel = (levelKey: string, value: number) =>
     sendSimpleMessage(`${levelKey}/level`, value);
@@ -19,7 +22,7 @@ export function useILevelControls(key: string): ILevelControlsReturn | undefined
   const muteOff = (levelKey: string) => sendMessage(`${levelKey}/muteOff`, null);
 
   return {
-    levelState: device,
+    levelState: state,
     setLevel,
     muteToggle,
     muteOn,

src/lib/shared/hooks/useGetDeviceStateFromRoomConfiguration.ts

@@ -27,6 +27,12 @@ export const useGetAllDeviceStateFromRoomConfiguration = ({config}: {config: Roo
       deviceKeys.push(dli.sinkKey);
     });
 
+    if(config.levelControlList) {
+      Object.values(config.levelControlList).forEach((lcl) => {
+        deviceKeys.push(lcl.deviceKey);
+      });
+    }
+
     config.touchpanelKeys?.forEach((d) => {
       deviceKeys.push(d);
     });

src/lib/store/devices/devices.slice.ts

@@ -31,7 +31,10 @@ const devicesSlice = createSlice({
             state[key] = newState;
 
             return state;
-        }
+        },
+        clearDevices() {
+            return initialState;
+        },
     },
 })
 

src/lib/store/rooms/rooms.slice.ts

@@ -38,7 +38,10 @@ const roomsSlice = createSlice({
             console.log(state);
 
             return state;
-        }
+        },
+        clearRooms() {
+            return initialState;
+        },
     },
 })
 

src/lib/store/rooms/roomsSelectors.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { RoomVolumeType, Volume } from 'src/lib/types';
-import { DisplayState, RoomConfiguration } from "src/lib/types/state/state";
+import { DisplayState, LevelControlsState, RoomConfiguration } from "src/lib/types/state/state";
 import { useGetAllDevices } from '../devices/devicesSelectors';
 import { useAppSelector } from "../hooks";
 import store, { RootState } from '../rootReducer';
@@ -26,13 +26,25 @@ export const useRoomVolume = (roomKey: string, volumeKey: RoomVolumeType) =>
     state.rooms[roomKey] ? state.rooms[roomKey]?.volumes[volumeKey] as Volume : undefined
   );
 
+export const useRoomLevelControls = (roomKey: string) =>
+  useAppSelector((state) =>
+    state.rooms[roomKey] ? state.rooms[roomKey] as unknown as LevelControlsState : undefined
+  );
+
 export const useRoomSourceList = (roomKey: string) =>
   useAppSelector((state) =>
     state.rooms[roomKey]
       ? state.rooms[roomKey]?.configuration?.sourceList
       : undefined
   );
 
+export const useRoomLevelControlList = (roomKey: string) =>
+  useAppSelector((state) =>
+    state.rooms[roomKey]
+      ? state.rooms[roomKey]?.configuration?.levelControlList
+      : undefined
+  );
+
 export const useRoomDestinations = (roomKey: string) =>
   useAppSelector((state) =>
     state.rooms[roomKey]

src/lib/store/runtimeConfig/runtimeConfig.slice.ts

@@ -1,5 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { RoomData } from '../../types/index';
+import { devicesActions } from '../devices/devices.slice';
+import { roomsActions } from '../rooms/rooms.slice';
+import store from '../rootReducer';
 
 const initialState: RuntimeConfigState = {
     apiVersion: '',
@@ -12,7 +15,8 @@ const initialState: RuntimeConfigState = {
     token: '',
     roomData: {
         clientId: '',
-        roomKey: '',
+        defaultRoomKey: '',
+        currentRoomKey: '',
         systemUuid: '',
         roomUuid: '',
         userAppUrl: '',
@@ -45,7 +49,10 @@ const runtimeConfigSlice = createSlice({
             state.roomData = action.payload;
         },
         setCurrentRoomKey(state, action: PayloadAction<string>) {
-            state.roomData.roomKey = action.payload;
+            // clear out any existing room/device data
+            store.dispatch(roomsActions.clearRooms());
+            store.dispatch(devicesActions.clearDevices());
+            state.roomData.currentRoomKey = action.payload;
         },
         setUserCode(state, action: PayloadAction<UserCode>) {
             state.roomData.userCode = action.payload.userCode;

src/lib/store/runtimeConfig/runtimeSelectors.ts

@@ -2,6 +2,6 @@ import { useAppSelector } from '../hooks';
 
 export const useWsIsConnected = () => useAppSelector((state) => state.runtimeConfig.websocket.isConnected);
 
-export const useRoomKey = () => useAppSelector((state) => state.runtimeConfig.roomData.roomKey);
+export const useRoomKey = () => useAppSelector((state) => state.runtimeConfig.roomData.currentRoomKey);
 
 export const useClientId = () => useAppSelector((state) => state.runtimeConfig.roomData.clientId);

src/lib/types/classes/room-data.ts

@@ -1,6 +1,7 @@
 export interface RoomData {
   clientId: string | number;
-  roomKey: string;
+  defaultRoomKey: string;
+  currentRoomKey: string;
   systemUuid: string;
   roomUuid: string;
   userAppUrl: string;

src/lib/types/interfaces/ISelectableItem.ts

@@ -1,7 +1,5 @@
-import { IKeyName } from 'src/lib';
+import { IKeyName } from '.';
 
 export interface ISelectableItem extends IKeyName {
   isSelected: boolean;
-  Name: string;
-  Key: string;
 }

src/lib/types/state/LevelControlListItem.ts

@@ -0,0 +1,10 @@
+export interface LevelControlListItem {
+  deviceKey: string;
+  preferredName: string;
+  name: string;
+  includeInUserList: boolean;
+  order: number;
+  type: LevelControlType;
+}
+
+export type LevelControlType = 'Level' | 'Mute' | 'LevelAndMute';

src/lib/types/state/index.ts

@@ -1,3 +1,4 @@
+export * from './LevelControlListItem';
 export * from './collections';
 export * from './common-functions-util';
 export * from './config';

src/lib/types/state/state/IEssentialsRoomCombinerState.ts

@@ -17,11 +17,9 @@ export interface RoomCombinationScenario extends IKeyName {
   isActive: boolean;
 }
 
-export interface Partition {
+export interface Partition extends IKeyName {
   partitionPresent: boolean;
   adjacentRoomKeys: string[];
-  Name: string;
-  Key: string;
 }
 
 export interface PartitionState {

src/lib/types/state/state/RoomState.ts

@@ -1,6 +1,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { DestinationListItem } from '../DestinationListItem';
+import { LevelControlListItem } from '../LevelControlListItem';
 import { SourceListItem } from '../sourceListItem';
 import { Volume } from '../volume/volume';
 import { DeviceState } from './DeviceState';
@@ -23,30 +24,31 @@ export interface RoomState extends DeviceState{
 }
 
 export interface RoomConfiguration {
+  accessoryDeviceKeys?: string[];
   audioCodecKey?: string;
+  ciscoNavigatorKey?: string;
   defaultDisplayKey?: string;
   defaultPresentationSourceKey: string;
-  destinations: Record<DestinationTypes, string>;
   destinationList: Record<string, DestinationListItem>;
+  destinations: Record<DestinationTypes, string>;
+  endpointKeys?: string[];
   environmentalDevices: EnvironmentalDeviceConfiguration[];
   hasAudioConferencing?: boolean;
   hasEnvironmentalControls?: boolean;
   hasVideoConferencing?: boolean;
   helpMessage?: string;
-  techPassword?: string;
+  levelControlList: Record<string, LevelControlListItem>;
+  matrixRoutingKey?: string;
+  roomCombinerKey?: string;
   sourceList: Record<string, SourceListItem>;
   supportsAdvancedSharing?: boolean;
+  techPassword?: string;
+  touchpanelKeys?: string[];
   uiBehavior?: EssentialsRoomUiBehaviorConfiguration;
   userCanChangeShareMode?: boolean;
   videoCodecIsZoomRoom?: boolean;
   videoCodecKey?: string;
-  touchpanelKeys?: string[];
   zoomRoomControllerKey?: string;
-  ciscoNavigatorKey?: string;
-  matrixRoutingKey?: string;
-  endpointKeys?: string[];
-  accessoryDeviceKeys?: string[];
-  roomCombinerKey?: string;
 }
 
 export interface EssentialsRoomUiBehaviorConfiguration {

src/lib/utils/WebsocketProvider.tsx

@@ -209,6 +209,12 @@ const WebsocketProvider = ({ children }: { children: ReactNode }) => {
                   runtimeConfigActions.setUserCode(message.content as UserCode)
                 );
                 break;
+              case "/system/roomCombinationChanged":
+                window.location.reload();
+                break;
+              default:
+                console.log("unhandled system message", message);
+                break;
             }
           } else if (message.type.startsWith("/event/")) {
             console.log('event message received', message);
@@ -255,6 +261,7 @@ const WebsocketProvider = ({ children }: { children: ReactNode }) => {
    *  */
   useEffect(() => {
     if (roomKey) {
+      console.log("requesting status from room: ", roomKey);
       sendMessage(`/room/${roomKey}/status`, null);
     }
   }, [roomKey, sendMessage]);