Merged in feature/IO-3596-Manual-Line-Lock-Down (pull request #3100)

IO-3596 Manual Line Lock Down

Approved-by: Dave Richer

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 { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectAuthLevel, 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,6 +49,7 @@ 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!) {
@@ -66,7 +67,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
   technician: selectTechnician,
-  isPartsEntry: selectIsPartsEntry
+  isPartsEntry: selectIsPartsEntry,
+  authLevel: selectAuthLevel
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -94,7 +96,8 @@ 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);
@@ -386,18 +389,20 @@ export function JobLinesComponent({
             key: "actions",
             render: (text, record) => (
               <Space>
-                {(record.manual_line || jobIsPrivate) && !technician && (
+                {(record.manual_line || jobIsPrivate) &&
-                  <Button
+                  !technician &&
-                    disabled={jobRO}
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    onClick={() => {
+                    <Button
-                      setJobLineEditContext({
+                      disabled={jobRO}
-                        actions: { refetch: refetch, submit: form && form.submit },
+                      onClick={() => {
-                        context: { ...record, jobid: job.id }
+                        setJobLineEditContext({
-                      });
+                          actions: { refetch: refetch, submit: form && form.submit },
-                    }}
+                          context: { ...record, jobid: job.id }
-                    icon={<EditFilled />}
+                        });
-                  />
+                      }}
-                )}
+                      icon={<EditFilled />}
+                    />
+                  )}
                 <Button
                   title={t("tasks.buttons.create")}
                   onClick={() => {
@@ -410,29 +415,30 @@ export function JobLinesComponent({
                   }}
                   icon={<FaTasks />}
                 />
-
+                {(record.manual_line || jobIsPrivate) &&
-                {(record.manual_line || jobIsPrivate) && !technician && (
+                  !technician &&
-                  <Button
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    disabled={jobRO}
+                    <Button
-                    onClick={async () => {
+                      disabled={jobRO}
-                      await deleteJobLine({
+                      onClick={async () => {
-                        variables: { joblineId: record.id },
+                        await deleteJobLine({
-                        update(cache) {
+                          variables: { joblineId: record.id },
-                          cache.modify({
+                          update(cache) {
-                            fields: {
+                            cache.modify({
-                              joblines(existingJobLines, { readField }) {
+                              fields: {
-                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                                joblines(existingJobLines, { readField }) {
+                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                                }
                               }
-                            }
+                            });
-                          });
+                          }
-                        }
+                        });
-                      });
+                        await axios.post("/job/totalsssu", { id: job.id });
-                      await axios.post("/job/totalsssu", { id: job.id });
+                        if (refetch) refetch();
-                      if (refetch) refetch();
+                      }}
-                    }}
+                      icon={<DeleteFilled />}
-                    icon={<DeleteFilled />}
+                    />
-                  />
+                  )}
-                )}
               </Space>
             )
           }
@@ -657,7 +663,7 @@ export function JobLinesComponent({
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
 
-            {!isPartsEntry && (
+            {!isPartsEntry && HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
               <Button
                 disabled={jobRO || technician}
                 onClick={() => {

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

@@ -26,6 +26,7 @@ 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,6 +435,19 @@ 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,6 +519,7 @@
             "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,6 +519,7 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
+            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },

client/src/translations/fr/common.json

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