Skip to content

Commit 6e31bc2

Browse files
authored
fix: match 2.0.0 permit join API (#2158)
1 parent 65b2965 commit 6e31bc2

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/actions/BridgeApi.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import { Device } from '../types';
33
import store from '../store';
44

55
export interface BridgeApi {
6-
setPermitJoin(permit: boolean, device: Device): Promise<void>;
6+
setPermitJoin(time: number, device: Device): Promise<void>;
77
updateBridgeConfig(options: unknown): Promise<void>;
88
restartBridge(): Promise<void>;
99
requestBackup(): Promise<void>;
1010
addInstallCode(installCode: string): Promise<void>;
1111
}
1212

1313

14-
const setPermitJoin = (_state, permit = true, device?: Device, time = 254): Promise<void> => {
15-
return api.send("bridge/request/permit_join", { value: permit, time, device: device?.friendly_name });
14+
const setPermitJoin = (_state, time = 254, device?: Device): Promise<void> => {
15+
return api.send("bridge/request/permit_join", { time, device: device?.friendly_name });
1616
}
1717

1818
export default {
@@ -29,6 +29,6 @@ export default {
2929
},
3030
async addInstallCode(_state, installCode: string): Promise<void> {
3131
await api.send('bridge/request/install_code/add', { value: installCode });
32-
return setPermitJoin(_state, true)
32+
return setPermitJoin(_state, 254)
3333
}
3434
}

src/components/navbar/StartStopJoinButton.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ export function StartStopJoinButton({ devices, setPermitJoin, bridgeInfo }: Star
1414
const { t } = useTranslation(['navbar']);
1515
const { ref, isComponentVisible, setIsComponentVisible } = useComponentVisible(false);
1616
const [selectedRouter, setSelectedRouter] = useState<Device>({} as Device);
17-
const { permit_join: permitJoin, permit_join_timeout: permitJoinTimeout } = bridgeInfo;
17+
const { permit_join_timeout: permitJoinTimeout } = bridgeInfo;
18+
const permitJoin = permitJoinTimeout > 0;
1819

1920
const selectAndHide = (device: Device) => {
2021
setSelectedRouter(device);
@@ -36,7 +37,7 @@ export function StartStopJoinButton({ devices, setPermitJoin, bridgeInfo }: Star
3637
));
3738

3839
const onBtnClick = () => {
39-
setPermitJoin(!permitJoin, selectedRouter);
40+
setPermitJoin(permitJoin ? 0 : 254, selectedRouter);
4041
};
4142
const permitJoinTimer = (
4243
<>

src/types.ts

-3
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,11 @@ export interface BridgeConfig {
100100
coordinator: Coordinator;
101101
network: Network;
102102
log_level: string;
103-
permit_join: boolean;
104-
105103
}
106104
export type BridgeState = "online" | "offline";
107105
export interface BridgeInfo {
108106
config: Z2MConfig;
109107
config_schema: JSONSchema7;
110-
permit_join: boolean;
111108
permit_join_timeout: number;
112109
commit?: string;
113110
version?: string;

0 commit comments

Comments
 (0)