All dependecy upgrades + linting fixes.

2020-02-06 17:07:15 -08:00
parent 5e65fb3b54
commit b86586241a
15 changed files with 2128 additions and 1154 deletions
--- a/client/src/components/job-detail-cards/job-detail-cards.insurance.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.insurance.component.jsx
@@ -10,45 +10,45 @@ export default function JobDetailCardsInsuranceComponent({ loading, data }) {
    <CardTemplate loading={loading} title={t("jobs.labels.cards.insurance")}>
      {data ? (
        <span>
-          <div>{data?.ins_co_nm || t("general.labels.unknown")}</div>
-          <div>{data?.clm_no || t("general.labels.unknown")}</div>
+          <div>{data.ins_co_nm || t("general.labels.unknown")}</div>
+          <div>{data.clm_no || t("general.labels.unknown")}</div>
          <div>
            {t("jobs.labels.cards.filehandler")}
-            {data?.ins_ea ? (
+            {data.ins_ea ? (
              <a href={`mailto:${data.ins_ea}`}>
-                <div>{`${data?.ins_ct_fn || ""} ${data?.ins_ct_ln || ""}`}</div>
+                <div>{`${data.ins_ct_fn || ""} ${data.ins_ct_ln || ""}`}</div>
              </a>
            ) : (
-              <div>{`${data?.ins_ct_fn || ""} ${data?.ins_ct_ln || ""}`}</div>
+              <div>{`${data.ins_ct_fn || ""} ${data.ins_ct_ln || ""}`}</div>
            )}
-            {data?.ins_ph1 ? (
-              <PhoneFormatter>{data?.ins_ph1}</PhoneFormatter>
+            {data.ins_ph1 ? (
+              <PhoneFormatter>{data.ins_ph1}</PhoneFormatter>
            ) : null}
          </div>

          <div>
            {t("jobs.labels.cards.appraiser")}
-            {data?.est_ea ? (
+            {data.est_ea ? (
              <a href={`mailto:${data.est_ea}`}>
-                <div>{`${data?.ins_ct_fn || ""} ${data?.ins_ct_ln || ""}`}</div>
+                <div>{`${data.ins_ct_fn || ""} ${data.ins_ct_ln || ""}`}</div>
              </a>
            ) : (
-              <div>{`${data?.ins_ct_fn || ""} ${data?.ins_ct_ln || ""}`}</div>
+              <div>{`${data.ins_ct_fn || ""} ${data.ins_ct_ln || ""}`}</div>
            )}
          </div>

          <div>
            {t("jobs.labels.cards.estimator")}
-            {data?.est_ea ? (
+            {data.est_ea ? (
              <a href={`mailto:${data.est_ea}`}>
-                <div>{`${data?.est_ct_fn || ""} ${data?.est_ct_ln || ""}`}</div>
+                <div>{`${data.est_ct_fn || ""} ${data.est_ct_ln || ""}`}</div>
              </a>
            ) : (
-              <div>{`${data?.est_ct_fn || ""} ${data?.est_ct_ln || ""}`}</div>
+              <div>{`${data.est_ct_fn || ""} ${data.est_ct_ln || ""}`}</div>
            )}
-            {data?.est_ph1 ? (
-                <PhoneFormatter>{data?.est_ph1}</PhoneFormatter>
-              ) : null}
+            {data.est_ph1 ? (
+              <PhoneFormatter>{data.est_ph1}</PhoneFormatter>
+            ) : null}
          </div>
        </span>
      ) : null}
--- a/client/src/components/job-detail-cards/job-detail-cards.notes.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.notes.component.jsx
@@ -13,7 +13,7 @@ export default function JobDetailCardsNotesComponent({ loading, data }) {
  const { t } = useTranslation();

  return (
-    <CardTemplate
+    <CardTemplate 
      loading={loading}
      title={t("jobs.labels.cards.notes")}
      extraLink={`/manage/jobs/${data.id}#notes`}>
@@ -22,7 +22,7 @@ export default function JobDetailCardsNotesComponent({ loading, data }) {
          <List
            size='small'
            bordered
-            dataSource={data?.notes}
+            dataSource={data.notes}
            renderItem={item => (
              <List.Item>
                {item.critical ? (
--- a/client/src/components/job-detail-cards/job-detail-cards.vehicle.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.vehicle.component.jsx
@@ -9,7 +9,7 @@ export default function JobDetailCardsVehicleComponent({ loading, data }) {
    <CardTemplate
      loading={loading}
      title={t("jobs.labels.cards.vehicle")}
-      extraLink={data?.vehicle ? `/manage/vehicles/${data?.vehicle?.id}` : null}
+      extraLink={data.vehicle ? `/manage/vehicles/${data.vehicle.id}` : null}
    >
      {data ? (
        <span>
--- a/client/src/components/job-detail-lines/job-lines.container.jsx
+++ b/client/src/components/job-detail-lines/job-lines.container.jsx
@@ -52,24 +52,28 @@ export default function JobLinesContainer({ jobId, form }) {
          ? searchText
            ? data.joblines.filter(
                jl =>
-                  jl.unq_seq
-                    ?.toString()
+                  (jl.unq_seq || "")
+                    .toString()
                    .toLowerCase()
                    .includes(searchText.toLowerCase()) ||
-                  jl.line_desc
-                    ?.toLowerCase()
+                  (jl.line_desc || "")
+                    .toLowerCase()
                    .includes(searchText.toLowerCase()) ||
-                  jl.part_type
-                    ?.toLowerCase()
+                  (jl.part_type || "")
+                    .toLowerCase()
                    .includes(searchText.toLowerCase()) ||
-                  jl.oem_partno
-                    ?.toLowerCase()
+                  (jl.oem_partno || "")
+                    .toLowerCase()
                    .includes(searchText.toLowerCase()) ||
-                  jl.op_code_desc
-                    ?.toLowerCase()
+                  (jl.op_code_desc || "")
+                    .toLowerCase()
                    .includes(searchText.toLowerCase()) ||
-                  jl.db_price?.toString().includes(searchText.toLowerCase()) ||
-                  jl.act_price?.toString().includes(searchText.toLowerCase())
+                  (jl.db_price || "")
+                    .toString()
+                    .includes(searchText.toLowerCase()) ||
+                  (jl.act_price || "")
+                    .toString()
+                    .includes(searchText.toLowerCase())
              )
            : data.joblines
          : null
--- a/client/src/components/jobs-documents/jobs-documents.container.jsx
+++ b/client/src/components/jobs-documents/jobs-documents.container.jsx
@@ -41,9 +41,7 @@ export default connect(
      jobId={jobId}
      currentUser={currentUser}
      shopId={
-        shopData.data?.bodyshops[0]?.id
-          ? shopData.data?.bodyshops[0]?.id
-          : "error"
+        shopData.data.bodyshops[0].id ? shopData.data.bodyshops[0].id : "error"
      }
    />
  );
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -121,11 +121,11 @@ export default withRouter(function JobsList({
      key: "plate_no",
      width: "8%",
      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.vehicle?.plate_no, b.vehicle?.plate_no),
+      sorter: (a, b) => alphaSort(a.vehicle.plate_no, b.vehicle.plate_no),
      sortOrder:
        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
      render: (text, record) => {
-        return record.vehicle?.plate_no ? (
+        return record.vehicle.plate_no ? (
          <span>{record.vehicle.plate_no}</span>
        ) : (
          t("general.labels.unknown")
--- a/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
@@ -14,7 +14,7 @@ export default function NoteUpsertModalComponent({

  return (
    <Modal
-      title={noteState?.id ? t("notes.actions.edit") : t("notes.actions.new")}
+      title={noteState.id ? t("notes.actions.edit") : t("notes.actions.new")}
      visible={visible}
      okText={t("general.labels.save")}
      onOk={() => {
@@ -22,7 +22,8 @@ export default function NoteUpsertModalComponent({
      }}
      onCancel={() => {
        changeVisibility(false);
-      }}>
+      }}
+    >
      <div>
        {t("notes.fields.critical")}
        <Switch
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -27,23 +27,24 @@ export default connect(
  bodyshop,
  refetch
 }) {
-  const existingAppointments = useQuery(QUERY_APPOINTMENTS_BY_JOBID, {
-    variables: { jobid: jobId },
-    fetchPolicy: "network-only",
-    skip: !jobId
-  });
  const [scheduleModalVisible, setscheduleModalVisible] = scheduleModalState;
  const [appData, setAppData] = useState({ jobid: jobId, start: null });
  const [insertAppointment] = useMutation(INSERT_APPOINTMENT);
  const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS, {
    variables: {
      jobId: jobId,
-      status: bodyshop.md_ro_statuses.default_scheduled
+      status: bodyshop.md_ro_statuses.default_scheduled 
    }
  });
  const [formData, setFormData] = useState({ notifyCustomer: false });
  const { t } = useTranslation();

+  const existingAppointments = useQuery(QUERY_APPOINTMENTS_BY_JOBID, {
+    variables: { jobid: jobId },
+    fetchPolicy: "network-only",
+    skip: !scheduleModalVisible
+  });
+
  return (
    <ScheduleJobModalComponent
      existingAppointments={existingAppointments}