diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor index ea0d6aed..41aa22cf 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor @@ -3,6 +3,7 @@ @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates +@using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol @using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories @using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management @using ZB.MOM.WW.ScadaBridge.Commons.Types @@ -1348,8 +1349,7 @@ private bool HasNativeOverride(string sourceName) => _existingNativeOverrides.ContainsKey(sourceName); private IEnumerable AlarmCapableConnections() => - _siteConnections.Where(c => string.Equals(c.Protocol, "OpcUa", StringComparison.OrdinalIgnoreCase) - || string.Equals(c.Protocol, "MxGateway", StringComparison.OrdinalIgnoreCase)); + _siteConnections.Where(c => AlarmCapableProtocols.IsAlarmCapable(c.Protocol)); private async Task SaveNativeOverride(string sourceName) { diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Design/TemplateEdit.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Design/TemplateEdit.razor index 44a2432f..1e094026 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Design/TemplateEdit.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Design/TemplateEdit.razor @@ -3,6 +3,7 @@ @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites +@using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol @using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories @using ZB.MOM.WW.ScadaBridge.Commons.Types @using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums @@ -187,7 +188,7 @@ _alarms = (await TemplateEngineRepository.GetAlarmsByTemplateIdAsync(Id)).ToList(); _nativeSources = (await TemplateEngineRepository.GetNativeAlarmSourcesByTemplateIdAsync(Id)).ToList(); _alarmCapableConnections = (await CentralUiRepository.GetAllDataConnectionsAsync()) - .Where(c => IsAlarmCapable(c.Protocol)) + .Where(c => AlarmCapableProtocols.IsAlarmCapable(c.Protocol)) .GroupBy(c => c.Name, StringComparer.OrdinalIgnoreCase) .Select(g => g.First()) .OrderBy(c => c.Name, StringComparer.OrdinalIgnoreCase) @@ -1193,10 +1194,6 @@ } }; - private static bool IsAlarmCapable(string? protocol) => - string.Equals(protocol, "OpcUa", StringComparison.OrdinalIgnoreCase) - || string.Equals(protocol, "MxGateway", StringComparison.OrdinalIgnoreCase); - private void BeginAddNativeSource() { _showNativeSourceForm = true;