manager: smoother reports search filters (fixes #9039) (#9053)

Co-authored-by: dogi <[email protected]>

Author: Mutugiii

package.json

@@ -1,7 +1,7 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.20.12",
+  "version": "0.20.13",
   "myplanet": {
     "latest": "v0.30.25",
     "min": "v0.29.25"

src/app/manager-dashboard/reports/logs-myplanet.component.ts

@@ -89,7 +89,7 @@ export class LogsMyPlanetComponent implements OnInit {
 
   filterData(filterValue: string) {
     this.searchValue = filterValue;
-    this.apklogs = this.allPlanets.filter(planet => filterSpecificFields([ 'name', 'doc.code' ])(planet, filterValue));
+    this.applyFilters();
   }
 
   setAllPlanets(planets: any[], apklogs: any[]) {
@@ -176,7 +176,7 @@ export class LogsMyPlanetComponent implements OnInit {
 
   applyFilters() {
     this.apklogs = this.allPlanets
-      .filter(planet => !this.searchValue || filterSpecificFields([ 'name', 'doc.code' ])(planet, this.searchValue))
+      .filter(planet => filterSpecificFields([ 'name', 'doc.code' ])(planet, this.searchValue))
       .map(planet => ({
         ...planet,
         children: this.filterLogs(planet.children)

src/app/manager-dashboard/reports/reports-myplanet.component.ts

@@ -12,6 +12,7 @@ import { attachNamesToPlanets, getDomainParams, areNoChildren } from './reports.
 import { findDocuments } from '../../shared/mangoQueries';
 import { DeviceInfoService, DeviceType } from '../../shared/device-info.service';
 import { CsvService } from '../../shared/csv.service';
+import { filterSpecificFields } from '../../shared/table-helpers';
 
 @Component({
   templateUrl: './reports-myplanet.component.html',
@@ -170,10 +171,12 @@ export class ReportsMyPlanetComponent implements OnInit {
   }
 
   applyFilters() {
-    this.planets = this.allPlanets.map(planet => ({
-      ...planet,
-      children: this.filterMyPlanetData(planet.children)
-    }));
+    this.planets = this.allPlanets
+      .filter(planet => filterSpecificFields([ 'name', 'doc.code' ])(planet, this.searchValue))
+      .map(planet => ({
+        ...planet,
+        children: this.filterMyPlanetData(planet.children)
+      }));
     this.isEmpty = areNoChildren(this.planets);
   }