Merge pull request #794 from scorelab/demon-36-UI_fixes

Fixed UI issues of Dashboard, table and admin section
scorelab · Sep 2, 2019 · 348a21b · 348a21b
2 parents 12e45f5 + 3d06968
commit 348a21b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/ui/src/app/dashboard/controllers/DashCtrl.js b/ui/src/app/dashboard/controllers/DashCtrl.js
@@ -57,20 +57,17 @@
   if (keyEvent.which === 13)
     $scope.addLink();
   }
-    var getActiveDownloads = function() {
-      DashService.getDownloads().then(function (response) {
-        var data = response.data;
-        $scope.downloads = _.reduce(data, function(queue, d) {
-            if (d.status == 0) {
-              let object = _.extend({}, d, {progress: 0});
-              queue.push(object)
-              return queue;
-            }
-        }, []);
-      }, function(error){
-        ToastService.showToast("Oops! Something went wrong when fetching data");
+  var getActiveDownloads = function() {
+    DashService.getDownloads().then(function (response) {
+      var data = response.data;
+      $scope.filterdownloads = _.filter(data, function(d) {return d.status==0});
+      $scope.downloads = _.map($scope.filterdownloads, function(obj) {
+           return _.extend({}, obj, {progress: 0});
       });
-    }
+    }, function(error){
+      ToastService.showToast("Oops! Something went wrong when fetching data");
+    });
+}
 
     $scope.removeLink = function (index, id) {
       // Shows window confirmation before deleting download.

diff --git a/ui/src/app/views/admin.html b/ui/src/app/views/admin.html
@@ -13,7 +13,7 @@
       </md-button>
   </md-content>
 
-  <div ng-if="data?.length > 0">
+  <div ng-if="data.length != 0">
    <md-content class="block md-padding table-responsive-vertical" >
       <md-subheader class="md-primary">Signup requests</md-subheader>
 
@@ -35,7 +35,7 @@
     </md-content>
   </div>
 
-  <div ng-if="!data.length == true">
+  <div ng-if="data.length == 0">
     <md-content class="no-data-content" >
       <h4>There are no pending signup requests!</h4>
     </md-content>

diff --git a/ui/src/app/views/dashboard.html b/ui/src/app/views/dashboard.html
@@ -10,7 +10,7 @@
     </md-button>
   </md-content>
 
-  <div ng-if="data?.length > 0">
+  <div ng-if="data.length != 0">
     <md-content class="downloads md-padding table-responsive-vertical" >
       <h4 class="panel-widget-tittle"> On going downloads</h4>
       <table id="table" class="table table-hover table-bordered">
@@ -34,7 +34,7 @@ <h4 class="panel-widget-tittle"> On going downloads</h4>
     </md-content>
   </div>
 
-  <div ng-if="!data.length == true">
+  <div ng-if="data.length == 0">
     <md-content class="no-data-content" >
       <h4>There are no queued downloads, please add some!</h4>
     </md-content>

diff --git a/ui/src/app/views/table.html b/ui/src/app/views/table.html
@@ -1,4 +1,4 @@
-<div ng-if="data?.length > 0" class="table-responsive-vertical md-whiteframe-z1">
+<div ng-if="data.length != 0" class="table-responsive-vertical md-whiteframe-z1">
     <div>
         <md-button class="md-primary md-raised" layout-align="center end" ng-click="isGridVisible = !isGridVisible"><i class="material-icons ng-scope">{{ isGridVisible ? 'view_list' : 'view_module' }}</i></md-button>
         <md-button layout-align="end none" ng-show="isShowingActions" ng-click="generateSharingLink()"><i class="material-icons ng-scope">share</i></md-button>
@@ -30,7 +30,7 @@
     </table>
 </div>
 
-<div ng-if="!data.length == true">
+<div ng-if="data.length == 0">
   <md-content class="no-data-content" >
     <h4>There are no completed downloads yet!</h4>
   </md-content>