From 2c1f55f55ae14d9084b4acc882e8b174012ee944 Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Fri, 9 May 2025 13:04:36 +0300
Subject: [PATCH] UI: mqtt version refactoring.

---
 .../components/mqtt-version-select.component.ts | 17 +++++++++++++++--
 ui-ngx/src/app/shared/models/device.models.ts   | 14 --------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/mqtt-version-select.component.ts b/ui-ngx/src/app/shared/components/mqtt-version-select.component.ts
index 4003925e60..2d88b220c6 100644
--- a/ui-ngx/src/app/shared/components/mqtt-version-select.component.ts
+++ b/ui-ngx/src/app/shared/components/mqtt-version-select.component.ts
@@ -17,9 +17,22 @@
 import { Component, forwardRef, Input } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
-import { MqttVersion, MqttVersions, MqttVersionTranslation } from '@shared/models/device.models';
 import { SubscriptSizing, MatFormFieldAppearance } from '@angular/material/form-field';
 
+export enum MqttVersion {
+  MQTT_3_1 = 'MQTT_3_1',
+  MQTT_3_1_1 = 'MQTT_3_1_1',
+  MQTT_5 = 'MQTT_5'
+}
+
+export const DEFAULT_MQTT_VERSION = MqttVersion.MQTT_3_1_1;
+
+export const MqttVersionTranslation = new Map<MqttVersion, string>([
+  [MqttVersion.MQTT_3_1, 'MQTT 3.1'],
+  [MqttVersion.MQTT_3_1_1, 'MQTT 3.1.1'],
+  [MqttVersion.MQTT_5, 'MQTT 5.0']
+]);
+
 @Component({
   selector: 'tb-mqtt-version-select',
   templateUrl: './mqtt-version-select.component.html',
@@ -41,7 +54,7 @@ export class MqttVersionSelectComponent implements ControlValueAccessor {
   @Input()
   appearance: MatFormFieldAppearance = 'fill';
 
-  mqttVersions = MqttVersions;
+  mqttVersions = Object.values(MqttVersion);
   mqttVersionTranslation = MqttVersionTranslation;
   modelValue: MqttVersion;
 
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index 01e29dfe10..8298d3a1fe 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -902,17 +902,3 @@ export const getAlarmScheduleRangeText = (startsOn: Date | number, endsOn: Date
   return `<span><span class="nowrap">12:00 AM</span> – <span class="nowrap">${end.format('hh:mm A')}</span>` +
     ` and <span class="nowrap">${start.format('hh:mm A')}</span> – <span class="nowrap">12:00 PM</span></span>`;
 };
-
-export enum MqttVersion {
-  MQTT_3_1 = 'MQTT_3_1',
-  MQTT_3_1_1 = 'MQTT_3_1_1',
-  MQTT_5 = 'MQTT_5'
-}
-
-export const MqttVersions = Object.values(MqttVersion);
-
-export const MqttVersionTranslation = new Map<MqttVersion, string>([
-  [MqttVersion.MQTT_3_1, 'MQTT 3.1'],
-  [MqttVersion.MQTT_3_1_1, 'MQTT 3.1.1'],
-  [MqttVersion.MQTT_5, 'MQTT 5.0']
-]);