fixed some last second bugs

DeSigaar · Nov 14, 2018 · db48961 · db48961
1 parent ff8b076
commit db48961
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/client/src/components/popups/Dashboard.js b/client/src/components/popups/Dashboard.js
@@ -3,6 +3,7 @@ import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { addDashboard, getCompanies } from "../../actions/companyActions";
 import TextFieldGroup from "../common/TextField";
+import isEmpty from "../../validation/is-empty";
 import removeSpecial from "../../validation/remove-special";
 
 class Dashboard extends Component {
@@ -24,7 +25,10 @@ class Dashboard extends Component {
   };
 
   componentDidMount = () => {
-    this.handleSelectClick(this.state.companyId);
+    const { companyId } = this.state;
+    if (!isEmpty(companyId)) {
+      this.handleSelectClick(companyId);
+    }
   };
 
   componentWillReceiveProps = nextProps => {
@@ -91,8 +95,13 @@ class Dashboard extends Component {
     });
 
     // Highlight item in list
-    const selectedItem = document.getElementById(companyId);
-    selectedItem.classList.add("selected");
+    if (!isEmpty(companyId)) {
+      const selectedItem = document.getElementById(companyId);
+
+      if (!isEmpty(selectedItem)) {
+        selectedItem.classList.add("selected");
+      }
+    }
   };
 
   renderCompanyList = () => {

diff --git a/client/src/validation/remove-special.js b/client/src/validation/remove-special.js
@@ -7,11 +7,11 @@ const removeSpecial = value => {
   var res = "";
   for (var i = 0; i < lower.length; ++i) {
     if (allowed.indexOf(lower[i]) > -1) {
+      res += value[i];
+    } else {
       if (lower[i] !== upper[i] || lower[i].trim() === "") {
         res += value[i];
       }
-    } else {
-      res += value[i];
     }
   }
   return res;

diff --git a/validation/remove-special.js b/validation/remove-special.js
@@ -7,11 +7,11 @@ const removeSpecial = value => {
   var res = "";
   for (var i = 0; i < lower.length; ++i) {
     if (allowed.indexOf(lower[i]) > -1) {
+      res += value[i];
+    } else {
       if (lower[i] !== upper[i] || lower[i].trim() === "") {
         res += value[i];
       }
-    } else {
-      res += value[i];
     }
   }
   return res;