Skip to content

Commit 5215c35

Browse files
authored
Merge pull request #701 from GridProtectionAlliance/SC-326
Sc 326
2 parents 471a0dd + 0a827bb commit 5215c35

4 files changed

Lines changed: 74 additions & 66 deletions

File tree

Source/Applications/SystemCenter/Controllers/ExternalDB/LineSegmentWizardController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ private LineConfiguration GetFAWGConfiguration(Line line)
656656
List<string> buses = segments.Select(s => s.FromBus).ToList();
657657
buses.AddRange(segments.Select(s => s.ToBus));
658658

659-
List<Segment> sectionEnds = segments.Where(s => buses.Where( b => b == s.ToBus).Count() != 2 || buses.Where(b => b != s.FromBus).Count() != 2).ToList();
659+
List<Segment> sectionEnds = segments.Where(s => buses.Where( b => b == s.ToBus).Count() != 2 || buses.Where(b => b == s.FromBus).Count() != 2).ToList();
660660

661661
while (sectionEnds.Count > 0)
662662
{

Source/Applications/SystemCenter/package-lock.json

Lines changed: 63 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Applications/SystemCenter/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
"url-loader": "4.1.1"
2828
},
2929
"dependencies": {
30-
"@gpa-gemstone/application-typings": "0.0.84",
31-
"@gpa-gemstone/common-pages": "0.0.137",
32-
"@gpa-gemstone/gpa-symbols": "0.0.49",
33-
"@gpa-gemstone/helper-functions": "0.0.40",
34-
"@gpa-gemstone/react-forms": "1.1.88",
35-
"@gpa-gemstone/react-graph": "1.0.72",
36-
"@gpa-gemstone/react-interactive": "1.0.149",
37-
"@gpa-gemstone/react-table": "1.2.71",
30+
"@gpa-gemstone/application-typings": "0.0.85",
31+
"@gpa-gemstone/common-pages": "0.0.139",
32+
"@gpa-gemstone/gpa-symbols": "0.0.51",
33+
"@gpa-gemstone/helper-functions": "0.0.41",
34+
"@gpa-gemstone/react-forms": "1.1.90",
35+
"@gpa-gemstone/react-graph": "1.0.74",
36+
"@gpa-gemstone/react-interactive": "1.0.151",
37+
"@gpa-gemstone/react-table": "1.2.73",
3838
"@reduxjs/toolkit": "1.8.3",
3939
"assert": "2.0.0",
4040
"buffer": "6.0.3",

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/AdditionalFieldsWindow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ function AdditionalFieldsWindow(props: IProps): JSX.Element {
184184
data-tooltip={'Clear'}
185185
>Clear Changes</button>
186186
<ToolTip
187-
Show={hover == 'Clear' && changes.length > 0}
187+
Show={hover == 'Clear' && validChanges.length > 0}
188188
Position={'top'}
189189
Target={"Clear"}>
190-
{changes.map((change, index) => <p key={index}> <ReactIcons.Warning Color="var(--warning)"/> {change}</p>)}
190+
{validChanges.map((change, index) => <p key={index}> <ReactIcons.Warning Color="var(--warning)" /> {change.Message}</p>)}
191191
</ToolTip>
192192
</div>
193193
</> : null

0 commit comments

Comments
 (0)