- PR Change Requests (Progress)

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

@@ -7,23 +7,21 @@ import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
-
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 import TaskListContainer from "../task-list/task-list.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  bodyshop: selectBodyshop
 });
+
+const mapDispatchToProps = (dispatch) => ({});
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
 
-export function JobLinesExpander({ jobline, jobid, bodyshop, currentUser }) {
+export function JobLinesExpander({ jobline, jobid, bodyshop }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -133,8 +131,6 @@ export function JobLinesExpander({ jobline, jobid, bodyshop, currentUser }) {
       </Col>
       <Col md={24} lg={24}>
         <TaskListContainer
-          currentUser={currentUser}
-          bodyshop={bodyshop}
           parentJobId={jobid}
           relationshipType={"joblineid"}
           relationshipId={jobline.id}

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

@@ -334,19 +334,24 @@ export function JobLinesComponent({
               >
                 <EditFilled />
               </Button>
-              <Button
-                title={t("tasks.buttons.create")}
-                onClick={() => {
-                  setTaskUpsertContext({
-                    context: {
-                      jobid: job.id,
-                      joblineid: record.id
-                    }
-                  });
-                }}
-              >
-                <FaTasks />
-              </Button>
+            </>
+          )}
+
+          <Button
+            title={t("tasks.buttons.create")}
+            onClick={() => {
+              setTaskUpsertContext({
+                context: {
+                  jobid: job.id,
+                  joblineid: record.id
+                }
+              });
+            }}
+          >
+            <FaTasks />
+          </Button>
+          {(record.manual_line || jobIsPrivate) && (
+            <>
               <Button
                 disabled={jobRO}
                 onClick={async () => {