IO-3607 Employee Drop Down Inactive filter

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/email-overlay/email-overlay.component.jsx

@@ -41,7 +41,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const emailsToMenu = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,
@@ -59,7 +59,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const menuCC = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -33,7 +33,7 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import _ from "lodash";
 import { FaTasks } from "react-icons/fa";
-import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
@@ -49,7 +49,6 @@ import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component.jsx";
 
 const UPDATE_JOB_LINES_LOCATION_BULK = gql`
   mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
@@ -67,8 +66,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
   technician: selectTechnician,
-  isPartsEntry: selectIsPartsEntry,
+  isPartsEntry: selectIsPartsEntry
-  authLevel: selectAuthLevel
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -96,8 +94,7 @@ export function JobLinesComponent({
   setTaskUpsertContext,
   billsQuery,
   handlePartsOrderOnRowClick,
-  isPartsEntry,
+  isPartsEntry
-  authLevel
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
   const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
@@ -389,20 +386,18 @@ export function JobLinesComponent({
             key: "actions",
             render: (text, record) => (
               <Space>
-                {(record.manual_line || jobIsPrivate) &&
+                {(record.manual_line || jobIsPrivate) && !technician && (
-                  !technician &&
+                  <Button
-                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+                    disabled={jobRO}
-                    <Button
+                    onClick={() => {
-                      disabled={jobRO}
+                      setJobLineEditContext({
-                      onClick={() => {
+                        actions: { refetch: refetch, submit: form && form.submit },
-                        setJobLineEditContext({
+                        context: { ...record, jobid: job.id }
-                          actions: { refetch: refetch, submit: form && form.submit },
+                      });
-                          context: { ...record, jobid: job.id }
+                    }}
-                        });
+                    icon={<EditFilled />}
-                      }}
+                  />
-                      icon={<EditFilled />}
+                )}
-                    />
-                  )}
                 <Button
                   title={t("tasks.buttons.create")}
                   onClick={() => {
@@ -415,30 +410,29 @@ export function JobLinesComponent({
                   }}
                   icon={<FaTasks />}
                 />
-                {(record.manual_line || jobIsPrivate) &&
+
-                  !technician &&
+                {(record.manual_line || jobIsPrivate) && !technician && (
-                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+                  <Button
-                    <Button
+                    disabled={jobRO}
-                      disabled={jobRO}
+                    onClick={async () => {
-                      onClick={async () => {
+                      await deleteJobLine({
-                        await deleteJobLine({
+                        variables: { joblineId: record.id },
-                          variables: { joblineId: record.id },
+                        update(cache) {
-                          update(cache) {
+                          cache.modify({
-                            cache.modify({
+                            fields: {
-                              fields: {
+                              joblines(existingJobLines, { readField }) {
-                                joblines(existingJobLines, { readField }) {
+                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
-                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
-                                }
                               }
-                            });
+                            }
-                          }
+                          });
-                        });
+                        }
-                        await axios.post("/job/totalsssu", { id: job.id });
+                      });
-                        if (refetch) refetch();
+                      await axios.post("/job/totalsssu", { id: job.id });
-                      }}
+                      if (refetch) refetch();
-                      icon={<DeleteFilled />}
+                    }}
-                    />
+                    icon={<DeleteFilled />}
-                  )}
+                  />
+                )}
               </Space>
             )
           }
@@ -663,7 +657,7 @@ export function JobLinesComponent({
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
 
-            {!isPartsEntry && HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+            {!isPartsEntry && (
               <Button
                 disabled={jobRO || technician}
                 onClick={() => {

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -26,7 +26,6 @@ const ret = {
   "jobs:partsqueue": 4,
   "jobs:checklist-view": 2,
   "jobs:list-ready": 1,
-  "jobs:manual-line": 1,
   "jobs:void": 5,
 
   "bills:enter": 2,

client/src/components/shop-info/shop-info.rbac.component.jsx

@@ -435,19 +435,6 @@ export function ShopInfoRbacComponent({ bodyshop }) {
           >
             <InputNumber />
           </Form.Item>,
-          <Form.Item
-            key="jobs:manual-line"
-            label={t("bodyshop.fields.rbac.jobs.manual-line")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-            name={["md_rbac", "jobs:manual-line"]}
-          >
-            <InputNumber />
-          </Form.Item>,
           <Form.Item
             key="jobs:partsqueue"
             label={t("bodyshop.fields.rbac.jobs.partsqueue")}

client/src/translations/en_us/common.json

@@ -519,7 +519,6 @@
             "list-active": "Jobs -> List Active",
             "list-all": "Jobs -> List All",
             "list-ready": "Jobs -> List Ready",
-            "manual-line": "Jobs -> Manual Line",
             "partsqueue": "Jobs -> Parts Queue",
             "void": "Jobs -> Void"
           },

client/src/translations/es/common.json

@@ -519,7 +519,6 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
-            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },

client/src/translations/fr/common.json

@@ -519,7 +519,6 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
-            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },