diff --git a/.gitignore b/.gitignore index 7964536..fad0d37 100644 --- a/.gitignore +++ b/.gitignore @@ -186,4 +186,5 @@ FakesAssemblies/ # LightSwitch generated files GeneratedArtifacts/ _Pvt_Extensions/ -ModelManifest.xml \ No newline at end of file +ModelManifest.xml +/OrbitOne.BuildScreen/OrbitOne.BuildScreen/App_Data diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/Dtos/Build.cs b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/Dtos/Build.cs index 2451b22..ef6aaf1 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/Dtos/Build.cs +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/Dtos/Build.cs @@ -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; } diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/VsoRestService.cs b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/VsoRestService.cs index 0bbb8a9..4f6582c 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/VsoRestService.cs +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.RestApiService/VsoRestService.cs @@ -60,35 +60,43 @@ private IEnumerable GetBuildsForPollingSince(string teamProjectNam { List dtos = new List(); 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); @@ -225,27 +233,34 @@ private BuildInfoDto GetLatestBuild(string teamProjectName, string bdId, string var latestBuild = _helperClass .RetrieveTask( - (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( (String.Format(_configurationRestService.RetrieveLastSuccessfulBuildUrl, teamProjectName, bdUri))).Result; @@ -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) diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Content/Site.css b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Content/Site.css index 755f46b..95b7659 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Content/Site.css +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Content/Site.css @@ -18,6 +18,7 @@ html { body { font-family: 'Quattrocento Sans', sans-serif; } + .builds-container { padding: 1% 2% 0 2%; min-height: 100vh; @@ -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); @@ -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;*/ @@ -161,7 +161,6 @@ body { .item .itemcontent p { /*font-family: 'segoe_uisemilight';*/ - font-weight: 400; line-height: 0; } @@ -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%; @@ -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; } @@ -297,7 +304,7 @@ body { } .error-container { - max-width: 20%; + max-width: 20%; } } @@ -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; @@ -369,7 +385,7 @@ body { } .error-container { - max-width: 40%; + max-width: 40%; } } @@ -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; @@ -445,13 +470,14 @@ 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%; } } @@ -459,7 +485,7 @@ body { .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 { @@ -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; @@ -496,8 +524,6 @@ body { transition: top ease-out 0.5s; } -.error-container.ng-hide { - top: -50px; -} - - + .error-container.ng-hide { + top: -50px; + } diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Images/unknownuser.png b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Images/unknownuser.png new file mode 100644 index 0000000..1a563ff Binary files /dev/null and b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Images/unknownuser.png differ diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/OrbitOne.BuildScreen.csproj b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/OrbitOne.BuildScreen.csproj index a637b6c..bdd59e3 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/OrbitOne.BuildScreen.csproj +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/OrbitOne.BuildScreen.csproj @@ -231,6 +231,7 @@ + @@ -358,7 +359,7 @@ - True + False True 16279 / diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Controllers/BuildScreenController.js b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Controllers/BuildScreenController.js index 08a63fa..d29e3c8 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Controllers/BuildScreenController.js +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Controllers/BuildScreenController.js @@ -115,7 +115,7 @@ $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 { @@ -123,6 +123,16 @@ } } + $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 () { }; diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Templates/BuildDirectiveTemplate.html b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Templates/BuildDirectiveTemplate.html index 564408f..6846ced 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Templates/BuildDirectiveTemplate.html +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Scripts/App/Templates/BuildDirectiveTemplate.html @@ -3,7 +3,7 @@
-

{{build.Builddefinition | titleFilter:18}}

+

{{build.Builddefinition | titleFilter:52 }}

{{build.TeamProject | titleFilter:25}}

@@ -54,6 +54,5 @@

avatar
-
\ No newline at end of file diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Web.config b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Web.config index 353a8ed..eee1f0f 100644 --- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Web.config +++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen/Web.config @@ -11,15 +11,15 @@
-