fix table not showing on edit

This commit is contained in:
Proddy
2023-03-11 11:09:27 +01:00
parent 13211249c9
commit 00e87dc3b0

View File

@@ -503,61 +503,59 @@ const SettingsCustomization: FC = () => {
{tableList.map((de: DeviceEntity) => ( {tableList.map((de: DeviceEntity) => (
<Row key={de.id} item={de} onClick={() => editEntity(de)}> <Row key={de.id} item={de} onClick={() => editEntity(de)}>
<Cell stiff> <Cell stiff>
{!deviceEntity && ( <ToggleButtonGroup
<ToggleButtonGroup size="small"
size="small" color="secondary"
color="secondary" value={getMaskString(de.m)}
value={getMaskString(de.m)} onChange={(event, mask) => {
onChange={(event, mask) => { de.m = getMaskNumber(mask);
de.m = getMaskNumber(mask); if (de.n === '' && de.m & DeviceEntityMask.DV_READONLY) {
if (de.n === '' && de.m & DeviceEntityMask.DV_READONLY) { de.m = de.m | DeviceEntityMask.DV_WEB_EXCLUDE;
de.m = de.m | DeviceEntityMask.DV_WEB_EXCLUDE; }
if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) {
de.m = de.m & ~DeviceEntityMask.DV_FAVORITE;
}
setMasks(['']); // forces a refresh
}}
>
<ToggleButton value="8" disabled={(de.m & 0x81) !== 0 || de.n === undefined}>
<OptionIcon
type="favorite"
isSet={(de.m & DeviceEntityMask.DV_FAVORITE) === DeviceEntityMask.DV_FAVORITE}
/>
</ToggleButton>
<ToggleButton value="4" disabled={!de.w || (de.m & 0x83) >= 3}>
<OptionIcon
type="readonly"
isSet={(de.m & DeviceEntityMask.DV_READONLY) === DeviceEntityMask.DV_READONLY}
/>
</ToggleButton>
<ToggleButton value="2" disabled={de.n === '' || (de.m & 0x80) !== 0}>
<OptionIcon
type="api_mqtt_exclude"
isSet={
(de.m & DeviceEntityMask.DV_API_MQTT_EXCLUDE) === DeviceEntityMask.DV_API_MQTT_EXCLUDE
} }
if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) { />
de.m = de.m & ~DeviceEntityMask.DV_FAVORITE; </ToggleButton>
} <ToggleButton value="1" disabled={de.n === undefined || (de.m & 0x80) !== 0}>
setMasks(['']); // forces a refresh <OptionIcon
}} type="web_exclude"
> isSet={(de.m & DeviceEntityMask.DV_WEB_EXCLUDE) === DeviceEntityMask.DV_WEB_EXCLUDE}
<ToggleButton value="8" disabled={(de.m & 0x81) !== 0 || de.n === undefined}> />
<OptionIcon </ToggleButton>
type="favorite" <ToggleButton value="128">
isSet={(de.m & DeviceEntityMask.DV_FAVORITE) === DeviceEntityMask.DV_FAVORITE} <OptionIcon
/> type="deleted"
</ToggleButton> isSet={(de.m & DeviceEntityMask.DV_DELETED) === DeviceEntityMask.DV_DELETED}
<ToggleButton value="4" disabled={!de.w || (de.m & 0x83) >= 3}> />
<OptionIcon </ToggleButton>
type="readonly" </ToggleButtonGroup>
isSet={(de.m & DeviceEntityMask.DV_READONLY) === DeviceEntityMask.DV_READONLY}
/>
</ToggleButton>
<ToggleButton value="2" disabled={de.n === '' || (de.m & 0x80) !== 0}>
<OptionIcon
type="api_mqtt_exclude"
isSet={
(de.m & DeviceEntityMask.DV_API_MQTT_EXCLUDE) === DeviceEntityMask.DV_API_MQTT_EXCLUDE
}
/>
</ToggleButton>
<ToggleButton value="1" disabled={de.n === undefined || (de.m & 0x80) !== 0}>
<OptionIcon
type="web_exclude"
isSet={(de.m & DeviceEntityMask.DV_WEB_EXCLUDE) === DeviceEntityMask.DV_WEB_EXCLUDE}
/>
</ToggleButton>
<ToggleButton value="128">
<OptionIcon
type="deleted"
isSet={(de.m & DeviceEntityMask.DV_DELETED) === DeviceEntityMask.DV_DELETED}
/>
</ToggleButton>
</ToggleButtonGroup>
)}
</Cell> </Cell>
<Cell>{!deviceEntity && formatName(de)}</Cell> <Cell>{formatName(de)}</Cell>
<Cell>{!deviceEntity && !(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.mi)}</Cell> <Cell>{!(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.mi)}</Cell>
<Cell>{!deviceEntity && !(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.ma)}</Cell> <Cell>{!(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.ma)}</Cell>
<Cell>{!deviceEntity && formatValue(de.v)}</Cell> <Cell>{formatValue(de.v)}</Cell>
</Row> </Row>
))} ))}
</Body> </Body>