dohertj2/ScadaBridge
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(ui): dedup alarm-capable protocol predicate to AlarmCapableProtocols (#53)

Browse Source
This commit is contained in:
Joseph Doherty
2026-06-19 01:32:55 -04:00
parent 72e084f588
commit b432c788c3
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
+2 -2
View File
@@ -3,6 +3,7 @@
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates @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.Interfaces.Repositories
@using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management @using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management
@using ZB.MOM.WW.ScadaBridge.Commons.Types @using ZB.MOM.WW.ScadaBridge.Commons.Types
@@ -1348,8 +1349,7 @@
private bool HasNativeOverride(string sourceName) => _existingNativeOverrides.ContainsKey(sourceName); private bool HasNativeOverride(string sourceName) => _existingNativeOverrides.ContainsKey(sourceName);
private IEnumerable<DataConnection> AlarmCapableConnections() => private IEnumerable<DataConnection> AlarmCapableConnections() =>
_siteConnections.Where(c => string.Equals(c.Protocol, "OpcUa", StringComparison.OrdinalIgnoreCase) _siteConnections.Where(c => AlarmCapableProtocols.IsAlarmCapable(c.Protocol));
|| string.Equals(c.Protocol, "MxGateway", StringComparison.OrdinalIgnoreCase));
private async Task SaveNativeOverride(string sourceName) private async Task SaveNativeOverride(string sourceName)
{ {
src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Design/TemplateEdit.razor
+2 -5
View File
@@ -3,6 +3,7 @@
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates @using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates
@using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites @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.Interfaces.Repositories
@using ZB.MOM.WW.ScadaBridge.Commons.Types @using ZB.MOM.WW.ScadaBridge.Commons.Types
@using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums @using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums
@@ -187,7 +188,7 @@
_alarms = (await TemplateEngineRepository.GetAlarmsByTemplateIdAsync(Id)).ToList(); _alarms = (await TemplateEngineRepository.GetAlarmsByTemplateIdAsync(Id)).ToList();
_nativeSources = (await TemplateEngineRepository.GetNativeAlarmSourcesByTemplateIdAsync(Id)).ToList(); _nativeSources = (await TemplateEngineRepository.GetNativeAlarmSourcesByTemplateIdAsync(Id)).ToList();
_alarmCapableConnections = (await CentralUiRepository.GetAllDataConnectionsAsync()) _alarmCapableConnections = (await CentralUiRepository.GetAllDataConnectionsAsync())
.Where(c => IsAlarmCapable(c.Protocol)) .Where(c => AlarmCapableProtocols.IsAlarmCapable(c.Protocol))
.GroupBy(c => c.Name, StringComparer.OrdinalIgnoreCase) .GroupBy(c => c.Name, StringComparer.OrdinalIgnoreCase)
.Select(g => g.First()) .Select(g => g.First())
.OrderBy(c => c.Name, StringComparer.OrdinalIgnoreCase) .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() private void BeginAddNativeSource()
{ {
_showNativeSourceForm = true; _showNativeSourceForm = true;