Merge pull request #801 from satishc1/master

Replace collectorName with collectorNiceName in build detail widget. …
hygieia · Sep 9, 2016 · ccf01b6 · ccf01b6
2 parents d4f98a3 + 88f1a3b
commit ccf01b6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/UI/src/components/widgets/build/detail.html b/UI/src/components/widgets/build/detail.html
@@ -9,12 +9,12 @@
  <div class="col-md-3 build-time">
  <span>{{::detail.build.endTime | date:'MMM d, HH:mm:ss'}}</span>
  </div>
- <div class="col-md-3 build-duration">
+ <div class="col-md-2 build-duration">
  <span>Duration: {{::detail.build.duration | duration}}</span>
  </div>
- <div class="col-md-3 view-in-tool">
+ <div class="col-md-4 view-in-tool">
  <a ng-href="{{::detail.build.buildUrl}}" target="_blank">
- View in {{::detail.collectorName}} <span class="fa fa-angle-right"></span>
+ View in {{detail.buildUrlNiceName()}} <span class="fa fa-angle-right"></span>
  </a>
  </div>
  </div>

diff --git a/UI/src/components/widgets/build/detail.js b/UI/src/components/widgets/build/detail.js
@@ -8,16 +8,32 @@
  .module(HygieiaConfig.module)
  .controller('BuildWidgetDetailController', BuildWidgetDetailController);
 
- BuildWidgetDetailController.$inject = ['$scope', '$modalInstance', 'build', 'collectorName'];
- function BuildWidgetDetailController($scope, $modalInstance, build, collectorName) {
+ BuildWidgetDetailController.$inject = ['$scope', '$modalInstance', 'build', 'collectorName', 'collectorNiceName'];
+ function BuildWidgetDetailController($scope, $modalInstance, build, collectorName, collectorNiceName) {
  var ctrl = this;
 
  ctrl.build = build;
  ctrl.collectorName = collectorName;
+ ctrl.collectorNiceName = collectorNiceName;
 
+ ctrl.buildUrlNiceName = buildUrlNiceName;
  ctrl.buildPassed = buildPassed;
  ctrl.close = close;
 
+ function buildUrlNiceName() {
+ if (!isEmpty(collectorNiceName)) {
+ return collectorNiceName;
+ } else {
+ return collectorName;
+ }
+ }
+
+ function isEmpty(str) {
+ //!str returns true for uninitialized, null and empty strings
+ //the test checks if the string only contains whitespaces and returns true.
+ return !str || /^[\s]*$/.test(str);
+ }
+
  function buildPassed() {
  return ctrl.build.buildStatus === 'Success';
  }

diff --git a/UI/src/components/widgets/build/view.js b/UI/src/components/widgets/build/view.js
@@ -101,6 +101,9 @@
  },
  collectorName: function () {
  return $scope.dashboard.application.components[0].collectorItems.Build[0].collector.name;
+ },
+ collectorNiceName: function () {
+ return $scope.dashboard.application.components[0].collectorItems.Build[0].niceName;
  }
  }
  });