Skip to content

Commit 7fded09

Browse files
SLVS-2792 Temporarily disable unmute issues (#6571)
Co-authored-by: Georgii Borovinskikh <[email protected]>
1 parent 3033605 commit 7fded09

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

src/IssueViz.Security.UnitTests/ReportView/Taints/TaintViewModelTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public void Ctor_InitializesPropertiesAsExpected(bool isSolutionLevelTaintDispla
3737
testSubject.Issue.Should().Be(analysisIssueVisualization);
3838
testSubject.IssueType.Should().Be(IssueType.TaintVulnerability);
3939
testSubject.Status.Should().Be(DisplayStatus.Open);
40+
testSubject.IsResolved.Should().BeFalse();
4041
}
4142

4243
[TestMethod]
@@ -79,6 +80,7 @@ public void Ctor_Status_ReturnsCorrectValueBasedOnIsResloved(bool isResolved, Di
7980
var testSubject = new TaintViewModel(taintIssue);
8081

8182
testSubject.Status.Should().Be(expectedStatus);
83+
testSubject.IsResolved.Should().Be(isResolved);
8284
}
8385

8486
[DataTestMethod]

src/IssueViz.Security/ReportView/AnalysisIssueViewModelBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ internal abstract class AnalysisIssueViewModelBase(IAnalysisIssueVisualization a
3636
public abstract DisplaySeverity DisplaySeverity { get; }
3737
public abstract IssueType IssueType { get; }
3838
public abstract DisplayStatus Status { get; }
39+
public bool IsResolved => Issue.IsResolved;
3940
public bool IsOnNewCode => Issue.IsOnNewCode;
4041
public IAnalysisIssueVisualization Issue { get; } = analysisIssueVisualization;
4142

src/IssueViz.Security/ReportView/IIssueViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public interface IIssueViewModel
3434
DisplaySeverity DisplaySeverity { get; }
3535
IssueType IssueType { get; }
3636
DisplayStatus Status { get; }
37+
bool IsResolved { get; }
3738
bool IsOnNewCode { get; }
3839
bool IsServerIssue { get; }
3940
}

src/IssueViz.Security/ReportView/ReportViewControl.xaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,19 @@
468468
</Trigger>
469469
</Style.Triggers>
470470
</Style>
471+
472+
<Style x:Key="ChangeStatusMenuItemStyleDisableResolved" TargetType="MenuItem" BasedOn="{StaticResource ChangeStatusMenuItemStyle}">
473+
<Setter Property="IsEnabled" Value="False"></Setter>
474+
<Style.Triggers>
475+
<MultiDataTrigger>
476+
<MultiDataTrigger.Conditions>
477+
<Condition Binding="{Binding DataContext.IsServerIssue, RelativeSource={RelativeSource FindAncestor, AncestorType=ContextMenu}}" Value="True" />
478+
<Condition Binding="{Binding DataContext.IsResolved, RelativeSource={RelativeSource FindAncestor, AncestorType=ContextMenu}}" Value="False" />
479+
</MultiDataTrigger.Conditions>
480+
<Setter Property="IsEnabled" Value="True"></Setter>
481+
</MultiDataTrigger>
482+
</Style.Triggers>
483+
</Style>
471484

472485
<!-- Control templates -->
473486
<ControlTemplate x:Key="IssueTypeFilterControlTemplate" TargetType="ContentControl">
@@ -524,8 +537,7 @@
524537
<ContextMenu x:Key="TaintContextMenu">
525538
<MenuItem Header="{x:Static res:Resources.ChangeStatusMenuItem}"
526539
Click="ChangeTaintStatusMenuItem_OnClick"
527-
Style="{StaticResource ChangeStatusMenuItemStyle}"
528-
IsEnabled="{Binding DataContext.IsServerIssue, RelativeSource={RelativeSource FindAncestor, AncestorType=ContextMenu} }" />
540+
Style="{StaticResource ChangeStatusMenuItemStyleDisableResolved}"/>
529541
<MenuItem Click="ViewTaintInBrowser_OnClick"
530542
Loaded="ShowMenuItemInBrowserMenuItem_OnLoaded"
531543
Style="{StaticResource ViewIssueInBrowserMenuItemStyle}"
@@ -543,8 +555,7 @@
543555
<ContextMenu x:Key="IssuesContextMenu">
544556
<MenuItem Header="{x:Static res:Resources.ChangeStatusMenuItem}"
545557
Click="ChangeIssueStatusMenuItem_OnClick"
546-
Style="{StaticResource ChangeStatusMenuItemStyle}"
547-
IsEnabled="{Binding DataContext.IsServerIssue, RelativeSource={RelativeSource FindAncestor, AncestorType=ContextMenu} }" />
558+
Style="{StaticResource ChangeStatusMenuItemStyleDisableResolved}"/>
548559
<MenuItem Click="ViewIssueInBrowser_OnClick"
549560
Loaded="ShowMenuItemInBrowserMenuItem_OnLoaded"
550561
Style="{StaticResource ViewIssueInBrowserMenuItemStyle}"

0 commit comments

Comments
 (0)