Web App (Assessing): Issue #2182 - wip #2

CityOfBoston · Sep 21, 2021 · 1e1a6e5 · 1e1a6e5
1 parent 41c8f9d
commit 1e1a6e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/assessing/dist/index.js b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/assessing/dist/index.js
diff --git a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/assessing/src/js/app/index.js b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/assessing/src/js/app/index.js
@@ -108,7 +108,7 @@ class MNL extends React.Component {
         { abbr: 'TE', label: 'Terrace' },
         { abbr: 'WY', label: 'Way' },
       ],
-      aptUnitLabels: ["apt", "apt.", "unit", "#"],
+      aptUnitLabels: ["apt", "apt.", "unit", "unit.", "#"],
       validationMgs: "",
       postResMessage: ""
     };
@@ -268,14 +268,26 @@ class MNL extends React.Component {
    *      returns {index: -1, value: ""}
    */
   findAptUnitInAddress = addressArr => {
+    const { aptUnitLabels } = this.state;
     let retObj = { index: -1, value: '' };
+
     const index = addressArr.findIndex(element => {
-      return this.state.aptUnitLabels.find(elem => elem === element.toLowerCase())
+      return aptUnitLabels.find(elem => {
+        const elementLCase = element.toLocaleLowerCase();
+        const elemLCase = elem.toLowerCase();
+        return elemLCase === element.toLowerCase() || elementLCase.indexOf(elemLCase) > -1
+      });
     });
 
     retObj.index = index;
     retObj.value = addressArr[index];
 
+    // if (retObj.index > -1 && addressArr[retObj.index].match(/\d+/g) !== null) {
+
+    // }
+
+    // console.log('findAptUnitInAddress > retObj: ', retObj, addressArr);
+
     return retObj;
   }