Skip to content

Commit 0a1c912

Browse files
authored
Revert "fix: match 2.0.0 permit join API (#2158)" (#2159)
This reverts commit 6e31bc2.
1 parent f529104 commit 0a1c912

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
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(time: number, device: Device): Promise<void>;
6+
setPermitJoin(permit: boolean, 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, time = 254, device?: Device): Promise<void> => {
15-
return api.send("bridge/request/permit_join", { time, device: device?.friendly_name });
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 });
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, 254)
32+
return setPermitJoin(_state, true)
3333
}
3434
}

src/components/navbar/StartStopJoinButton.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ 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_timeout: permitJoinTimeout } = bridgeInfo;
18-
const permitJoin = permitJoinTimeout > 0;
17+
const { permit_join: permitJoin, permit_join_timeout: permitJoinTimeout } = bridgeInfo;
1918

2019
const selectAndHide = (device: Device) => {
2120
setSelectedRouter(device);
@@ -37,7 +36,7 @@ export function StartStopJoinButton({ devices, setPermitJoin, bridgeInfo }: Star
3736
));
3837

3938
const onBtnClick = () => {
40-
setPermitJoin(permitJoin ? 0 : 254, selectedRouter);
39+
setPermitJoin(!permitJoin, selectedRouter);
4140
};
4241
const permitJoinTimer = (
4342
<>

src/types.ts

+3
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,14 @@ export interface BridgeConfig {
100100
coordinator: Coordinator;
101101
network: Network;
102102
log_level: string;
103+
permit_join: boolean;
104+
103105
}
104106
export type BridgeState = "online" | "offline";
105107
export interface BridgeInfo {
106108
config: Z2MConfig;
107109
config_schema: JSONSchema7;
110+
permit_join: boolean;
108111
permit_join_timeout: number;
109112
commit?: string;
110113
version?: string;

0 commit comments

Comments
 (0)