console: Configure normalized uplink payload messages

TheThingsNetwork · Aug 27, 2022 · 25dc6ac · 25dc6ac
1 parent 11c38f9
commit 25dc6ac
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 0 deletions.
diff --git a/pkg/webui/console/components/events/utils/definitions.js b/pkg/webui/console/components/events/utils/definitions.js
@@ -111,6 +111,7 @@ export const dataTypeMap = {
 
 export const applicationUpMessages = [
   'uplink_message',
+  'uplink_normalized',
   'join_accept',
   'downlink_ack',
   'downlink_nack',

diff --git a/pkg/webui/console/components/events/utils/index.js b/pkg/webui/console/components/events/utils/index.js
@@ -68,6 +68,9 @@ export const getPreviewComponentByApplicationUpMessage = message => {
     case 'uplink_message':
       messageType = 'ApplicationUplink'
       break
+    case 'uplink_normalized':
+      messageType = 'ApplicationUplinkNormalized'
+      break
     case 'join_accept':
       messageType = 'ApplicationJoinAccept'
       break
@@ -86,6 +89,7 @@ export const getPreviewComponentByApplicationUpMessage = message => {
       break
     case 'service_data':
       messageType = 'ApplicationServiceData'
+      break
   }
 
   return messageType in dataTypeMap ? dataTypeMap[messageType] : DefaultPreview

diff --git a/pkg/webui/console/components/pubsub-form/index.js b/pkg/webui/console/components/pubsub-form/index.js
@@ -355,6 +355,14 @@ export default class PubsubForm extends Component {
           component={Input.Toggled}
           description={sharedMessages.eventUplinkMessageDesc}
         />
+        <Form.Field
+          name="uplink_normalized"
+          type="toggled-input"
+          enabledMessage={sharedMessages.uplinkNormalized}
+          placeholder={pathPlaceholder}
+          component={Input.Toggled}
+          description={sharedMessages.eventUplinkNormalizedDesc}
+        />
         <Form.Field
           name="join_accept"
           type="toggled-input"

diff --git a/pkg/webui/console/components/pubsub-form/mapping.js b/pkg/webui/console/components/pubsub-form/mapping.js
@@ -93,6 +93,7 @@ export const mapPubsubToFormValues = pubsub => {
     location_solved: mapPubsubMessageTypeToFormValue(pubsub.location_solved),
     service_data: mapPubsubMessageTypeToFormValue(pubsub.service_data),
     uplink_message: mapPubsubMessageTypeToFormValue(pubsub.uplink_message),
+    uplink_normalized: mapPubsubMessageTypeToFormValue(pubsub.uplink_normalized),
   }
 
   return result
@@ -137,6 +138,7 @@ export const mapFormValuesToPubsub = (values, appId) => {
     location_solved: mapMessageTypeFormValueToPubsubMessageType(values.location_solved),
     service_data: mapMessageTypeFormValueToPubsubMessageType(values.service_data),
     uplink_message: mapMessageTypeFormValueToPubsubMessageType(values.uplink_message),
+    uplink_normalized: mapMessageTypeFormValueToPubsubMessageType(values.uplink_normalized),
   }
 
   switch (values._provider) {
@@ -172,4 +174,5 @@ export const blankValues = {
   location_solved: { enabled: false, value: '' },
   service_data: { enabled: false, value: '' },
   uplink_message: { enabled: false, value: '' },
+  uplink_normalized: { enabled: false, value: '' },
 }
diff --git a/pkg/webui/console/components/webhook-form/index.js b/pkg/webui/console/components/webhook-form/index.js
@@ -168,6 +168,12 @@ const validationSchema = Yup.object().shape({
     })
     .test('has path length at most 64 characters', m.messagePathValidateTooLong, messageCheck)
     .nullable(),
+  uplink_normalized: Yup.object()
+    .shape({
+      path: Yup.string(),
+    })
+    .test('has path length at most 64 characters', m.messagePathValidateTooLong, messageCheck)
+    .nullable(),
   join_accept: Yup.object()
     .shape({
       path: Yup.string(),
@@ -516,6 +522,16 @@ export default class WebhookForm extends Component {
             component={Input.Toggled}
             description={sharedMessages.eventUplinkMessageDesc}
           />
+          <Form.Field
+            name="uplink_normalized"
+            type="toggled-input"
+            enabledMessage={sharedMessages.uplinkNormalized}
+            placeholder={pathPlaceholder}
+            decode={decodeMessageType}
+            encode={encodeMessageType}
+            component={Input.Toggled}
+            description={sharedMessages.eventUplinkNormalizedDesc}
+          />
           <Form.Field
             name="join_accept"
             type="toggled-input"

diff --git a/pkg/webui/console/components/webhook-form/mapping.js b/pkg/webui/console/components/webhook-form/mapping.js
@@ -117,6 +117,7 @@ export const blankValues = {
   },
   downlink_api_key: '',
   uplink_message: null,
+  uplink_normalized: null,
   join_accept: null,
   downlink_ack: null,
   downlink_nack: null,

diff --git a/pkg/webui/console/containers/webhook-add/webhook-add.js b/pkg/webui/console/containers/webhook-add/webhook-add.js
@@ -59,6 +59,7 @@ const WebhookAdd = props => {
         template_fields: fields,
         base_url: urlTemplate.parse(template.base_url).expand(fields),
         uplink_message: pathExpand(template.uplink_message, fields),
+        uplink_normalized: pathExpand(template.uplink_normalized, fields),
         join_accept: pathExpand(template.join_accept, fields),
         downlink_ack: pathExpand(template.downlink_ack, fields),
         downlink_nack: pathExpand(template.downlink_nack, fields),

diff --git a/pkg/webui/console/views/application-integrations-pubsub-edit/connect.js b/pkg/webui/console/views/application-integrations-pubsub-edit/connect.js
@@ -49,6 +49,7 @@ const pubsubEntitySelector = [
   'location_solved',
   'service_data',
   'uplink_message',
+  'uplink_normalized',
 ]
 
 const mapStateToProps = state => ({

diff --git a/pkg/webui/console/views/application-integrations-webhook-edit/connect.js b/pkg/webui/console/views/application-integrations-webhook-edit/connect.js
@@ -35,6 +35,7 @@ const webhookEntitySelector = [
   'headers',
   'downlink_api_key',
   'uplink_message',
+  'uplink_normalized',
   'join_accept',
   'downlink_ack',
   'downlink_nack',

diff --git a/pkg/webui/console/views/application-integrations-webhooks/connect.js b/pkg/webui/console/views/application-integrations-webhooks/connect.js
@@ -51,6 +51,7 @@ const selector = [
   'name',
   'service_data',
   'uplink_message',
+  'uplink_normalized',
 ]
 
 const mapStateToProps = state => ({

diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
@@ -189,6 +189,7 @@ export default defineMessages({
   eventLocationSolvedDesc: 'An integration succeeded locating the end device',
   eventServiceDataDesc: 'An integration emits an event',
   eventUplinkMessageDesc: 'An uplink message is received by the application',
+  eventUplinkNormalizedDesc: 'A normalized uplink payload',
   eventsCannotShow: 'Cannot show events',
   expiry: 'Expiry',
   exportJson: 'Export as JSON',
@@ -416,6 +417,7 @@ export default defineMessages({
   uplink: 'Uplink',
   uplinkFrameCount: 'Uplink frame count',
   uplinkMessage: 'Uplink message',
+  uplinkNormalized: 'Normalized uplink',
   uplinksReceived: 'Uplinks received',
   unexposed: 'Unexposed',
   used: '{currentValue}/{maxValue} used',