feat: tokenized filter option (#112)

* feat: add tokenized filter to verify page * feat: add tokenized filter to captures page * chore: use common tokenizationStates * chore: simplify tokenization dropdown logic
Greenstand · Jun 12, 2021 · 17742b2 · 17742b2
1 parent 707e428
commit 17742b2
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/src/common/variables.js b/src/common/variables.js
@@ -9,3 +9,7 @@ export const verificationStates = {
   AWAITING: 'Awaiting Verification',
   REJECTED: 'Rejected',
 };
+export const tokenizationStates = {
+  TOKENIZED: 'Tokenized',
+  NOT_TOKENIZED: 'Not Tokenized',
+};
diff --git a/src/components/Filter.js b/src/components/Filter.js
@@ -22,7 +22,7 @@ import {
   convertDateToDefaultSqlDate,
 } from '../common/locale';
 
-import { verificationStates } from '../common/variables';
+import { verificationStates, tokenizationStates } from '../common/variables';
 
 export const FILTER_WIDTH = 330;
 
@@ -72,6 +72,7 @@ function Filter(props) {
     filter.dateStart || dateStartDefault,
   );
   const [dateEnd, setDateEnd] = useState(filter.dateEnd || dateEndDefault);
+  const [tokenId, setTokenId] = useState(filterOptionAll);
 
   const handleDateStartChange = (date) => {
     setDateStart(date);
@@ -96,6 +97,7 @@ function Filter(props) {
     setDateEnd(dateEndDefault);
     setApproved();
     setActive();
+    setTokenId(filterOptionAll);
     props.onSubmit && props.onSubmit(filter);
   }
 
@@ -110,6 +112,7 @@ function Filter(props) {
     filter.dateEnd = dateEnd ? formatDate(dateEnd) : undefined;
     filter.approved = approved;
     filter.active = active;
+    filter.tokenId = tokenId;
     props.onSubmit && props.onSubmit(filter);
   }
 
@@ -251,6 +254,24 @@ function Filter(props) {
           </MenuItem>
         ))}
       </TextField>
+      <GSInputLabel text="Token Status" />
+      <TextField
+        select
+        value={tokenId}
+        onChange={(e) => {
+          setTokenId(e.target.value);
+        }}
+      >
+        {[
+          filterOptionAll,
+          tokenizationStates.NOT_TOKENIZED,
+          tokenizationStates.TOKENIZED,
+        ].map((name) => (
+          <MenuItem key={name} value={name}>
+            {name}
+          </MenuItem>
+        ))}
+      </TextField>
       <GSInputLabel text="Time created" />
       <MuiPickersUtilsProvider
         utils={DateFnsUtils}

diff --git a/src/components/FilterTop.js b/src/components/FilterTop.js
@@ -24,7 +24,7 @@ import {
   convertDateToDefaultSqlDate,
 } from '../common/locale';
 import { getOrganization } from '../api/apiUtils';
-import { verificationStates } from '../common/variables';
+import { verificationStates, tokenizationStates } from '../common/variables';
 
 export const FILTER_WIDTH = 330;
 
@@ -92,6 +92,7 @@ function Filter(props) {
     filter.organizationId || ALL_ORGANIZATIONS,
   );
   const [userHasOrg, setUserHasOrg] = useState(false);
+  const [tokenId, setTokenId] = useState(filterOptionAll);
 
   useEffect(() => {
     props.tagsDispatch.getTags(tagSearchString);
@@ -132,6 +133,7 @@ function Filter(props) {
     filter.speciesId = speciesId;
     filter.tagId = tag ? tag.id : 0;
     filter.organizationId = organizationId;
+    filter.tokenId = tokenId;
     props.onSubmit && props.onSubmit(filter);
   }
 
@@ -147,6 +149,7 @@ function Filter(props) {
     setOrganizationId(ALL_ORGANIZATIONS);
     setTag(null);
     setTagSearchString('');
+    setTokenId(filterOptionAll);
 
     const filter = new FilterModel();
     filter.approved = approved; // keeps last value set
@@ -198,6 +201,24 @@ function Filter(props) {
                   </MenuItem>
                 ))}
               </TextField>
+              <TextField
+                select
+                label="Token Status"
+                value={tokenId}
+                onChange={(e) => {
+                  setTokenId(e.target.value);
+                }}
+              >
+                {[
+                  filterOptionAll,
+                  tokenizationStates.NOT_TOKENIZED,
+                  tokenizationStates.TOKENIZED,
+                ].map((name) => (
+                  <MenuItem key={name} value={name}>
+                    {name}
+                  </MenuItem>
+                ))}
+              </TextField>
               <MuiPickersUtilsProvider
                 utils={DateFnsUtils}
                 locale={getDatePickerLocale()}

diff --git a/src/models/Filter.js b/src/models/Filter.js
@@ -7,6 +7,7 @@ export const SPECIES_NOT_SET = 'SPECIES_NOT_SET';
 export const ALL_ORGANIZATIONS = 'ALL_ORGANIZATIONS';
 export const ORGANIZATION_NOT_SET = 'ORGANIZATION_NOT_SET';
 export const TAG_NOT_SET = 'TAG_NOT_SET';
+import { tokenizationStates } from '../common/variables';
 
 export default class Filter {
   captureId;
@@ -21,6 +22,7 @@ export default class Filter {
   speciesId;
   tagId;
   organizationId;
+  tokenId;
 
   constructor(options) {
     Object.assign(this, options);
@@ -96,6 +98,12 @@ export default class Filter {
       where.organizationId = this.organizationId;
     }
 
+    if (this.tokenId === tokenizationStates.TOKENIZED) {
+      where.tokenId = { neq: null };
+    } else if (this.tokenId === tokenizationStates.NOT_TOKENIZED) {
+      where.tokenId = { eq: null };
+    }
+
     return where;
     //}}}
   }