From ddb919e2cc3081b18f23d39dbaf79c5cfaa9712d Mon Sep 17 00:00:00 2001
From: swtmply <delosreyesjohnallen@gmail.com>
Date: Fri, 26 May 2023 22:56:36 +0800
Subject: [PATCH] IO-2264 removed filter function for estimators

---
 .../schedule-calendar.component.jsx           | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
index 144ef5392..743e0d83a 100644
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -53,29 +53,29 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
   );
 
   const filteredData = useMemo(() => {
-    return data
-      .filter((d) => {
-        if (d.__typename === "appointments") {
-          if (estimatorsFilter.length === 0) return true;
+    return data.filter((d) => {
+      const estFilter =
+        d.__typename === "appointments"
+          ? estimatorsFilter.length === 0
+            ? true
+            : !!estimatorsFilter.find(
+                (e) => e === `${d.job.est_ct_fn} ${d.job.est_ct_ln}`
+              )
+          : true;
 
-          return !!estimatorsFilter.find(
-            (e) => e !== `${d.job.est_ct_fn} ${d.job.est_ct_ln}`
-          );
-        }
-        return true;
-      })
-      .filter(
-        (d) =>
-          (d.block ||
-            (filter.intake && d.isintake) ||
-            (filter.manual && !d.isintake && d.block === false) ||
-            (d.__typename === "employee_vacation" &&
-              filter.employeevacation &&
-              !!d.employee)) &&
-          (filter.ins_co_nm && filter.ins_co_nm.length > 0
-            ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
-            : true)
+      return (
+        (d.block ||
+          (filter.intake && d.isintake) ||
+          (filter.manual && !d.isintake && d.block === false) ||
+          (d.__typename === "employee_vacation" &&
+            filter.employeevacation &&
+            !!d.employee)) &&
+        (filter.ins_co_nm && filter.ins_co_nm.length > 0
+          ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
+          : true) &&
+        estFilter
       );
+    });
   }, [data, filter, estimatorsFilter]);
 
   return (