Merge pull request #7039 from TheThingsNetwork/fix/activation-events

Show JoinEUI and DevEUI only for activation events
TheThingsNetwork · Apr 23, 2024 · b16c529 · b16c529
2 parents 3b87b90 + f51fff0
commit b16c529
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/pkg/webui/console/components/events/previews/application-downlink.js b/pkg/webui/console/components/events/previews/application-downlink.js
@@ -29,7 +29,6 @@ const ApplicationDownlinkPreview = React.memo(({ event }) => {
   return (
     <DescriptionList>
       <DescriptionList.Byte title={messages.devAddr} data={deviceIds.dev_addr} />
-      <DescriptionList.Byte title={sharedMessages.joinEUI} data={deviceIds.join_eui} />
       {'decoded_payload' in data ? (
         <DescriptionList.Item title={sharedMessages.payload}>
           <JSONPayload data={data.decoded_payload} />

diff --git a/pkg/webui/console/components/events/previews/application-uplink-normalized.js b/pkg/webui/console/components/events/previews/application-uplink-normalized.js
@@ -29,7 +29,6 @@ const ApplicationUplinkNormalizedPreview = React.memo(({ event }) => {
   return (
     <DescriptionList>
       <DescriptionList.Byte title={messages.devAddr} data={deviceIds.dev_addr} />
-      <DescriptionList.Byte title={sharedMessages.joinEUI} data={deviceIds.join_eui} />
       {data.normalized_payload.soil && (
         <DescriptionList.Item title={sharedMessages.normalizedPayloadSoil}>
           <JSONPayload data={data.normalized_payload.soil} />

diff --git a/pkg/webui/console/components/events/previews/application-uplink.js b/pkg/webui/console/components/events/previews/application-uplink.js
@@ -20,22 +20,28 @@ import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import getDataRate from '@console/lib/data-rate-utils'
+import { activationEvent } from '@console/lib/regexp'
 
 import messages from '../messages'
 
 import DescriptionList from './shared/description-list'
 import JSONPayload from './shared/json-payload'
 
 const ApplicationUplinkPreview = React.memo(({ event }) => {
-  const { data, identifiers } = event
+  const { data, identifiers, name } = event
   const deviceIds = identifiers[0].device_ids
   const { snr, rssi } = getSignalInformation(data)
   const dataRate = getDataRate(data)
 
   return (
     <DescriptionList>
       <DescriptionList.Byte title={messages.devAddr} data={deviceIds.dev_addr} />
-      <DescriptionList.Byte title={sharedMessages.joinEUI} data={deviceIds.join_eui} />
+      {activationEvent.test(name) && (
+        <>
+          <DescriptionList.Byte title={sharedMessages.joinEUI} data={deviceIds.join_eui} />
+          <DescriptionList.Byte title={sharedMessages.devEUI} data={deviceIds.dev_eui} />
+        </>
+      )}
       {'decoded_payload' in data ? (
         <DescriptionList.Item title={sharedMessages.payload}>
           <JSONPayload data={data.decoded_payload} />

diff --git a/pkg/webui/console/components/events/previews/default.js b/pkg/webui/console/components/events/previews/default.js
@@ -17,25 +17,31 @@ import React from 'react'
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
+import { activationEvent } from '@console/lib/regexp'
+
 import messages from '../messages'
 
 import DescriptionList from './shared/description-list'
 
 const DefaultPreview = React.memo(({ event }) => {
-  const { identifiers } = event
+  const { identifiers, name } = event
 
   if (identifiers && 'device_ids' in identifiers[0]) {
     return (
       <DescriptionList>
         <DescriptionList.Byte title={messages.devAddr} data={identifiers[0].device_ids.dev_addr} />
-        <DescriptionList.Byte
-          title={sharedMessages.joinEUI}
-          data={identifiers[0].device_ids.join_eui}
-        />
-        <DescriptionList.Byte
-          title={sharedMessages.devEUI}
-          data={identifiers[0].device_ids.dev_eui}
-        />
+        {activationEvent.test(name) && (
+          <>
+            <DescriptionList.Byte
+              title={sharedMessages.joinEUI}
+              data={identifiers[0].device_ids.join_eui}
+            />
+            <DescriptionList.Byte
+              title={sharedMessages.devEUI}
+              data={identifiers[0].device_ids.dev_eui}
+            />
+          </>
+        )}
       </DescriptionList>
     )
   }

diff --git a/pkg/webui/console/components/events/previews/downlink-message.js b/pkg/webui/console/components/events/previews/downlink-message.js
@@ -20,7 +20,6 @@ import { getDataRate } from '@console/components/events/utils'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 import getByPath from '@ttn-lw/lib/get-by-path'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import messages from '../messages'
 
@@ -62,8 +61,6 @@ const DownLinkMessagePreview = React.memo(({ event }) => {
       )
     }
     const devAddr = event.identifiers[0].device_ids.dev_addr
-    const joinEui = event.identifiers[0].device_ids.join_eui
-    const devEui = event.identifiers[0].device_ids.dev_eui
     const frmPayload = getByPath(data, 'payload.mac_payload.frm_payload')
     const rx1Delay = getByPath(data, 'request.rx1_delay')
     const fPort = getByPath(data, 'payload.mac_payload.f_port')
@@ -72,8 +69,6 @@ const DownLinkMessagePreview = React.memo(({ event }) => {
     return (
       <DescriptionList>
         <DescriptionList.Byte title={messages.devAddr} data={devAddr} />
-        <DescriptionList.Byte title={sharedMessages.joinEUI} data={joinEui} />
-        <DescriptionList.Byte title={sharedMessages.devEUI} data={devEui} />
         <DescriptionList.Item title={messages.fPort} data={fPort} />
         {isConfirmed && (
           <DescriptionList.Item>

diff --git a/pkg/webui/console/components/events/previews/gateway-uplink-message.js b/pkg/webui/console/components/events/previews/gateway-uplink-message.js
@@ -55,8 +55,6 @@ const GatewayUplinkMessagePreview = React.memo(({ event }) => {
   return (
     <DescriptionList>
       <DescriptionList.Byte title={messages.devAddr} data={devAddr} />
-      <DescriptionList.Byte title={sharedMessages.joinEUI} data={joinEui} />
-      <DescriptionList.Byte title={sharedMessages.devEUI} data={devEui} />
       <DescriptionList.Item title={messages.fCnt} data={fCnt} highlight />
       <DescriptionList.Item title={messages.fPort} data={fPort} />
       {isConfirmed && (

diff --git a/pkg/webui/console/lib/regexp.js b/pkg/webui/console/lib/regexp.js
@@ -32,3 +32,4 @@ export const emptyDuration = /^[a-zA-z]+$/
 export const delay = new RegExp('^[0-9]{1,}[.]?([0-9]{1,})?[a-zA-Z]{1,2}$')
 export const apiKeyPath = /([A-Z0-9]{39})/
 export const duration = /^[0-9]+([a-z])$/
+export const activationEvent = /.*\.join\..*/