diff --git a/pkg/webui/console/views/device-overview/index.js b/pkg/webui/console/views/device-overview/index.js index f1f9a98e7c..07f1aab60f 100644 --- a/pkg/webui/console/views/device-overview/index.js +++ b/pkg/webui/console/views/device-overview/index.js @@ -35,6 +35,7 @@ const m = defineMessages({ sessionInfo: 'Session Information', latestData: 'Latest Data', rootKeys: 'Root Keys', + keysNotExposed: 'Keys are not exposed', }) @connect(function({ device }, props) { @@ -105,12 +106,21 @@ class DeviceOverview extends React.Component { // Add root keys, if available if (Object.keys(root_keys).length > 0) { - activationInfoData.items.push({ + const infoEntry = { key: m.rootKeyId, value: root_keys.root_key_id, type: 'code', sensitive: false, - subItems: [ + } + if (!Boolean(root_keys.app_key) && !Boolean(root_keys.nwk_key)) { + infoEntry.subItems = [ + { + key: m.rootKeys, + value: , + }, + ] + } else { + infoEntry.subItems = [ { key: sharedMessages.appKey, value: root_keys.app_key.key, @@ -125,8 +135,9 @@ class DeviceOverview extends React.Component { sensitive: true, } : { key: sharedMessages.nwkKey, value: undefined }), - ], - }) + ] + } + activationInfoData.items.push(infoEntry) } else { activationInfoData.items.push({ key: m.rootKeys, diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json index a67c50c21c..a6953d37da 100644 --- a/pkg/webui/locales/en.json +++ b/pkg/webui/locales/en.json @@ -194,6 +194,7 @@ "console.views.device-overview.index.sessionInfo": "Session Information", "console.views.device-overview.index.latestData": "Latest Data", "console.views.device-overview.index.rootKeys": "Root Keys", + "console.views.device-overview.index.keysNotExposed": "Keys are not exposed", "console.views.gateway-add.index.createGateway": "Create Gateway", "console.views.gateway-data.index.gtwData": "Gateway Data", "console.views.gateway-general-settings.index.updateSuccess": "Successfully updated gateway", diff --git a/pkg/webui/locales/xx.json b/pkg/webui/locales/xx.json index 04c93a34ab..39f6f14e75 100644 --- a/pkg/webui/locales/xx.json +++ b/pkg/webui/locales/xx.json @@ -194,6 +194,7 @@ "console.views.device-overview.index.sessionInfo": "Xxxxxxx Xxxxxxxxxxx", "console.views.device-overview.index.latestData": "Xxxxxx Xxxx", "console.views.device-overview.index.rootKeys": "Xxxx Xxxx", + "console.views.device-overview.index.keysNotExposed": "Xxxx xxx xxx xxxxxxx", "console.views.gateway-add.index.createGateway": "Xxxxxx Xxxxxxx", "console.views.gateway-data.index.gtwData": "Xxxxxxx Xxxx", "console.views.gateway-general-settings.index.updateSuccess": "Xxxxxxxxxxxx xxxxxxx xxxxxxx",