fix: speed up search

hopetambala · Apr 24, 2021 · 337b0a8 · 337b0a8
1 parent ed2fd70
commit 337b0a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/components/ResidentIdSearchbar/index.js b/components/ResidentIdSearchbar/index.js
@@ -25,7 +25,6 @@ const ResidentIdSearchbar = ({ surveyee, setSurveyee, surveyingOrganization }) =
   }, [surveyingOrganization]);
 
   const fetchOfflineData = async () => {
-    setLoading(true);
     setOnline(false);
 
     getData('residentData').then((residentData) => {
@@ -46,7 +45,6 @@ const ResidentIdSearchbar = ({ surveyee, setSurveyee, surveyingOrganization }) =
   };
 
   const fetchOnlineData = async (qry) => {
-    setLoading(true);
     setOnline(true);
 
     const records = await parseSearch(surveyingOrganization, qry);
@@ -91,6 +89,9 @@ const ResidentIdSearchbar = ({ surveyee, setSurveyee, surveyingOrganization }) =
 
   const onChangeSearch = (input) => {
     setLoading(true);
+
+    if (input === '') setLoading(false);
+
     clearTimeout(searchTimeout);
 
     setQuery(input);

diff --git a/components/ResidentIdSearchbar/utils/index.js b/components/ResidentIdSearchbar/utils/index.js
@@ -11,19 +11,15 @@ const parseSearch = (surveyingOrganization, qry) => {
   }
 
   const fname = new Parse.Query('SurveyData');
-  fname.limit(2000);
+  fname.limit(1000);
   fname.startsWith('fname', qry);
 
   const lname = new Parse.Query('SurveyData');
-  lname.limit(2000);
+  lname.limit(1000);
   lname.startsWith('lname', qry);
 
-  const nname = new Parse.Query('SurveyData');
-  nname.limit(2000);
-  nname.startsWith('nickname', qry);
-
   return new Promise((resolve, reject) => {
-    const query = Parse.Query.or(fname, lname, nname);
+    const query = Parse.Query.or(fname, lname);
 
     query.descending('createdAt');