From 533506a4506de387a3735b93a281f951aa48b0a9 Mon Sep 17 00:00:00 2001
From: Nick Charlton <nmcharlton@hotmail.com>
Date: Mon, 13 Dec 2021 21:20:45 +0000
Subject: [PATCH] fix: remove unset grower ID from captures filter (#245)

---
 package-lock.json              |  9 ++-------
 src/components/GrowerDetail.js |  2 +-
 src/models/Filter.js           | 15 ++++-----------
 src/models/Filter.test.js      | 16 +++++++++-------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54434eab0..f7c93507d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "treetracker-admin-client",
-  "version": "1.29.1",
+  "version": "1.31.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.29.1",
+      "version": "1.31.1",
       "dependencies": {
         "@date-io/date-fns": "^1.3.13",
         "@material-ui/core": "^4.9.10",
@@ -27371,11 +27371,6 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
diff --git a/src/components/GrowerDetail.js b/src/components/GrowerDetail.js
index 7d33023f7..e6eb2ca4f 100644
--- a/src/components/GrowerDetail.js
+++ b/src/components/GrowerDetail.js
@@ -174,7 +174,7 @@ const GrowerDetail = (props) => {
 
   async function getCaptureCountGrower(active, approved, growerId) {
     let filter = new FilterModel();
-    filter.planterId = growerId;
+    filter.planterId = growerId?.toString();
     filter.active = active;
     filter.approved = approved;
     const countResponse = await treeTrackerApi.getCaptureCount(filter);
diff --git a/src/models/Filter.js b/src/models/Filter.js
index b6657b7bc..d49e2f6d5 100644
--- a/src/models/Filter.js
+++ b/src/models/Filter.js
@@ -61,21 +61,15 @@ export default class Filter {
       where.active = this.active;
     }
 
-    if (this.planterId !== undefined) {
+    if (this.planterId) {
       where.planterId = this.planterId;
     }
 
-    if (
-      this.deviceIdentifier !== undefined &&
-      this.deviceIdentifier.length > 0
-    ) {
+    if (this.deviceIdentifier) {
       where.deviceIdentifier = this.deviceIdentifier;
     }
 
-    if (
-      this.planterIdentifier !== undefined &&
-      this.planterIdentifier.length > 0
-    ) {
+    if (this.planterIdentifier) {
       where.planterIdentifier = this.planterIdentifier;
     }
 
@@ -129,7 +123,7 @@ export default class Filter {
 
   /*
    * A fn to count the number of current applied filters
-  */
+   */
   countAppliedFilters() {
     let numFilters = 0;
 
@@ -183,5 +177,4 @@ export default class Filter {
 
     return numFilters;
   }
-
 }
diff --git a/src/models/Filter.test.js b/src/models/Filter.test.js
index 5a9ea121c..c47759a3e 100644
--- a/src/models/Filter.test.js
+++ b/src/models/Filter.test.js
@@ -6,22 +6,24 @@ describe('Filter, with initial values about this filter object', () => {
   beforeEach(() => {
     filter = new Filter();
     filter.uuid = '11942400-6617-4c6c-bf5e';
-    filter.captureId = 10;
+    filter.captureId = '10';
     filter.dateStart = '2019-07-25';
     filter.dateEnd = '2019-07-30';
     filter.approved = true;
     filter.active = true;
-    filter.planterId = 1;
+    filter.planterId = '1';
     filter.deviceIdentifier = '1';
     filter.planterIdentifier = '1';
   });
 
   it('getWhereObj() should be: ', () => {
-    expect(filter.getWhereObj()).toEqual(expect.objectContaining({ uuid: '11942400-6617-4c6c-bf5e' }));
+    expect(filter.getWhereObj()).toEqual(
+      expect.objectContaining({ uuid: '11942400-6617-4c6c-bf5e' }),
+    );
   });
 
   it('getWhereObj() should be: ', () => {
-    expect(filter.getWhereObj()).toEqual(expect.objectContaining({ id: 10 }));
+    expect(filter.getWhereObj()).toEqual(expect.objectContaining({ id: '10' }));
   });
 
   it('getWhereObj() should match: timeCreated between', () => {
@@ -63,7 +65,7 @@ describe('Filter, with initial values about this filter object', () => {
 
   it('getWhereObj() should match: planterId=1', () => {
     expect(filter.getWhereObj()).toEqual(
-      expect.objectContaining({ planterId: 1 }),
+      expect.objectContaining({ planterId: '1' }),
     );
   });
 
@@ -91,10 +93,10 @@ describe('Filter, with initial values about this filter object', () => {
     //}}}
   });
 
-  describe('set planterId = undefined', () => {
+  describe('set planterId = ""', () => {
     //{{{
     beforeEach(() => {
-      filter.planterId = undefined;
+      filter.planterId = '';
     });
 
     it('loopback object should not match any [planterId]', () => {