Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 14.01 #309

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,12 @@ TBD

## Changelog
### **WORK IN PROGRESS**
* (@GermanBluefox) Showed the device name in paring dialog
* (@GermanBluefox) Showed the device name in paring dialog
* (@GermanBluefox/Apollon77) Adjusts connection type icons
* (@Apollon77) Optimized the discovery dialog handling
* (@Apollon77) Fixed Thermostat for Controller to update temperatures
* (@Apollon77) Gives Energy sensors a dedicated icon
* (@Apollon77) Optimized an fixed multiple things

### 0.3.6 (2025-01-13)
* (@GermanBluefox) Fixed GUI errors
Expand Down
118 changes: 59 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
"url": "https://github.com/ioBroker/ioBroker.matter"
},
"optionalDependencies": {
"@matter/nodejs-ble": "0.12.0-alpha.0-20250113-e619723a5"
"@matter/nodejs-ble": "0.12.0-alpha.0-20250113-1c80c6d58"
},
"dependencies": {
"@iobroker/adapter-core": "^3.2.3",
"@iobroker/i18n": "^0.3.1",
"@iobroker/dm-utils": "^1.0.6",
"@iobroker/type-detector": "^4.1.1",
"@matter/main": "0.12.0-alpha.0-20250113-e619723a5",
"@matter/nodejs": "0.12.0-alpha.0-20250113-e619723a5",
"@project-chip/matter.js": "0.12.0-alpha.0-20250113-e619723a5",
"@matter/main": "0.12.0-alpha.0-20250113-1c80c6d58",
"@matter/nodejs": "0.12.0-alpha.0-20250113-1c80c6d58",
"@project-chip/matter.js": "0.12.0-alpha.0-20250113-1c80c6d58",
"axios": "^1.7.9",
"jsonwebtoken": "^9.0.2"
},
Expand Down
17 changes: 13 additions & 4 deletions src-admin/src/Tabs/Controller.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ interface ComponentState {
/** If we are currently waiting for backend processing */
backendProcessingActive: boolean;
discovered: CommissionableDevice[];
/** Discovery process is active in the backend */
discoveryRunning: boolean;
/** Was a discovery result received which means that the dialog should stay open also after discovery ended */
discoveryDone: boolean;
nodes: Record<string, ioBroker.Object>;
states: Record<string, ioBroker.State>;
Expand Down Expand Up @@ -230,7 +232,10 @@ class Controller extends Component<ComponentProps, ComponentState> {
if (state?.val) {
this.setState({ discoveryRunning: true });
} else {
this.setState({ discoveryRunning: false });
this.setState({
discoveryRunning: false,
discoveryDone: !!this.state.discovered.length, // Leave dialog open if we found devices
});
}
return;
}
Expand Down Expand Up @@ -616,6 +621,8 @@ class Controller extends Component<ComponentProps, ComponentState> {
onClick={async () => {
await this.stopDiscovery();
this.setState({
discoveryDone: false,
discovered: [],
showQrCodeDialog: device,
});
}}
Expand Down Expand Up @@ -657,11 +664,13 @@ class Controller extends Component<ComponentProps, ComponentState> {
* Stop discovering devices
*/
async stopDiscovery(): Promise<void> {
if (!this.state.discoveryRunning) {
// Nothing to stop if no Discovery is running
return;
}
console.log('Stop discovery');

await this.props.socket.sendTo(`matter.${this.props.instance}`, 'controllerDiscoveryStop', {});

this.setState({ discoveryDone: !!this.state.discovered.length });
}

/**
Expand Down Expand Up @@ -765,8 +774,8 @@ class Controller extends Component<ComponentProps, ComponentState> {
window.alert(`Error on discovery: ${result.error}`);
} else if (result.result) {
this.setState({
discoveryDone: !!result.result.length,
discovered: result.result,
discoveryDone: true,
});
}
});
Expand Down
1 change: 1 addition & 0 deletions src-admin/src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"No devices was added, as they are already in the list or not allowed by license": "Es wurden keine Geräte hinzugefügt, da sie bereits in der Liste sind oder durch die Lizenz nicht zugelassen sind.",
"No devices was added, as they are not allowed by license": "Es wurden keine Geräte hinzugefügt, da diese laut Lizenz nicht zulässig sind",
"No one device created. Create one, by clicking on the \"+\" button on the left.": "Noch kein Gerät erstellt. Erstellen Sie eins, indem Sie links auf die Schaltfläche „+“ klicken.",
"Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.": "Der Knoten wurde aktiviert und wird nun verbunden. Es kann einen Moment dauern, bis die Geräte dieses Knotens angezeigt werden.",
"Not connected": "Nicht verbunden",
"Not supported yet": "Noch nicht unterstützt",
"Not used devices": "Nicht verwendete Geräte",
Expand Down
1 change: 1 addition & 0 deletions src-admin/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"No devices was added, as they are already in the list or not allowed by license": "No devices was added, as they are already in the list or not allowed by license",
"No devices was added, as they are not allowed by license": "No devices was added, as they are not allowed by license",
"No one device created. Create one, by clicking on the \"+\" button on the left.": "No one device created. Create one, by clicking on the \"+\" button on the left.",
"Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.": "Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.",
"Not connected": "Not connected",
"Not supported yet": "Not supported yet",
"Not used devices": "Not used devices",
Expand Down
1 change: 1 addition & 0 deletions src-admin/src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"No devices was added, as they are already in the list or not allowed by license": "No se agregó ningún dispositivo porque ya está en la lista o no está permitido por la licencia.",
"No devices was added, as they are not allowed by license": "No se agregaron dispositivos, ya que no están permitidos por la licencia.",
"No one device created. Create one, by clicking on the \"+\" button on the left.": "No se ha creado ningún dispositivo. Cree uno haciendo clic en el botón \"+\" de la izquierda.",
"Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.": "El nodo se ha activado y se conectará ahora. Puede tardar un momento hasta que se muestren los dispositivos de este nodo.",
"Not connected": "No conectado",
"Not supported yet": "Aún no es compatible",
"Not used devices": "Dispositivos no usados",
Expand Down
1 change: 1 addition & 0 deletions src-admin/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"No devices was added, as they are already in the list or not allowed by license": "Aucun appareil n'a été ajouté, car ils sont déjà dans la liste ou ne sont pas autorisés par la licence",
"No devices was added, as they are not allowed by license": "Aucun appareil n'a été ajouté, car ils ne sont pas autorisés par la licence",
"No one device created. Create one, by clicking on the \"+\" button on the left.": "Aucun appareil n'a été créé. Créez-en un en cliquant sur le bouton « + » à gauche.",
"Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.": "Le nœud a été activé et va être connecté maintenant. Il peut s'écouler un certain temps avant que les appareils de ce nœud ne soient affichés.",
"Not connected": "Pas connecté",
"Not supported yet": "Pas encore pris en charge",
"Not used devices": "Appareils non utilisés",
Expand Down
1 change: 1 addition & 0 deletions src-admin/src/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"No devices was added, as they are already in the list or not allowed by license": "Nessun dispositivo è stato aggiunto, poiché sono già presenti nell'elenco o non sono consentiti dalla licenza",
"No devices was added, as they are not allowed by license": "Nessun dispositivo è stato aggiunto, poiché non sono consentiti dalla licenza",
"No one device created. Create one, by clicking on the \"+\" button on the left.": "Nessun dispositivo creato. Creane uno, cliccando sul pulsante \"+\" a sinistra.",
"Node got enabled and will be connected now. It might take a moment until the devices of this node are shown.": "Il nodo è stato abilitato e sarà ora connesso. Potrebbe essere necessario un po' di tempo prima che vengano visualizzati i dispositivi di questo nodo.",
"Not connected": "Non collegata",
"Not supported yet": "Non ancora supportato",
"Not used devices": "Dispositivi non utilizzati",
Expand Down
Loading
Loading