Change device grouping field from type to group, add HVAC action mapper

Author: user890104

src/pages/Devices.jsx

@@ -10,7 +10,7 @@ import ErrorMessage from '../widgets/ErrorMessage.jsx';
 import { useVariant } from '../hooks/useVariant.js';
 
 const Devices = ({
-    deviceType,
+    deviceGroup,
     deviceActionMapper,
 }) => {
     const { t } = useTranslation();
@@ -24,7 +24,7 @@ const Devices = ({
     });
 
     const filteredDevices = useMemo(() =>
-        devices ? devices.filter(device => device.type === deviceType) : [], [deviceType, devices]);
+        devices ? devices.filter(device => device.group === deviceGroup) : [], [deviceGroup, devices]);
 
     const variant = useVariant();
     const isInitLab = variant === 'initlab';
@@ -58,7 +58,7 @@ const Devices = ({
             }) : <Col>
                 <Card>
                     <Card.Body className="d-flex flex-column flex-lg-row gap-4">
-                        {t('views.' + deviceType + '.no_access')}
+                        {t('views.' + deviceGroup + '.no_access')}
                     </Card.Body>
                 </Card>
             </Col>}
@@ -70,7 +70,7 @@ const Devices = ({
 };
 
 Devices.propTypes = {
-    deviceType: PropTypes.string.isRequired,
+    deviceGroup: PropTypes.string.isRequired,
     deviceActionMapper: PropTypes.func.isRequired,
 };
 

src/pages/Doors.jsx

@@ -2,7 +2,7 @@ import { getDoorActions } from '../utils/device.js';
 import Devices from './Devices.jsx';
 
 const Doors = () => {
-    return (<Devices deviceType="door" deviceActionMapper={getDoorActions} />);
+    return (<Devices deviceGroup="door" deviceActionMapper={getDoorActions} />);
 };
 
 export default Doors;

src/pages/Hvac.jsx

@@ -1,8 +1,8 @@
-import { getDeviceActions } from '../utils/device.js';
+import { getHvacActions } from '../utils/device.js';
 import Devices from './Devices.jsx';
 
 const Hvac = () => {
-    return (<Devices deviceType="hvac" deviceActionMapper={getDeviceActions} />);
+    return (<Devices deviceGroup="hvac" deviceActionMapper={getHvacActions} />);
 };
 
 export default Hvac;

src/pages/Lights.jsx

@@ -2,7 +2,7 @@ import { getLightActions } from '../utils/device.js';
 import Devices from './Devices.jsx';
 
 const Lights = () => {
-    return (<Devices deviceType="light" deviceActionMapper={getLightActions} />);
+    return (<Devices deviceGroup="light" deviceActionMapper={getLightActions} />);
 };
 
 export default Lights;

src/utils/device.js

@@ -42,3 +42,11 @@ export function getLightActions(light) {
 
     return actions.filter(action => action !== (activityStatus ? 'turn_on' : 'turn_off'));
 }
+
+export function getHvacActions(device) {
+    if (device.type === 'switch') {
+        return getLightActions(device);
+    }
+
+    return getDeviceActions(device);
+}