Browse Source

[4114] refactoring

pull/11516/head
mpetrov 2 years ago
parent
commit
6104778cd2
  1. 1
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts
  3. 1
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts
  4. 4
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
  5. 5
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
  6. 1
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts

1
ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts

@ -34,6 +34,7 @@ export class ModbusVersionProcessor extends GatewayConnectorVersionProcessor<any
) { ) {
super(gatewayVersionStr, connector); super(gatewayVersionStr, connector);
} }
getUpgradedVersion(): GatewayConnector<ModbusBasicConfig_v3_5_2> { getUpgradedVersion(): GatewayConnector<ModbusBasicConfig_v3_5_2> {
const configurationJson = this.connector.configurationJson; const configurationJson = this.connector.configurationJson;
return { return {

2
ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts

@ -27,6 +27,7 @@ import { MqttVersionMappingUtil } from '../utils/mqtt-version-mapping.util';
import { GatewayConnectorVersionProcessor } from './gateway-connector-version-processor.abstract'; import { GatewayConnectorVersionProcessor } from './gateway-connector-version-processor.abstract';
export class MqttVersionProcessor extends GatewayConnectorVersionProcessor<MQTTBasicConfig> { export class MqttVersionProcessor extends GatewayConnectorVersionProcessor<MQTTBasicConfig> {
private readonly mqttRequestTypeKeys = Object.values(RequestType); private readonly mqttRequestTypeKeys = Object.values(RequestType);
constructor( constructor(
@ -35,6 +36,7 @@ export class MqttVersionProcessor extends GatewayConnectorVersionProcessor<MQTTB
) { ) {
super(gatewayVersionStr, connector); super(gatewayVersionStr, connector);
} }
getUpgradedVersion(): GatewayConnector<MQTTBasicConfig_v3_5_2> { getUpgradedVersion(): GatewayConnector<MQTTBasicConfig_v3_5_2> {
const { const {
connectRequests, connectRequests,

1
ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts

@ -31,6 +31,7 @@ export class OpcVersionProcessor extends GatewayConnectorVersionProcessor<OPCBas
) { ) {
super(gatewayVersionStr, connector); super(gatewayVersionStr, connector);
} }
getUpgradedVersion(): GatewayConnector<OPCBasicConfig_v3_5_2> { getUpgradedVersion(): GatewayConnector<OPCBasicConfig_v3_5_2> {
const server = this.connector.configurationJson.server as LegacyServerConfig; const server = this.connector.configurationJson.server as LegacyServerConfig;
return { return {

4
ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts

@ -245,6 +245,10 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
delete value.class; delete value.class;
} }
if (this.gatewayVersion && !value.configVersion) {
value.configVersion = this.gatewayVersion;
}
value.ts = Date.now(); value.ts = Date.now();
return value; return value;

5
ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts

@ -20,11 +20,14 @@ import {
ModbusLegacySlave, ModbusLegacySlave,
ModbusMasterConfig, ModbusMasterConfig,
ModbusRegisterValues, ModbusRegisterValues,
ModbusSlave, ModbusValue, ModbusValues, ModbusSlave,
ModbusValue,
ModbusValues,
SlaveConfig SlaveConfig
} from '@home/components/widget/lib/gateway/gateway-widget.models'; } from '@home/components/widget/lib/gateway/gateway-widget.models';
export class ModbusVersionMappingUtil { export class ModbusVersionMappingUtil {
static mapMasterToUpgradedVersion(master: ModbusMasterConfig): ModbusMasterConfig { static mapMasterToUpgradedVersion(master: ModbusMasterConfig): ModbusMasterConfig {
return { return {
slaves: master.slaves.map((slave: SlaveConfig) => ({ slaves: master.slaves.map((slave: SlaveConfig) => ({

1
ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts

@ -33,6 +33,7 @@ import {
} from '@home/components/widget/lib/gateway/gateway-widget.models'; } from '@home/components/widget/lib/gateway/gateway-widget.models';
export class OpcVersionMappingUtil { export class OpcVersionMappingUtil {
static mapServerToUpgradedVersion(server: LegacyServerConfig): ServerConfig { static mapServerToUpgradedVersion(server: LegacyServerConfig): ServerConfig {
const { mapping, disableSubscriptions, ...restServer } = server; const { mapping, disableSubscriptions, ...restServer } = server;
return { return {

Loading…
Cancel
Save