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.

Sign up for GitHub

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

[MQTT] User must know if connected or not #1349

Merged
merged 2 commits into from
Nov 25, 2021
Merged

[MQTT] User must know if connected or not #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c79ca70
[MQTT] User must know if connected or not
atrovato Nov 12, 2021
fcea130
Merge branch 'master' into atrovato/issue1016
Pierre-Gilles Nov 25, 2021
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
2 changes: 1 addition & 1 deletion front/src/config/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@
"passwordPlaceholder": "Entrez le mot de passe du broker MQTT",
"saveLabel": "Sauvegarder la configuration",
"error": "Une erreur s'est produite lors de l'enregistrement de la configuration.",
"connecting": "Configuration enregistrée. Maintenant, connectez-vous à votre broker MQTT...",
"connecting": "Configuration enregistrée. Connexion au broker MQTT en cours...",
"connected": "Connecté au broker MQTT avec succès !",
"connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration.",
"disconnected": "Déconnecté du broker MQTT."
Expand Down
70 changes: 44 additions & 26 deletions front/src/routes/integration/all/mqtt/setup-page/SetupTab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,49 @@ class SetupTab extends Component {
};

render(props) {
let alertMessage = null;

const { connectMqttStatus, mqttConnected, mqttConnectionError } = props;
switch (connectMqttStatus) {
case RequestStatus.Error:
// Error while updating setup
alertMessage = (
<p class="alert alert-danger">
<Text id="integration.mqtt.setup.error" />
</p>
);
break;
case RequestStatus.Success:
// Updating setup with success = connecting...
alertMessage = (
<p class="alert alert-info">
<Text id="integration.mqtt.setup.connecting" />
</p>
);
break;
default:
if (mqttConnectionError === 'DISCONNECTED') {
alertMessage = (
<p class="alert alert-info">
<Text id="integration.mqtt.setup.disconnected" />
</p>
);
} else if (mqttConnectionError || mqttConnected === false) {
alertMessage = (
<p class="alert alert-danger">
<Text id="integration.mqtt.setup.connectionError" />
</p>
);
} else if (mqttConnected) {
// Well connected
alertMessage = (
<p class="alert alert-success">
<Text id="integration.mqtt.setup.connected" />
</p>
);
}
}

return (
<div class="card">
<div class="card-header">
Expand All @@ -34,32 +77,7 @@ class SetupTab extends Component {
<p>
<MarkupText id="integration.mqtt.setup.mqttDescription" />
</p>
{props.connectMqttStatus === RequestStatus.Error && (
<p class="alert alert-danger">
<Text id="integration.mqtt.setup.error" />
</p>
)}
{props.connectMqttStatus === RequestStatus.Success && !props.mqttConnected && (
<p class="alert alert-info">
<Text id="integration.mqtt.setup.connecting" />
</p>
)}
{props.mqttConnected && (
<p class="alert alert-success">
<Text id="integration.mqtt.setup.connected" />
</p>
)}
{props.mqttConnectionError && props.mqttConnectionError !== 'DISCONNECTED' && (
<p class="alert alert-danger">
<Text id="integration.mqtt.setup.connectionError" />
</p>
)}

{props.mqttConnectionError === 'DISCONNECTED' && (
<p class="alert alert-info">
<Text id="integration.mqtt.setup.disconnected" />
</p>
)}
{alertMessage}

<div class="form-group">
<label for="embeddedBroker" class="form-label">
Expand Down
23 changes: 13 additions & 10 deletions front/src/routes/integration/all/mqtt/setup-page/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ import { RequestStatus } from '../../../../../utils/consts';
const createActions = store => {
const integrationActions = createActionsIntegration(store);
const actions = {
async loadStatus(state) {
let mqttStatus = {
connected: false
};
try {
mqttStatus = await state.httpClient.get('/api/v1/service/mqtt/status');
} finally {
store.setState({
mqttConnected: mqttStatus.connected
});
}
},
async loadProps(state) {
let configuration = {};
try {
Expand Down Expand Up @@ -44,8 +56,6 @@ const createActions = store => {
store.setState({
connectMqttStatus: RequestStatus.Success
});

setTimeout(() => store.setState({ connectMqttStatus: undefined }), 3000);
} catch (e) {
store.setState({
connectMqttStatus: RequestStatus.Error,
Expand All @@ -57,16 +67,9 @@ const createActions = store => {
// display 3 seconds a message "MQTT connected"
store.setState({
mqttConnected: true,
connectMqttStatus: undefined,
mqttConnectionError: undefined
});
setTimeout(
() =>
store.setState({
mqttConnected: false,
connectMqttStatus: undefined
}),
3000
);
},
displayMqttError(state, error) {
store.setState({
Expand Down
16 changes: 12 additions & 4 deletions front/src/routes/integration/all/mqtt/setup-page/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,20 @@ class MqttNodePage extends Component {
componentWillMount() {
this.props.getIntegrationByName('mqtt');
this.props.loadProps();
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.MQTT.CONNECTED, () =>
this.props.displayConnectedMessage()
this.props.loadStatus();
this.props.session.dispatcher.addListener(
WEBSOCKET_MESSAGE_TYPES.MQTT.CONNECTED,
this.props.displayConnectedMessage
);
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.MQTT.ERROR, payload =>
this.props.displayMqttError(payload)
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.MQTT.ERROR, this.props.displayMqttError);
}

componentWillUnmount() {
this.props.session.dispatcher.removeListener(
WEBSOCKET_MESSAGE_TYPES.MQTT.CONNECTED,
this.props.displayConnectedMessage
);
this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.MQTT.ERROR, this.props.displayMqttError);
}

render(props, {}) {
Expand Down