Skip to content

Commit

Permalink
Add warning to results page when viewing the page without any results…
Browse files Browse the repository at this point in the history 
… to analyze.
  • Loading branch information
Gabe Stocco committed Mar 27, 2019
1 parent 2ba0067 commit d243981
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 44 deletions.
9 changes: 9 additions & 0 deletions Directory.Build.props
View file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning">
<Version>2.3.138</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
106 changes: 66 additions & 40 deletions Gui/Views/Home/Analyze.cshtml
View file
Expand Up @@ -28,25 +28,38 @@
</div>
<div class="thinspacer"></div>
<div class="scan">
<div class="explain">
<p>
Compare a base scan and a product scan to determine changes made to the system.
</p>
</div>

<div class="row">
<div class="col">
<label for="SelectedBaseRunId">Base Run Id</label>
@Html.DropDownListFor(x => x.SelectedBaseRunId, runList, "Select Base Run")
</div>
<div class="col">
<label for="SelectedCompareRunId">Compare Run Id</label>
@Html.DropDownListFor(x => x.SelectedCompareRunId, runList, "Select Compare Run")
</div>
<div class="col">
<input type="button" class="btn btn-primary btn-square" id="RunAnalysisButton" value="Run Analysis" />
</div>
</div>

@{
if (Model.Runs.Count() > 0)
{
<div class="explain">
<p>
Compare a base scan and a product scan to determine changes made to the system.
</p>
</div>
<div class="row">
<div class="col">
<label for="SelectedBaseRunId">Base Run Id</label>
@Html.DropDownListFor(x => x.SelectedBaseRunId, runList, "Select Base Run")
</div>
<div class="col">
<label for="SelectedCompareRunId">Compare Run Id</label>
@Html.DropDownListFor(x => x.SelectedCompareRunId, runList, "Select Compare Run")
</div>
<div class="col">
<input type="button" class="btn btn-primary btn-square" id="RunAnalysisButton" value="Run Analysis" />
</div>
</div>
}
else
{
<div class="explain card card-body warning">
You must collect some results before performing analysis.
</div>
}
}

<div id="Status"></div>
<div class="row">
<div class="col" id="CompareStatus">Status messages appear here after starting analysis.</div>
Expand Down Expand Up @@ -99,7 +112,7 @@
</div>
<div class="row top-margin">
<div class="col">
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="FetchResultsButton" value="More Results" disabled/>
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="FetchResultsButton" value="More Results" disabled />
</div>
</div>
<div class="thinspacer"></div>
Expand Down Expand Up @@ -142,7 +155,7 @@
</div>
<div class="row">
<div class="col">
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="ExportResultsButton" value="Export to JSON" disabled/>
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="ExportResultsButton" value="Export to JSON" disabled />
</div>
</div>
</div>
Expand Down Expand Up @@ -225,29 +238,42 @@
</div>
</div>
<div class="monitor">
<div class="explain">
<p>
Compare a base scan and a product scan to determine changes made to the system.
</p>
</div>

<div class="row">
<div class="col">
<label for="SelectedMonitorRunId">Monitor Run Id</label>
@Html.DropDownListFor(x => x.SelectedMonitorRunId, monitorRunList, "Select Monitor Run")
</div>
<div class="col">
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="RunMonitorAnalysisButton" value="More Results" />
</div>

<div class="form-check" style="display:none">
<label class="form-check-label" for="FileRadio">
@{
if (Model.MonitorRuns.Count() > 0)
{
<div class="explain">
<p>
Choose a monitor run to evaluate.
</p>
</div>
<div class="row">
<div class="col">
<label for="SelectedMonitorRunId">Monitor Run Id</label>
@Html.DropDownListFor(x => x.SelectedMonitorRunId, monitorRunList, "Select Monitor Run")
</div>
<div class="col">
<input type="button" class="btn btn-primary btn-square ResultManipulationButton" id="RunMonitorAnalysisButton" value="More Results" />
</div>

<div class="form-check" style="display:none">
<label class="form-check-label" for="FileRadio">

<input class="form-check-input" type="radio" name="MonitorResultType" id="MonitorFileRadio" value="0" checked>
File
</label>
</div>
</div>
}
else
{
<div class="explain card card-body warning">
You must collect some results before performing analysis.
</div>
}
}

<input class="form-check-input" type="radio" name="MonitorResultType" id="MonitorFileRadio" value="0" checked>
File
</label>
</div>
</div>
<div class="row">
<div class="col">
<div id="MonitorStatus"></div>
Expand Down
2 changes: 1 addition & 1 deletion Gui/Views/Shared/_Layout.cshtml
View file
Expand Up @@ -34,7 +34,7 @@
</div>
</nav>

<div class="row card card-body" id="AdminWarning">
<div class="row card card-body warning" id="AdminWarning">
Attack Surface Analyzer is not running as Administrator/Root and can only provide limited results.
</div>
<div class="row no-gutters">
Expand Down
9 changes: 6 additions & 3 deletions Gui/wwwroot/css/site.css
View file
Expand Up @@ -58,8 +58,11 @@ body {
}

#AdminWarning{
text-align:center;
font-style:italic;
background-color:coral;
display:none;
}

.warning {
text-align: center;
font-style: italic;
background-color: coral;
}
13 changes: 13 additions & 0 deletions version.json
View file
@@ -0,0 +1,13 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.0-beta",
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/heads/v\\d+(?:\\.\\d+)?$"
],
"cloudBuild": {
"buildNumber": {
"enabled": true
}
}
}

0 comments on commit d243981

Please sign in to comment.