From 9798c5186463b401a4cefe73ec5043138176dada Mon Sep 17 00:00:00 2001
From: William Enright <william.enright@savoirfairelinux.com>
Date: Wed, 21 Oct 2020 17:43:09 -0400
Subject: [PATCH] device id is now displayed in Devices tab
Change-Id: I67d4b0202dba1da36e7a1d3a582cc91a21108d64
---
jams-react-client/public/locales/en/translation.json | 3 ++-
jams-react-client/public/locales/fr/translation.json | 3 ++-
jams-react-client/src/components/Devices/Devices.js | 6 ++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/jams-react-client/public/locales/en/translation.json b/jams-react-client/public/locales/en/translation.json
index 59da9855..43510d7e 100644
--- a/jams-react-client/public/locales/en/translation.json
+++ b/jams-react-client/public/locales/en/translation.json
@@ -230,5 +230,6 @@
"blueprint_name": "Blueprint name",
"validate": "Validate",
"change_language": "Change language",
- "general": "General"
+ "general": "General",
+ "device_id": "Device Id"
}
diff --git a/jams-react-client/public/locales/fr/translation.json b/jams-react-client/public/locales/fr/translation.json
index 6daa99da..c2a4e407 100644
--- a/jams-react-client/public/locales/fr/translation.json
+++ b/jams-react-client/public/locales/fr/translation.json
@@ -230,5 +230,6 @@
"blueprint_name": "Nom du gabarit",
"validate": "Valider",
"change_language": "Change language",
- "general": "General"
+ "general": "General",
+ "device_id": "Identifiant de l'appareil"
}
diff --git a/jams-react-client/src/components/Devices/Devices.js b/jams-react-client/src/components/Devices/Devices.js
index b977666f..f6010614 100755
--- a/jams-react-client/src/components/Devices/Devices.js
+++ b/jams-react-client/src/components/Devices/Devices.js
@@ -78,6 +78,10 @@ export default function Devices(props) {
}
}
+ function getDeviceId(device) {
+ return device.deviceId;
+ }
+
const handleClickEdit = (e, device) => {
e.preventDefault();
setOpenEdit(true);
@@ -174,6 +178,7 @@ export default function Devices(props) {
<TableHead>
<TableRow>
<TableCell>{i18next.t("device_name", "Device Name")}</TableCell>
+ <TableCell>{i18next.t("device_id", "Device Id")}</TableCell>
<TableCell align="right">{i18next.t("status", "Status")}</TableCell>
<TableCell align="right">{i18next.t("actions", "Actions")}</TableCell>
</TableRow>
@@ -185,6 +190,7 @@ export default function Devices(props) {
<TableCell className={tableCellClasses}>
{device.displayName}
</TableCell>
+ <TableCell className={tableCellClasses}>{getDeviceId(device)}</TableCell>
<TableCell align="right" className={tableCellClasses}>{getDeviceStatus(device)}</TableCell>
{!(device.revoked) &&
<TableCell align="right" className={classes.tableActions}>
--
GitLab