refactor(28715): remove MessageHandlingOption from schemas

hivemq · Dec 10, 2024 · c87a95f · c87a95f
1 parent fc404e4
commit c87a95f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 40 deletions.
diff --git a/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/__handlers__/index.ts b/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/__handlers__/index.ts
@@ -41,15 +41,7 @@ export const mockUISchema: UiSchema = {
     simulationToMqttMappings: {
       'ui:batchMode': true,
       items: {
-        'ui:order': [
-          'mqttTopic',
-          'mqttQos',
-          'mqttUserProperties',
-          'messageHandlingOptions',
-          'includeTimestamp',
-          'includeTagNames',
-          '*',
-        ],
+        'ui:order': ['mqttTopic', 'mqttQos', 'mqttUserProperties', 'includeTimestamp', 'includeTagNames', '*'],
         'ui:collapsable': {
           titleKey: 'mqttTopic',
         },
@@ -123,19 +115,6 @@ export const mockJSONSchema: JSONSchema7 = {
                 description: 'Include the unix timestamp of the sample time in the resulting MQTT message',
                 default: true,
               },
-              messageHandlingOptions: {
-                type: 'string',
-                enum: ['MQTTMessagePerTag', 'MQTTMessagePerSubscription'],
-                title: 'Message Handling Options',
-                description:
-                  'This setting defines the format of the resulting MQTT message, either a message per changed tag or a message per subscription that may include multiple data points per sample',
-                default: 'MQTTMessagePerTag',
-                // @ts-ignore TODO[NVL] enumNames not officially supported
-                enumNames: [
-                  'MQTT Message Per Device Tag',
-                  'MQTT Message Per Subscription (Potentially Multiple Data Points Per Sample)',
-                ],
-              },
               mqttQos: {
                 type: 'integer',
                 title: 'MQTT QoS',

diff --git a/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/__handlers__/mapping.mocks.ts b/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/__handlers__/mapping.mocks.ts
@@ -22,7 +22,6 @@ export const MOCK_NORTHBOUND_MAPPING: NorthboundMapping = {
   includeTimestamp: true,
   maxQoS: MOCK_MAX_QOS,
   messageExpiryInterval: -1000,
-  messageHandlingOptions: NorthboundMapping.messageHandlingOptions.MQTTMESSAGE_PER_TAG,
 }
 
 export const mappingHandlers = [

diff --git a/hivemq-edge/src/frontend/src/api/schemas/northbound.json-schema.ts b/hivemq-edge/src/frontend/src/api/schemas/northbound.json-schema.ts
@@ -28,14 +28,6 @@ export const northboundMappingListSchema: JSONSchema7 = {
           description: 'Include the unix timestamp of the sample time in the resulting MQTT message',
           default: true,
         },
-        messageHandlingOptions: {
-          type: 'string',
-          enum: ['MQTTMessagePerTag', 'MQTTMessagePerSubscription'],
-          title: 'Message Handling Options',
-          description:
-            'This setting defines the format of the resulting MQTT message, either a message per changed tag or a message per subscription that may include multiple data points per sample',
-          default: 'MQTTMessagePerTag',
-        },
         messageExpiryInterval: {
           type: 'number',
           description: `The message expiry interval.`,

diff --git a/hivemq-edge/src/frontend/src/api/schemas/northbound.ui-schema.ts b/hivemq-edge/src/frontend/src/api/schemas/northbound.ui-schema.ts
@@ -34,13 +34,6 @@ export const northboundMappingListUISchema: UiSchema = {
       maxQoS: {
         'ui:enumNames': ['At most once (QoS 0)', 'At least once (QoS 1)', 'Exactly once (QoS 2)'],
       },
-
-      messageHandlingOptions: {
-        'ui:enumNames': [
-          'MQTT Message Per Device Tag',
-          'MQTT Message Per Subscription (Potentially Multiple Data Points Per Sample)',
-        ],
-      },
     },
   },
 }
diff --git a/hivemq-edge/src/frontend/src/modules/Device/utils/tags.utils.ts b/hivemq-edge/src/frontend/src/modules/Device/utils/tags.utils.ts
@@ -33,7 +33,6 @@ export const createSchema = (items: RJSFSchema) => {
     'serverQueueSize',
     'includeTagNames',
     'includeTimestamp',
-    'messageHandlingOptions',
     'mqttUserProperties'
   )
   if (!Object.keys(sourceProperties).length) throw new Error(i18n.t('device.errors.noFormSchema'))

diff --git a/hivemq-edge/src/frontend/src/modules/Mappings/hooks/useNorthboundMappingManager.spec.tsx b/hivemq-edge/src/frontend/src/modules/Mappings/hooks/useNorthboundMappingManager.spec.tsx
@@ -32,7 +32,6 @@ describe('useNorthboundMappingManager', () => {
           includeTimestamp: true,
           maxQoS: MOCK_MAX_QOS,
           messageExpiryInterval: -1000,
-          messageHandlingOptions: 'MQTTMessagePerTag',
           tagName: 'my/tag',
           topic: 'my/topic',
         }),