From 63ec578b6a9d158796782aabad4c782d63e28591 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 1 Mar 2022 15:17:33 -0800
Subject: [PATCH] IO-1749 Inactive employees removed from drop downs.

---
 .../job-employee-assignments.component.jsx    | 20 ++++++++++---------
 ...n-list-columns.empassignment.component.jsx | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
index 954d04970..6cfdc8307 100644
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -55,15 +55,17 @@ export function JobEmployeeAssignments({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>
diff --git a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
index 606867975..e2ed28896 100644
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -116,15 +116,17 @@ export function ProductionListEmpAssignment({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>