Jkmarx/fix dashboard search bugs

refinery/ui/source/js/dashboard/controllers/data-sets-card-ctrl.js

@@ -56,6 +56,7 @@
     vm.refreshDataSets = refreshDataSets;
     vm.resetDataSetSearch = resetDataSetSearch;
     vm.searchDataSets = searchDataSets;
+    vm.areDataSetsTextSearched = false; // data sets text searched via solr api
     vm.searchQueryDataSets = '';
     vm.totalDataSets = dataSetCardFactory.dataSetStats.totalCount;
 
@@ -111,6 +112,7 @@
         vm.totalDataSets = dataSetCardFactory.dataSetStats.totalCount;
         vm.numPages = Math.ceil(vm.totalDataSets / vm.itemsPerPage);
         vm.dataSetsError = false;
+        vm.areDataSetsTextSearched = false;
       }, function (error) {
         vm.loadingDataSets = false;
         $log.error(error);
@@ -217,6 +219,7 @@
     **/
     function resetDataSetSearch () {
       vm.searchQueryDataSets = '';
+      vm.areDataSetsTextSearched = false;
       vm.refreshDataSets();
     }
 
@@ -229,13 +232,20 @@
     function searchDataSets (query) {
       // reset perm filter until we can search & check perms
       vm.groupFilter = { selectedName: 'All' };
+      vm.params = { limit: vm.itemsPerPage, offset: vm.pageStartOffset };
       if (query && query.length > 1) {
         vm.loadingDataSets = true;
         var apiRequest = new DataSetSearchApi(query);
         apiRequest(200).then(function (response) {
           vm.dataSets = response.data;
+          angular.copy(response.data, dataSetCardFactory.dataSets);
+          dataSetCardFactory.dataSetStats.totalCount = response.data.length;
+          vm.dataSets = dataSetCardFactory.dataSets.slice(0, vm.itemsPerPage);
+          vm.totalDataSets = dataSetCardFactory.dataSetStats.totalCount;
+          vm.numPages = Math.ceil(vm.totalDataSets / vm.itemsPerPage);
           vm.loadingDataSets = false;
           vm.dataSetsError = false;
+          vm.areDataSetsTextSearched = true;
         }, function (error) {
           $log.error(error);
           vm.dataSetsError = true;

refinery/ui/source/js/dashboard/controllers/data-sets-card-ctrl.spec.js

@@ -38,6 +38,7 @@
       expect(ctrl.groupFilter.selectedName).toEqual('All');
       expect(ctrl.params.limit).toEqual(ctrl.itemsPerPage);
       expect(ctrl.params.limit).toEqual(ctrl.itemsPerPage);
+      expect(ctrl.areDataSetsTextSearched).toEqual(false);
     });
 
     it('Pagination variables should be initialized', function () {

refinery/ui/source/js/dashboard/partials/data-sets-card.html

@@ -154,7 +154,7 @@ <h3>
         <span ng-if="$ctrl.dataSets.length">
           {{ $ctrl.totalDataSets }} data sets
         </span>
-        <span ng-if="$ctrl.searchQueryDataSets.length > 0 && $ctrl.isFiltersEmpty()">
+        <span ng-if="$ctrl.areDataSetsTextSearched">
           <button
             class="refinery-base btn btn-default btn-xs m-l-1-2"
             ng-click="$ctrl.resetDataSetSearch()">

refinery/ui/source/styles/dashboard.less

@@ -1884,7 +1884,7 @@ body.repo-mode .refinery-dashboard {
         margin: 0 0 0 1em;
       }
       .fa-times-circle {
-        right: 80px;
+        right: 90px;
       }
     }
 
@@ -2071,6 +2071,9 @@ body.repo-mode .refinery-dashboard {
     }
     #search-interface-dashboard {
       margin-top: 5px;
+      .fa-times-circle {
+        right: 60px;
+      }
     }
   }
 

refinery/ui/source/styles/refinery-style.less

@@ -766,10 +766,9 @@ a.analysis-header {
     .search-query {
       box-sizing: border-box;
       width: 100%;
-      height: 25px;
+      height: 27px;
       font-size: 15px;
       line-height: normal;
-      padding-left: 25px;
       padding-right: 25px;
       margin: 0;
     }