Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,5 @@ FakesAssemblies/
# LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
ModelManifest.xml
/OrbitOne.BuildScreen/OrbitOne.BuildScreen/App_Data
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ public class Build
public DateTime FinishTime { get; set; }
public DateTime StartTime { get; set; }
public string Status { get; set; }
public string Result { get; set; }
public RequestedFor RequestedFor { get; set; }
public Request[] Requests { get; set; }
public string Uri { get; set; }
public Definition Definition { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,43 @@ private IEnumerable<BuildInfoDto> GetBuildsForPollingSince(string teamProjectNam
{
List<BuildInfoDto> dtos = new List<BuildInfoDto>();
try
{
{
var polledBuilds = GetPolledBuilds(teamProjectName, finishTime);
Parallel.ForEach(polledBuilds, new ParallelOptions { MaxDegreeOfParallelism = DegreeOfParallelism }, build =>
{
var buildInfoDto = new BuildInfoDto
{
TeamProject = teamProjectName,
Status = build.Status,
Status = build.Result,
Builddefinition = build.Definition.Name,
StartBuildDateTime = build.StartTime,
FinishBuildDateTime = build.FinishTime,
RequestedByName = build.Requests.First().RequestedFor.DisplayName,
RequestedByPictureUrl = build.Requests.First().RequestedFor.ImageUrl + "&size=2",
RequestedByName = build.RequestedFor.DisplayName,
RequestedByPictureUrl = build.RequestedFor.ImageUrl,
TotalNumberOfTests = 0,
PassedNumberOfTests = 0,
BuildReportUrl = _helperClass.ConvertReportUrl(teamProjectName, build.Uri, true),
Id = "VSO" + teamProjectId + build.Definition.Id
};

if(buildInfoDto.RequestedByName.StartsWith("[DefaultCollection]"))
{
buildInfoDto.RequestedByName = "Service Account";
}

if (build.Status.Equals(Enum.GetName(typeof(StatusEnum.Statuses), StatusEnum.Statuses.inProgress)))
{
buildInfoDto.BuildReportUrl = _helperClass.ConvertReportUrl(teamProjectName, build.Uri, false);
var lastBuildTime = GetLastBuildTime(teamProjectName, build);
buildInfoDto.Status = StatusEnum.Statuses.inProgress.ToString();
if (lastBuildTime != null)
{
buildInfoDto.LastBuildTime = lastBuildTime.FinishTime - lastBuildTime.StartTime;
}
}
if (
build.Status.Equals(Enum.GetName(typeof(StatusEnum.Statuses),
build.Result != null &&
build.Result.Equals(Enum.GetName(typeof(StatusEnum.Statuses),
StatusEnum.Statuses.partiallySucceeded)))
{
var results = GetTestResults(teamProjectName, build.Uri);
Expand Down Expand Up @@ -225,27 +233,34 @@ private BuildInfoDto GetLatestBuild(string teamProjectName, string bdId, string
var latestBuild =
_helperClass
.RetrieveTask<Build>(
(String.Format(_configurationRestService.RetrieveLastBuildAsyncUrl, teamProjectName, bdUri)))
(String.Format(_configurationRestService.RetrieveLastBuildAsyncUrl, teamProjectName, bdId)))
.Result
.FirstOrDefault();
if (latestBuild == null) return null;
buildInfoDto = new BuildInfoDto
{
TeamProject = teamProjectName,
Status = latestBuild.Status,
Status = latestBuild.Result,
Builddefinition = bdName,
StartBuildDateTime = latestBuild.StartTime,
FinishBuildDateTime = latestBuild.FinishTime,
RequestedByName = latestBuild.Requests.First().RequestedFor.DisplayName,
RequestedByPictureUrl = latestBuild.Requests.First().RequestedFor.ImageUrl + "&size=2",
RequestedByName = latestBuild.RequestedFor.DisplayName,
RequestedByPictureUrl = latestBuild.RequestedFor.ImageUrl,
TotalNumberOfTests = 0,
PassedNumberOfTests = 0,
BuildReportUrl = _helperClass.ConvertReportUrl(teamProjectName, latestBuild.Uri, true),
Id = "VSO" + teamProjectId + bdId
};

if (buildInfoDto.RequestedByName.StartsWith("[DefaultCollection]"))
{
buildInfoDto.RequestedByName = "Service Account";
}

if (latestBuild.Status.Equals(Enum.GetName(typeof(StatusEnum.Statuses), StatusEnum.Statuses.inProgress)))
{
buildInfoDto.BuildReportUrl = _helperClass.ConvertReportUrl(teamProjectName, latestBuild.Uri, false);
buildInfoDto.Status = StatusEnum.Statuses.inProgress.ToString();
var secondLastBuildList =
_helperClass.RetrieveTask<Build>(
(String.Format(_configurationRestService.RetrieveLastSuccessfulBuildUrl, teamProjectName, bdUri))).Result;
Expand All @@ -257,7 +272,8 @@ private BuildInfoDto GetLatestBuild(string teamProjectName, string bdId, string
}

}
if (latestBuild.Status.Equals(Enum.GetName(typeof(StatusEnum.Statuses), StatusEnum.Statuses.partiallySucceeded)))
if (latestBuild.Result != null &&
latestBuild.Result.Equals(Enum.GetName(typeof(StatusEnum.Statuses), StatusEnum.Statuses.partiallySucceeded)))
{
var results = GetTestResults(teamProjectName, latestBuild.Uri);
if (results != null)
Expand Down
64 changes: 45 additions & 19 deletions OrbitOne.BuildScreen/OrbitOne.BuildScreen/Content/Site.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ html {
body {
font-family: 'Quattrocento Sans', sans-serif;
}

.builds-container {
padding: 1% 2% 0 2%;
min-height: 100vh;
Expand Down Expand Up @@ -122,8 +123,8 @@ body {
top: -1px;
right: 0;
left: 0;
margin-left:auto;
margin-right:auto;
margin-left: auto;
margin-right: auto;
z-index: 10;
padding: 15px;
-webkit-box-shadow: 2px 2px 5px rgba(0,0,0,0.3);
Expand All @@ -142,17 +143,16 @@ body {
.item-title {
color: white;
/*font-family: 'segoe_uisemilight';*/

font-weight: 400;
margin-bottom: 5px;
margin-top: 5px;
margin-top: 5px;
word-break: break-all;
}

.item-subtitle {
color: white;
/*font-family: 'segoe_uisemibold';*/

font-weight: 700;
margin-top: 5px;
/* margin-bottom: 1vw;*/
Expand All @@ -161,7 +161,6 @@ body {

.item .itemcontent p {
/*font-family: 'segoe_uisemilight';*/

font-weight: 400;
line-height: 0;
}
Expand Down Expand Up @@ -201,7 +200,7 @@ body {
-webkit-box-shadow: 2px 2px 5px rgba(0,0,0,0.3);
-ms-box-shadow: 2px 2px 5px rgba(0,0,0,0.3);
box-shadow: 2px 2px 5px rgba(0,0,0,0.3);
-webkit-filter: drop-shadow(0px 0px 0px rgba(0, 0, 0, 0));/*solution to problem with overflow in chrome and opera*/
-webkit-filter: drop-shadow(0px 0px 0px rgba(0, 0, 0, 0)); /*solution to problem with overflow in chrome and opera*/
-o-filter: dropShadow(0px 0px 0px rgba(0, 0, 0, 0));
overflow: hidden;
-ms-border-radius: 50%;
Expand Down Expand Up @@ -256,6 +255,14 @@ body {
margin-bottom: -0.5vw;
}

.item-title-s {
font-size: 1.5vw;
}

.item-title-xs {
font-size: 1.4vw;
}

.item-subtitle {
font-size: 1.2vw;
}
Expand Down Expand Up @@ -297,7 +304,7 @@ body {
}

.error-container {
max-width: 20%;
max-width: 20%;
}
}

Expand All @@ -324,6 +331,15 @@ body {
margin-bottom: -0.7vw;
}


.item-title-s {
font-size: 2.4vw;
}

.item-title-xs {
font-size: 2.2vw;
}

.item-subtitle {
font-size: 2vw;
margin-top: 0.5vw;
Expand Down Expand Up @@ -369,7 +385,7 @@ body {
}

.error-container {
max-width: 40%;
max-width: 40%;
}
}

Expand Down Expand Up @@ -399,6 +415,15 @@ body {
margin-bottom: 0vw;
}


.item-title-s {
font-size: 7.5vw;
}

.item-title-xs {
font-size: 7vw;
}

.item-subtitle {
font-size: 6vw;
margin-bottom: 6vw;
Expand Down Expand Up @@ -445,21 +470,22 @@ body {
.avatar .initials {
font-size: 20vw;
}

#counter {
margin-top: -62%;
font-size: 8vw;
margin-top: -62%;
font-size: 8vw;
}

.error-container {
max-width: 50%;
max-width: 50%;
}
}

/*------------- COLORS ---------------*/

.succeeded {
background: #37B800;
background: linear-gradient(45deg, transparent 50%, #2D9600 50%) no-repeat border-box, linear-gradient(145deg, #31A300 50%, #37B800 50%)no-repeat border-box;
background: linear-gradient(45deg, transparent 50%, #2D9600 50%) no-repeat border-box, linear-gradient(145deg, #31A300 50%, #37B800 50%)no-repeat border-box;
}

.partiallySucceeded {
Expand All @@ -472,15 +498,17 @@ body {
background: linear-gradient(75deg, transparent 50%, #D11100 50%) no-repeat border-box, linear-gradient(160deg, #D61200 50%, #CC1100 50%)no-repeat border-box;
}

.canceled,
.stopped {
background: #852BE8;
background: linear-gradient(160deg, transparent 65%, #6E24BF 0%) no-repeat border-box, linear-gradient(25deg, #7526CC 50%, #852BE8 0%)no-repeat border-box;
background: #852BE8;
background: linear-gradient(160deg, transparent 65%, #6E24BF 0%) no-repeat border-box, linear-gradient(25deg, #7526CC 50%, #852BE8 0%)no-repeat border-box;
}

.inProgress {
background: #0498E5;
background: linear-gradient(10deg, transparent 69%, #047DBD 0%) no-repeat border-box, linear-gradient(130deg, #0491DB 50%, #0498E5 50%)no-repeat border-box;
}

.notStarted {
background: #04D178;
background: linear-gradient(10deg, transparent 55%, #039657 0%) no-repeat border-box, linear-gradient(80deg, #04E383 50%, #04D178 50%)no-repeat border-box;
Expand All @@ -496,8 +524,6 @@ body {
transition: top ease-out 0.5s;
}

.error-container.ng-hide {
top: -50px;
}


.error-container.ng-hide {
top: -50px;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
<Content Include="Images\avatar.png" />
<Content Include="Images\gplaypatternDark.png" />
<Content Include="Images\Orbit_one_circle.png" />
<Content Include="Images\unknownuser.png" />
<Content Include="Scripts\aes.js" />
<Content Include="Scripts\angular-animate.js" />
<Content Include="Scripts\angular-animate.min.js" />
Expand Down Expand Up @@ -358,7 +359,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>16279</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,24 @@
$scope.retrieveBuildsFirstTime();

$scope.isStatusImportant = function (status) {
var importantStatuses = ["failed", "inProgress", "partiallySucceeded", "stopped", "notStarted"];
var importantStatuses = ["failed", "inProgress", "partiallySucceeded", "canceled", "stopped", "notStarted"];
if (importantStatuses.indexOf(status) >= 0) {
return true;
} else {
return false;
}
}

$scope.getTitleSizeClass = function (title) {
if (title.length < 19) {
return 'item-title-l';
} else if (title.length < 37) {
return 'item-title-s';
}

return 'item-title-xs';
}

$scope.$on("$destroy", function () {
$scope.poll = function () { };
$scope.retrieveBuildsFirstTime = function () { };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span id="dateFilter" data-date="{{build.StartBuildDateTime}}" /> <!--This is because of Isotope/Angular compatibility problem-->

<div class="aspect-content">
<p class="item-title" title="{{build.Builddefinition}}">{{build.Builddefinition | titleFilter:18}}</p>
<p class="item-title" ng-class="getTitleSizeClass(build.Builddefinition)" title="{{build.Builddefinition}}">{{build.Builddefinition | titleFilter:52 }}</p>
<p class="item-subtitle" title="{{build.TeamProject}}">{{build.TeamProject | titleFilter:25}}</p>
<div class="itemcontent">
<p ng-if="build.Status !== 'inProgress' && build.Status !== 'notStarted'">
Expand Down Expand Up @@ -54,6 +54,5 @@
<div class="avatar" ng-if="isStatusImportant(build.Status)">
<img no-avatar ng-src="{{build.RequestedByPictureUrl}}" alt="avatar" />
</div>

</div>
</div>
18 changes: 9 additions & 9 deletions OrbitOne.BuildScreen/OrbitOne.BuildScreen/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections>
<ConfigurationRestService RetrieveProjectsAsyncUrl="DefaultCollection/_apis/projects?api-version=1.0"
RetrieveBuildsOnFinishtime="Defaultcollection/{0}/_apis/build/builds?api-version=1.0&amp;minfinishtime={1}"
RetrieveBuildsInProgress="Defaultcollection/{0}/_apis/build/builds?status=InProgress&amp;api-version=1.0"
RetrieveLastBuildAsyncUrl="DefaultCollection/_apis/build/builds?api-version=1.0&amp;definition={1}&amp;$top=1"
RetrieveLastSuccessfulBuildUrl="DefaultCollection/_apis/build/builds?api-version=1.0&amp;definition={1}&amp;status=succeeded&amp;$top=1"
RetriveLastPartiallyOrFailedUrl="/DefaultCollection/_apis/build/builds?api-version=1.0&amp;definition={1}&amp;status=failed,partiallysucceeded&amp;$top=1"
RetrieveBuildDefinitionsUrl="DefaultCollection/{0}/_apis/build/definitions?api-version=1.0"
RetrieveRunsAsyncUrl="DefaultCollection/{0}/_apis/test/runs?api-version=1.0&amp;builduri={1}"
RetrieveTestsAsyncUrl="DefaultCollection/{0}/_apis/test/Runs/{1}/results?api-version=1.0"
<ConfigurationRestService RetrieveProjectsAsyncUrl="DefaultCollection/_apis/projects?api-version=2.0"
RetrieveBuildsOnFinishtime="Defaultcollection/{0}/_apis/build/builds?api-version=2.0&amp;minFinishTime={1}"
RetrieveBuildsInProgress="Defaultcollection/{0}/_apis/build/builds?statusFilter=inProgress&amp;api-version=2.0"
RetrieveLastBuildAsyncUrl="DefaultCollection/{0}/_apis/build/builds?api-version=2.0&amp;definitions={1}&amp;$top=1"
RetrieveLastSuccessfulBuildUrl="DefaultCollection/{0}/_apis/build/builds?api-version=2.0&amp;definitions={1}&amp;resultFilter=succeeded&amp;$top=1"
RetriveLastPartiallyOrFailedUrl="/DefaultCollection/{0}/_apis/build/builds?api-version=2.0&amp;definitions={1}&amp;resultFilter=failed,partiallySucceeded&amp;$top=1"
RetrieveBuildDefinitionsUrl="DefaultCollection/{0}/_apis/build/definitions?api-version=2.0"
RetrieveRunsAsyncUrl="DefaultCollection/{0}/_apis/test/runs?api-version=2.0&amp;builduri={1}"
RetrieveTestsAsyncUrl="DefaultCollection/{0}/_apis/test/Runs/{1}/results?api-version=2.0"
BuildDefinitionUri="vstfs:///Build/Definition/{0}"
HourFormatRest="{0}-{1}-{2}-{3}:{4}" />
<log4net>
Expand Down