From 457ec16fdc71bd5dfea39b7976cf1006adfc60ac Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 10:19:37 -0800
Subject: [PATCH 01/10] Removed whiteboard from front page. Added dates fields.
 Added rates fields. Started refactoring lines page.

---
 bodyshop_translations.babel                   | 527 +++++++++++++++++-
 .../job-detail-cards.dates.component.jsx      |  36 +-
 .../job-detail-lines/job-lines.component.jsx  |  89 ++-
 .../job-detail-lines/job-lines.container.jsx  |  57 +-
 .../jobs-detail-dates.component.jsx           |  90 +++
 .../jobs-detail-financial.component.jsx       | 122 +++-
 .../jobs-detail-insurance.component.jsx       |   2 -
 client/src/graphql/jobs.queries.js            |  39 +-
 .../jobs-available.page.container.jsx         |   9 +-
 .../jobs-detail.page.component.jsx            |  11 +-
 .../jobs-detail.page.container.jsx            |  16 +-
 .../manage-root.page.component.jsx            |   9 +
 .../manage-root.page.container.jsx            |   8 +
 client/src/pages/manage/manage.page.jsx       |  28 +-
 client/src/translations/en_us/common.json     |  25 +
 client/src/translations/es/common.json        |  25 +
 client/src/translations/fr/common.json        |  25 +
 client/src/utils/DateFormatter.jsx            |   2 +-
 18 files changed, 1013 insertions(+), 107 deletions(-)
 create mode 100644 client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
 create mode 100644 client/src/pages/manage-root/manage-root.page.component.jsx
 create mode 100644 client/src/pages/manage-root/manage-root.page.container.jsx

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 319a8d546..152f7805e 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.6.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.6.1">
     <!--
 
     BabelEdit project file
@@ -280,6 +280,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>loadingapp</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>na</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1685,6 +1706,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>labor_rate_desc</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>loss_date</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1916,6 +1958,468 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>rate_atp</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_la1</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_la2</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_la3</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_la4</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lab</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lad</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lae</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_laf</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lag</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lam</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lar</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_las</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_lau</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_ma2s</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_ma3s</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_mabl</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_macs</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_mahw</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_mapa</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_mash</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>rate_matd</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>referralsource</name>
                                         <definition_loaded>false</definition_loaded>
@@ -3777,6 +4281,27 @@
                                     </translation>
                                 </translations>
                             </concept_node>
+                            <concept_node>
+                                <name>jobsavailable</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
                             <concept_node>
                                 <name>jobsdetail</name>
                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
index a6c17e793..5c0b7fff8 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
@@ -1,8 +1,8 @@
+import { Timeline } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { DateFormatter } from "../../utils/DateFormatter";
 import CardTemplate from "./job-detail-cards.template.component";
-import Moment from "react-moment";
-import { Timeline } from "antd";
 
 export default function JobDetailCardsDatesComponent({ loading, data }) {
   const { t } = useTranslation();
@@ -31,90 +31,84 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
           {data.actual_in ? (
             <Timeline.Item>
               {t("jobs.fields.actual_in")}
-              <Moment format='MM/DD/YYYY'>{data.actual_in || ""}</Moment>
+              <DateFormatter>{data.actual_in}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_completion ? (
             <Timeline.Item>
-            {t("jobs.fields.scheduled_completion")}
-              <Moment format='MM/DD/YYYY'>
-                {data.scheduled_completion || ""}
-              </Moment>
+              {t("jobs.fields.scheduled_completion")}
+              <DateFormatter>{data.scheduled_completion}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_in ? (
             <Timeline.Item>
               {t("jobs.fields.scheduled_in")}
-              <Moment format='MM/DD/YYYY'>{data.scheduled_in || ""}</Moment>
+              <DateFormatter>{data.scheduled_in}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_completion ? (
             <Timeline.Item>
               {t("jobs.fields.actual_completion")}
-              <Moment format='MM/DD/YYYY'>
-                {data.actual_completion || ""}
-              </Moment>
+              <DateFormatter>{data.actual_completion}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_delivery ? (
             <Timeline.Item>
               {t("jobs.fields.scheduled_delivery")}
-              <Moment format='MM/DD/YYYY'>
-                {data.scheduled_delivery || ""}
-              </Moment>
+              <DateFormatter>{data.scheduled_delivery}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_delivery ? (
             <Timeline.Item>
               {t("jobs.fields.actual_delivery")}
-              <Moment format='MM/DD/YYYY'>{data.actual_delivery || ""}</Moment>
+              <DateFormatter>{data.actual_delivery}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_estimated ? (
             <Timeline.Item>
               {t("jobs.fields.date_estimated")}
-              <Moment format='MM/DD/YYYY'>{data.date_estimated || ""}</Moment>
+              <DateFormatter>{data.date_estimated}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_open ? (
             <Timeline.Item>
               {t("jobs.fields.date_open")}
-              <Moment format='MM/DD/YYYY'>{data.date_open || ""}</Moment>
+              <DateFormatter>{data.date_open}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_scheduled ? (
             <Timeline.Item>
               {t("jobs.fields.date_scheduled")}
-              <Moment format='MM/DD/YYYY'>{data.date_scheduled || ""}</Moment>
+              <DateFormatter>{data.date_scheduled}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_invoiced ? (
             <Timeline.Item>
               {t("jobs.fields.date_invoiced")}
-              <Moment format='MM/DD/YYYY'>{data.date_invoiced || ""}</Moment>
+              <DateFormatter>{data.date_invoiced}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_closed ? (
             <Timeline.Item>
               {t("jobs.fields.date_closed")}
-              <Moment format='MM/DD/YYYY'>{data.date_closed || ""}</Moment>
+              <DateFormatter>{data.date_closed}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_exported ? (
             <Timeline.Item>
               {t("jobs.fields.date_exported")}
-              <Moment format='MM/DD/YYYY'>{data.date_exported || ""}</Moment>
+              <DateFormatter>{data.date_exported}</DateFormatter>
             </Timeline.Item>
           ) : null}
         </Timeline>
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 135dc6dea..02ab7ff4a 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -1,19 +1,17 @@
-import { Table, Button } from "antd";
-import React, { useContext, useState } from "react";
+import { Button, Table, Form, Input, Alert } from "antd";
+import React, { useState, useContext } from "react";
 import { useTranslation } from "react-i18next";
-import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
-import EditableCell from "./job-lines-cell.component";
+//import EditableCell from "./job-lines-cell.component";
 
-export default function JobLinesComponent({ job }) {
-  //const form = useContext(JobDetailFormContext);
-  //const { getFieldDecorator } = form;
+export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
+  const { getFieldDecorator, isFieldsTouched, resetFields } = form;
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" }
   });
-  const [editingKey, setEditingKey] = useState("");
+
   const { t } = useTranslation();
 
   const columns = [
@@ -70,16 +68,7 @@ export default function JobLinesComponent({ job }) {
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <div>
-          {" "}
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>{" "}
-          <Button
-            onClick={() => {
-              setEditingKey(record.id);
-            }}>
-            EDIT
-          </Button>
-        </div>
+        <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
       )
     }
   ];
@@ -92,33 +81,43 @@ export default function JobLinesComponent({ job }) {
   //   const { value } = event.target;
   //   setState({ ...state, filterinfo: { text: [value] } });
   // };
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 12 },
+      sm: { span: 5 }
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 12 }
+    }
+  };
+
   return (
-    <Table
-      size='small'
-      pagination={{ position: "bottom" }}
-      columns={columns.map(col => {
-        if (!col.editable) {
-          return col;
-        }
-        return {
-          ...col,
-          onCell: record => ({
-            record,
-            inputType: col.dataIndex === "age" ? "number" : "text",
-            dataIndex: col.dataIndex,
-            title: col.title,
-            editing: editingKey === record.id
-          })
-        };
-      })}
-      components={{
-        body: {
-          cell: EditableCell
-        }
-      }}
-      rowKey='id'
-      dataSource={job.joblines}
-      onChange={handleTableChange}
-    />
+    <Form onSubmit={handleSubmit} {...formItemLayout}>
+      <div>Testing Place</div>
+
+      {isFieldsTouched() ? (
+        <Alert
+          message={
+            <div>
+              {t("general.messages.unsavedchanges")}
+              <Button onClick={() => resetFields()}>
+                {t("general.actions.reset")}
+              </Button>
+            </div>
+          }
+          closable
+        />
+      ) : null}
+
+      <Table
+        size="small"
+        pagination={{ position: "bottom" }}
+        columns={columns.map(item => ({ ...item }))}
+        rowKey="id"
+        dataSource={jobLines}
+        onChange={handleTableChange}
+      />
+    </Form>
   );
 }
diff --git a/client/src/components/job-detail-lines/job-lines.container.jsx b/client/src/components/job-detail-lines/job-lines.container.jsx
index cf59100b2..d91845908 100644
--- a/client/src/components/job-detail-lines/job-lines.container.jsx
+++ b/client/src/components/job-detail-lines/job-lines.container.jsx
@@ -2,18 +2,51 @@ import React from "react";
 import JobLinesComponent from "./job-lines.component";
 import { useQuery } from "@apollo/react-hooks";
 import AlertComponent from "../alert/alert.component";
-
+import { Form, notification } from "antd";
 import { GET_JOB_LINES_BY_PK } from "../../graphql/jobs-lines.queries";
+import { useTranslation } from "react-i18next";
 
-export default function JobLinesContainer({ jobId }) {
+export default Form.create({ name: "JobsDetailJobLines" })(
+  function JobLinesContainer({ jobId, form }) {
+    const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
+      variables: { id: jobId },
+      fetchPolicy: "network-only"
+    });
+    const { t } = useTranslation();
+    const handleSubmit = e => {
+      e.preventDefault();
 
-  const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
-    variables: { id: jobId },
-    fetchPolicy: "network-only"
-  });
-  if (error) return <AlertComponent message={error.message} type="error" />;
-  return (
-    <JobLinesComponent loading={loading} joblines={data ? data.joblines : null} />
-  );
-}
- 
\ No newline at end of file
+      form.validateFieldsAndScroll((err, values) => {
+        if (err) {
+          notification["error"]({
+            message: t("jobs.errors.validationtitle"),
+            description: t("jobs.errors.validation")
+          });
+        }
+        if (!err) {
+          console.log("Save the est lines!", values);
+          // mutationUpdateJob({
+          //   variables: { jobId: data.jobs_by_pk.id, job: values }
+          // }).then(r => {
+          //   notification["success"]({
+          //     message: t("jobs.successes.savetitle")
+          //   });
+          //   //TODO: Better way to reset the field decorators?
+          //   refetch().then(r => form.resetFields());
+          // });
+        }
+      });
+    };
+
+    if (error) return <AlertComponent message={error.message} type="error" />;
+
+    return (
+      <JobLinesComponent
+        loading={loading}
+        jobLines={data && data.joblines ? data.joblines : null}
+        handleSubmit={handleSubmit}
+        form={form}
+      />
+    );
+  }
+);
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
new file mode 100644
index 000000000..f33f6652e
--- /dev/null
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -0,0 +1,90 @@
+import { DatePicker, Form } from "antd";
+import moment from "moment";
+import React, { useContext } from "react";
+import { useTranslation } from "react-i18next";
+import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
+
+export default function JobsDetailDatesComponent({ job }) {
+  const form = useContext(JobDetailFormContext);
+  const { getFieldDecorator } = form;
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <Form.Item label={t("jobs.fields.loss_date")}>
+        {getFieldDecorator("loss_date", {
+          initialValue: job.loss_date ? moment(job.loss_date) : null
+        })(<DatePicker name="loss_date" />)}
+      </Form.Item>
+      DAMAGE {JSON.stringify(job.area_of_damage)}
+      CAA # seems not correct based on field mapping Class seems not correct
+      based on field mapping
+      <Form.Item label={t("jobs.fields.date_estimated")}>
+        {getFieldDecorator("date_estimated", {
+          initialValue: job.date_estimated ? moment(job.date_estimated) : null
+        })(<DatePicker name="date_estimated" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_open")}>
+        {getFieldDecorator("date_open", {
+          initialValue: job.date_open ? moment(job.date_open) : null
+        })(<DatePicker name="date_open" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_scheduled")}>
+        {getFieldDecorator("date_scheduled", {
+          initialValue: job.date_scheduled ? moment(job.date_scheduled) : null
+        })(<DatePicker name="date_scheduled" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_in")}>
+        {getFieldDecorator("scheduled_in", {
+          initialValue: job.scheduled_in ? moment(job.scheduled_in) : null
+        })(<DatePicker name="scheduled_in" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_in")}>
+        {getFieldDecorator("actual_in", {
+          initialValue: job.actual_in ? moment(job.actual_in) : null
+        })(<DatePicker name="actual_in" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_completion")}>
+        {getFieldDecorator("scheduled_completion", {
+          initialValue: job.scheduled_completion
+            ? moment(job.scheduled_completion)
+            : null
+        })(<DatePicker name="scheduled_completion" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_completion")}>
+        {getFieldDecorator("actual_completion", {
+          initialValue: job.actual_completion
+            ? moment(job.actual_completion)
+            : null
+        })(<DatePicker name="actual_completion" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_delivery")}>
+        {getFieldDecorator("scheduled_delivery", {
+          initialValue: job.scheduled_delivery
+            ? moment(job.scheduled_delivery)
+            : null
+        })(<DatePicker name="scheduled_delivery" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_delivery")}>
+        {getFieldDecorator("actual_delivery", {
+          initialValue: job.actual_delivery ? moment(job.actual_delivery) : null
+        })(<DatePicker name="actual_delivery" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_invoiced")}>
+        {getFieldDecorator("date_invoiced", {
+          initialValue: job.date_invoiced ? moment(job.date_invoiced) : null
+        })(<DatePicker name="date_invoiced" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_closed")}>
+        {getFieldDecorator("date_closed", {
+          initialValue: job.date_closed ? moment(job.date_closed) : null
+        })(<DatePicker name="date_closed" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_exported")}>
+        {getFieldDecorator("date_exported", {
+          initialValue: job.date_exported ? moment(job.date_exported) : null
+        })(<DatePicker name="date_exported" />)}
+      </Form.Item>
+    </div>
+  );
+}
diff --git a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
index 7954b133e..360d22de2 100644
--- a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
+++ b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, InputNumber } from "antd";
+import { Form, Input, InputNumber, Divider } from "antd";
 import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
@@ -52,6 +52,126 @@ export default function JobsDetailFinancials({ job }) {
           initialValue: job.adjustment_bottom_line
         })(<InputNumber name="adjustment_bottom_line" />)}
       </Form.Item>
+      <Divider />
+      Totals Table
+      <Form.Item label={t("jobs.fields.labor_rate_desc")}>
+        {getFieldDecorator("labor_rate_desc", {
+          initialValue: job.labor_rate_desc
+        })(<Input name="labor_rate_desc" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lab")}>
+        {getFieldDecorator("rate_lab", {
+          initialValue: job.rate_lab
+        })(<InputNumber name="rate_lab" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lad")}>
+        {getFieldDecorator("rate_lad", {
+          initialValue: job.rate_lad
+        })(<InputNumber name="rate_lad" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lae")}>
+        {getFieldDecorator("rate_lae", {
+          initialValue: job.rate_lae
+        })(<InputNumber name="rate_lae" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lar")}>
+        {getFieldDecorator("rate_lar", {
+          initialValue: job.rate_lar
+        })(<InputNumber name="rate_lar" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_las")}>
+        {getFieldDecorator("rate_las", {
+          initialValue: job.rate_las
+        })(<InputNumber name="rate_las" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_laf")}>
+        {getFieldDecorator("rate_laf", {
+          initialValue: job.rate_laf
+        })(<InputNumber name="rate_laf" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lam")}>
+        {getFieldDecorator("rate_lam", {
+          initialValue: job.rate_lam
+        })(<InputNumber name="rate_lam" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lag")}>
+        {getFieldDecorator("rate_lag", {
+          initialValue: job.rate_lag
+        })(<InputNumber name="rate_lag" />)}
+      </Form.Item>
+      Note //TODO: Remove ATP rate?
+      <Form.Item label={t("jobs.fields.rate_atp")}>
+        {getFieldDecorator("rate_atp", {
+          initialValue: job.rate_atp
+        })(<InputNumber name="rate_atp" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lau")}>
+        {getFieldDecorator("rate_lau", {
+          initialValue: job.rate_lau
+        })(<InputNumber name="rate_lau" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la1")}>
+        {getFieldDecorator("rate_la1", {
+          initialValue: job.rate_la1
+        })(<InputNumber name="rate_la1" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la2")}>
+        {getFieldDecorator("rate_la2", {
+          initialValue: job.rate_la2
+        })(<InputNumber name="rate_la2" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la3")}>
+        {getFieldDecorator("rate_la3", {
+          initialValue: job.rate_la3
+        })(<InputNumber name="rate_la3" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la4")}>
+        {getFieldDecorator("rate_la4", {
+          initialValue: job.rate_la4
+        })(<InputNumber name="rate_la4" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mapa")}>
+        {getFieldDecorator("rate_mapa", {
+          initialValue: job.rate_mapa
+        })(<InputNumber name="rate_mapa" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mash")}>
+        {getFieldDecorator("rate_mash", {
+          initialValue: job.rate_mash
+        })(<InputNumber name="rate_mash" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mahw")}>
+        {getFieldDecorator("rate_mahw", {
+          initialValue: job.rate_mahw
+        })(<InputNumber name="rate_mahw" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_ma2s")}>
+        {getFieldDecorator("rate_ma2s", {
+          initialValue: job.rate_ma2s
+        })(<InputNumber name="rate_ma2s" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_ma3s")}>
+        {getFieldDecorator("rate_ma3s", {
+          initialValue: job.rate_ma3s
+        })(<InputNumber name="rate_ma3s" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mabl")}>
+        {getFieldDecorator("rate_mabl", {
+          initialValue: job.rate_mabl
+        })(<InputNumber name="rate_mabl" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_macs")}>
+        {getFieldDecorator("rate_macs", {
+          initialValue: job.rate_macs
+        })(<InputNumber name="rate_macs" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_matd")}>
+        {getFieldDecorator("rate_matd", {
+          initialValue: job.rate_matd
+        })(<InputNumber name="rate_matd" />)}
+      </Form.Item>
+
+
     </div>
   );
 }
diff --git a/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx b/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
index f0178d6f1..4dc589973 100644
--- a/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
+++ b/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
@@ -11,8 +11,6 @@ export default function JobsDetailInsurance({ job }) {
   const { getFieldDecorator, getFieldValue } = form;
   const { t } = useTranslation();
 
-  console.log("job.loss_date", job.loss_date);
-
   return (
     <div>
       <Form.Item label={t("jobs.fields.ins_co_id")}>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index f90290794..c04fd8fb2 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -154,13 +154,48 @@ export const GET_JOB_BY_PK = gql`
       adjustment_bottom_line
       ownr_fn
       ownr_ln
-      owner{
+      owner {
         id
         ownr_fn
         ownr_ln
       }
+      labor_rate_desc
+      rate_lab
+      rate_lad
+      rate_lae
+      rate_lar
+      rate_las
+      rate_laf
+      rate_lam
+      rate_lag
+      rate_atp
+      rate_lau
+      rate_la1
+      rate_la2
+      rate_la3
+      rate_la4
+      rate_mapa
+      rate_mash
+      rate_mahw
+      rate_ma2s
+      rate_ma3s
+      rate_mabl
+      rate_macs
+      rate_matd
+      actual_in
+      scheduled_completion
+      scheduled_in
+      actual_completion
+      scheduled_delivery
+      actual_delivery
+      date_estimated
+      date_open
+      date_scheduled
+      date_invoiced
+      date_closed
+      date_exported
 
-      joblines{
+      joblines {
         id
         unq_seq
         line_ind
diff --git a/client/src/pages/jobs-available/jobs-available.page.container.jsx b/client/src/pages/jobs-available/jobs-available.page.container.jsx
index 9dc54c321..86f1704ac 100644
--- a/client/src/pages/jobs-available/jobs-available.page.container.jsx
+++ b/client/src/pages/jobs-available/jobs-available.page.container.jsx
@@ -1,13 +1,15 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useMutation, useLazyQuery } from "react-apollo";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
 } from "../../graphql/available-jobs.queries";
 import JobsAvailablePageComponent from "./jobs-available.page.component";
+import { useTranslation } from "react-i18next";
 
 export default function JobsAvailablePageContainer() {
   const [deleteJob] = useMutation(DELETE_AVAILABLE_JOB);
+  const { t } = useTranslation();
 
   const estDataLazyLoad = useLazyQuery(
     QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
@@ -15,6 +17,11 @@ export default function JobsAvailablePageContainer() {
       fetchPolicy: "network-only"
     }
   );
+
+  useEffect(() => {
+    document.title = t("titles.jobsavailable");
+  }, [t]);
+
   return (
     <div>
       <JobsAvailablePageComponent
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index beb249db2..a91ebfbef 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -7,7 +7,7 @@ import {
   FaRegStickyNote,
   FaShieldAlt
 } from "react-icons/fa";
-import JobsLines from '../../components/job-detail-lines/job-lines.component'
+import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobsDetailClaims from "../../components/jobs-detail-claims/jobs-detail-claims.component";
 import JobsDetailFinancials from "../../components/jobs-detail-financial/jobs-detail-financial.component";
 import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
@@ -15,6 +15,7 @@ import JobsDetailInsurance from "../../components/jobs-detail-insurance/jobs-det
 import JobsDocumentsContainer from "../../components/jobs-documents/jobs-documents.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
 import JobDetailFormContext from "./jobs-detail.page.context";
+import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
 
 export default function JobsDetailPage({
   job,
@@ -94,7 +95,7 @@ export default function JobsDetailPage({
           }
           key="repairdata"
         >
-          <JobsLines job={job} />
+          <JobsLinesContainer jobId={job.id} />
         </Tabs.TabPane>
 
         <Tabs.TabPane
@@ -142,7 +143,7 @@ export default function JobsDetailPage({
           }
           key="dates"
         >
-          Dates
+          <JobsDetailDatesComponent job={job} />}
         </Tabs.TabPane>
 
         <Tabs.TabPane
@@ -152,7 +153,7 @@ export default function JobsDetailPage({
               {t("jobs.labels.documents")}
             </span>
           }
-          key="#documents"
+          key="documents"
         >
           <JobsDocumentsContainer jobId={job.id} />
         </Tabs.TabPane>
@@ -163,7 +164,7 @@ export default function JobsDetailPage({
               {t("jobs.labels.notes")}
             </span>
           }
-          key="#notes"
+          key="notes"
         >
           <JobNotesContainer jobId={job.id} />
         </Tabs.TabPane>
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
index e0c49840b..81aca70bd 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
@@ -4,7 +4,11 @@ import { useMutation, useQuery } from "react-apollo";
 import { useTranslation } from "react-i18next";
 import AlertComponent from "../../components/alert/alert.component";
 import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
-import { CONVERT_JOB_TO_RO, GET_JOB_BY_PK, UPDATE_JOB } from "../../graphql/jobs.queries";
+import {
+  CONVERT_JOB_TO_RO,
+  GET_JOB_BY_PK,
+  UPDATE_JOB
+} from "../../graphql/jobs.queries";
 import JobsDetailPage from "./jobs-detail.page.component";
 import JobDetailFormContext from "./jobs-detail.page.context";
 
@@ -21,11 +25,13 @@ function JobsDetailPageContainer({ match, form }) {
 
   useEffect(() => {
     document.title = loading
-      ? "..."
+      ? t("titles.app")
       : error
       ? t("titles.app")
       : t("titles.jobsdetail", {
-          ro_number: data.jobs_by_pk.ro_number
+          ro_number: data.jobs_by_pk.converted
+            ? data.jobs_by_pk.ro_number
+            : `EST ${data.jobs_by_pk.est_number}`
         });
   }, [loading, data, t, error]);
 
@@ -54,7 +60,7 @@ function JobsDetailPageContainer({ match, form }) {
   };
 
   if (loading) return <SpinComponent />;
-  if (error) return <AlertComponent message={error.message} type='error' />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
   return data.jobs_by_pk ? (
     <JobDetailFormContext.Provider value={form}>
@@ -68,7 +74,7 @@ function JobsDetailPageContainer({ match, form }) {
       />
     </JobDetailFormContext.Provider>
   ) : (
-    <AlertComponent message={t("jobs.errors.noaccess")} type='error' />
+    <AlertComponent message={t("jobs.errors.noaccess")} type="error" />
   );
 }
 export default Form.create({ name: "JobsDetailPageContainer" })(
diff --git a/client/src/pages/manage-root/manage-root.page.component.jsx b/client/src/pages/manage-root/manage-root.page.component.jsx
new file mode 100644
index 000000000..a7ff94d11
--- /dev/null
+++ b/client/src/pages/manage-root/manage-root.page.component.jsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default function ManageRootPageComponent() {
+    return (
+        <div>
+            Temporary Home Page.
+        </div>
+    )
+}
diff --git a/client/src/pages/manage-root/manage-root.page.container.jsx b/client/src/pages/manage-root/manage-root.page.container.jsx
new file mode 100644
index 000000000..c525563e4
--- /dev/null
+++ b/client/src/pages/manage-root/manage-root.page.container.jsx
@@ -0,0 +1,8 @@
+import React from 'react'
+import ManageRootPageComponent from './manage-root.page.component'
+
+export default function ManageRootPageContainer() {
+    return (
+    <ManageRootPageComponent />
+    )
+}
diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx
index 93245792f..07ebc470c 100644
--- a/client/src/pages/manage/manage.page.jsx
+++ b/client/src/pages/manage/manage.page.jsx
@@ -1,17 +1,20 @@
+import { BackTop, Layout } from "antd";
 import React, { lazy, Suspense, useEffect } from "react";
-import { Route } from "react-router";
-import { Layout, BackTop } from "antd";
 import { useTranslation } from "react-i18next";
-
+import { Route } from "react-router";
+import ChatWindowContainer from "../../components/chat-window/chat-window.container";
+import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
+import FooterComponent from "../../components/footer/footer.component";
 //Component Imports
 import HeaderContainer from "../../components/header/header.container";
-import FooterComponent from "../../components/footer/footer.component";
-import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
-
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import "./manage.page.styles.scss";
-import ChatWindowContainer from "../../components/chat-window/chat-window.container";
 
-const WhiteBoardPage = lazy(() => import("../white-board/white-board.page"));
+
+//const WhiteBoardPage = lazy(() => import("../white-board/white-board.page"));
+const ManageRootPage = lazy(() =>
+  import("../manage-root/manage-root.page.container")
+);
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 const JobsDetailPage = lazy(() =>
   import("../jobs-detail/jobs-detail.page.container")
@@ -39,11 +42,14 @@ export default function Manage({ match }) {
         <HeaderContainer />
       </Header>
 
-      <Content className='content-container'>
+      <Content className="content-container">
         <ErrorBoundary>
           <Suspense
-            fallback={<div>TODO: Suspended Loading in Manage Page...</div>}>
-            <Route exact path={`${match.path}`} component={WhiteBoardPage} />
+            fallback={
+              <LoadingSpinner message={t("general.labels.loadingapp")} />
+            }
+          >
+            <Route exact path={`${match.path}`} component={ManageRootPage} />
 
             <Route exact path={`${match.path}/jobs`} component={JobsPage} />
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8de53dc4b..c8b2c725e 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -23,6 +23,7 @@
 				"actions": "Actions",
 				"in": "In",
 				"loading": "Loading...",
+				"loadingapp": "Loading Bodyshop.app",
 				"na": "N/A",
 				"out": "Out",
 				"save": "Save",
@@ -104,6 +105,7 @@
 				"ins_ph1": "File Handler Phone #",
 				"kmin": "Mileage In",
 				"kmout": "Mileage Out",
+				"labor_rate_desc": "Labor Rate Name",
 				"loss_date": "Loss Date",
 				"loss_desc": "Loss of Use",
 				"other_amount_payable": "Other Amount Payable",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Policy #",
 				"ponumber": "PO Number",
+				"rate_atp": "ATP",
+				"rate_la1": "LA1 Rate",
+				"rate_la2": "LA2 Rate",
+				"rate_la3": "LA3 Rate",
+				"rate_la4": "LA4 Rate",
+				"rate_lab": "Labor Rate",
+				"rate_lad": "Diagnostic Rate",
+				"rate_lae": "Electrical Rate",
+				"rate_laf": "Frame Rate",
+				"rate_lag": "Glass Rate",
+				"rate_lam": "Mechanical Rate",
+				"rate_lar": "Refinish Rate",
+				"rate_las": "Sublet Rate",
+				"rate_lau": "Aluminum Rate",
+				"rate_ma2s": "2 Stage Paint Rate",
+				"rate_ma3s": "3 Stage Paint Rate",
+				"rate_mabl": "MABL??",
+				"rate_macs": "MACS??",
+				"rate_mahw": "Hazardous Waste Rate",
+				"rate_mapa": "Paint Materials Rate",
+				"rate_mash": "Shop Material Rate",
+				"rate_matd": "Tire Disposal Rate",
 				"referralsource": "Referral Source",
 				"regie_number": "Registration #",
 				"repairtotal": "Repair Total",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Bodyshop by ImEX Systems",
 			"jobs": "All Jobs | $t(titles.app)",
+			"jobsavailable": "Available Jobs | $t(titles.app)",
 			"jobsdetail": "Job {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Job Documents {{ro_number}} | $t(titles.app)",
 			"profile": "My Profile | $t(titles.app)"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index b45b9e15c..769f114cd 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -23,6 +23,7 @@
 				"actions": "Comportamiento",
 				"in": "en",
 				"loading": "Cargando...",
+				"loadingapp": "Cargando Bodyshop.app",
 				"na": "N / A",
 				"out": "Afuera",
 				"save": "Salvar",
@@ -104,6 +105,7 @@
 				"ins_ph1": "File Handler Phone #",
 				"kmin": "Kilometraje en",
 				"kmout": "Kilometraje",
+				"labor_rate_desc": "Nombre de la tasa laboral",
 				"loss_date": "Fecha de pérdida",
 				"loss_desc": "Perdida de uso",
 				"other_amount_payable": "Otra cantidad a pagar",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Política #",
 				"ponumber": "numero postal",
+				"rate_atp": "ATP",
+				"rate_la1": "Tarifa LA1",
+				"rate_la2": "Tarifa LA2",
+				"rate_la3": "Tarifa LA3",
+				"rate_la4": "Tarifa LA4",
+				"rate_lab": "Tasa de trabajo",
+				"rate_lad": "Tasa de diagnóstico",
+				"rate_lae": "tarifa eléctrica",
+				"rate_laf": "Cuadros por segundo",
+				"rate_lag": "Tasa de vidrio",
+				"rate_lam": "Tasa mecánica",
+				"rate_lar": "Tasa de acabado",
+				"rate_las": "Tasa de subarriendo",
+				"rate_lau": "Tasa de aluminio",
+				"rate_ma2s": "Velocidad de pintura de 2 etapas",
+				"rate_ma3s": "Tasa de pintura de 3 etapas",
+				"rate_mabl": "MABL ??",
+				"rate_macs": "MACS ??",
+				"rate_mahw": "Tasa de residuos peligrosos",
+				"rate_mapa": "Tasa de materiales de pintura",
+				"rate_mash": "Comprar material de tarifa",
+				"rate_matd": "Tasa de eliminación de neumáticos",
 				"referralsource": "Fuente de referencia",
 				"regie_number": "N. ° de registro",
 				"repairtotal": "Reparación total",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Carrocería de ImEX Systems",
 			"jobs": "Todos los trabajos | $t(titles.app)",
+			"jobsavailable": "Empleos disponibles | $t(titles.app)",
 			"jobsdetail": "Trabajo {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Documentos de trabajo {{ro_number}} | $ t (títulos.app)",
 			"profile": "Mi perfil | $t(titles.app)"
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 676a09487..c416bb92f 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -23,6 +23,7 @@
 				"actions": "actes",
 				"in": "dans",
 				"loading": "Chargement...",
+				"loadingapp": "Chargement de Bodyshop.app",
 				"na": "N / A",
 				"out": "En dehors",
 				"save": "sauvegarder",
@@ -104,6 +105,7 @@
 				"ins_ph1": "Numéro de téléphone du gestionnaire de fichiers",
 				"kmin": "Kilométrage en",
 				"kmout": "Kilométrage hors",
+				"labor_rate_desc": "Nom du taux de main-d'œuvre",
 				"loss_date": "Date de perte",
 				"loss_desc": "Perte d'usage",
 				"other_amount_payable": "Autre montant à payer",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Politique #",
 				"ponumber": "Numéro de bon de commande",
+				"rate_atp": "ATP",
+				"rate_la1": "Taux LA1",
+				"rate_la2": "Taux LA2",
+				"rate_la3": "Taux LA3",
+				"rate_la4": "Taux LA4",
+				"rate_lab": "Taux de la main-d'œuvre",
+				"rate_lad": "Taux de diagnostic",
+				"rate_lae": "Tarif électrique",
+				"rate_laf": "Taux de trame",
+				"rate_lag": "Taux de verre",
+				"rate_lam": "Taux mécanique",
+				"rate_lar": "Taux de finition",
+				"rate_las": "Taux de sous-location",
+				"rate_lau": "Taux d'aluminium",
+				"rate_ma2s": "Taux de peinture en 2 étapes",
+				"rate_ma3s": "Taux de peinture en 3 étapes",
+				"rate_mabl": "MABL ??",
+				"rate_macs": "MACS ??",
+				"rate_mahw": "Taux de déchets dangereux",
+				"rate_mapa": "Taux de matériaux de peinture",
+				"rate_mash": "Tarif du matériel de la boutique",
+				"rate_matd": "Taux d'élimination des pneus",
 				"referralsource": "Source de référence",
 				"regie_number": "Enregistrement #",
 				"repairtotal": "Réparation totale",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Carrosserie par ImEX Systems",
 			"jobs": "Tous les emplois | $t(titles.app)",
+			"jobsavailable": "Emplois disponibles | $t(titles.app)",
 			"jobsdetail": "Travail {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Documents de travail {{ro_number}} | $ t (titres.app)",
 			"profile": "Mon profil | $t(titles.app)"
diff --git a/client/src/utils/DateFormatter.jsx b/client/src/utils/DateFormatter.jsx
index 4f551f8ce..07a41d7b4 100644
--- a/client/src/utils/DateFormatter.jsx
+++ b/client/src/utils/DateFormatter.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import Moment from "react-moment";
 
 export function DateFormatter(props) {
-  return <Moment format="MM/DD/YYYY">{props.children || ""}</Moment>;
+  return <Moment format="MM/DD/YYYY">{props.children || null}</Moment>;
 }
 
 export function DateTimeFormatter(props) {

From ace32074498bfc7db40ca10f1ec18248284bd841 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 11:13:22 -0800
Subject: [PATCH 02/10] Transfer

---
 .../jobs-detail.page.component.jsx            | 244 +++++++++---------
 1 file changed, 123 insertions(+), 121 deletions(-)

diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index a91ebfbef..b4baa1503 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -40,135 +40,137 @@ export default function JobsDetailPage({
   };
 
   return (
-    <Form onSubmit={handleSubmit} {...formItemLayout}>
-      <JobsDetailHeader
-        job={job}
-        mutationConvertJob={mutationConvertJob}
-        refetch={refetch}
-      />
-
-      {isFieldsTouched() ? (
-        <Alert
-          message={
-            <div>
-              {t("general.messages.unsavedchanges")}
-              <Button onClick={() => resetFields()}>
-                {t("general.actions.reset")}
-              </Button>
-            </div>
-          }
-          closable
+    <div>
+      <Form onSubmit={handleSubmit} {...formItemLayout}>
+        <JobsDetailHeader
+          job={job}
+          mutationConvertJob={mutationConvertJob}
+          refetch={refetch}
         />
-      ) : null}
 
-      <Tabs defaultActiveKey="claimdetail">
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon component={FaInfo} />
-              {t("menus.jobsdetail.claimdetail")}
-            </span>
-          }
-          key="claimdetail"
-        >
-          <JobsDetailClaims job={job} />
-        </Tabs.TabPane>
+        {isFieldsTouched() ? (
+          <Alert
+            message={
+              <div>
+                {t("general.messages.unsavedchanges")}
+                <Button onClick={() => resetFields()}>
+                  {t("general.actions.reset")}
+                </Button>
+              </div>
+            }
+            closable
+          />
+        ) : null}
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon component={FaShieldAlt} />
-              {t("menus.jobsdetail.insurance")}
-            </span>
-          }
-          key="insurance"
-        >
-          <JobsDetailInsurance job={job} />
-        </Tabs.TabPane>
+        <Tabs defaultActiveKey="claimdetail">
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon component={FaInfo} />
+                {t("menus.jobsdetail.claimdetail")}
+              </span>
+            }
+            key="claimdetail"
+          >
+            <JobsDetailClaims job={job} />
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon type="bars" />
-              {t("menus.jobsdetail.repairdata")}
-            </span>
-          }
-          key="repairdata"
-        >
-          <JobsLinesContainer jobId={job.id} />
-        </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon component={FaShieldAlt} />
+                {t("menus.jobsdetail.insurance")}
+              </span>
+            }
+            key="insurance"
+          >
+            <JobsDetailInsurance job={job} />
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon type="dollar" />
-              {t("menus.jobsdetail.financials")}
-            </span>
-          }
-          key="financials"
-        >
-          <JobsDetailFinancials job={job} />
-        </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon type="bars" />
+                {t("menus.jobsdetail.repairdata")}
+              </span>
+            }
+            key="repairdata"
+          >
+            <JobsLinesContainer jobId={job.id} />
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon type="tool" />
-              {t("menus.jobsdetail.partssublet")}
-            </span>
-          }
-          key="partssublet"
-        >
-          Partssublet
-        </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon type="dollar" />
+                {t("menus.jobsdetail.financials")}
+              </span>
+            }
+            key="financials"
+          >
+            <JobsDetailFinancials job={job} />
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon component={FaHardHat} />
-              {t("menus.jobsdetail.labor")}
-            </span>
-          }
-          key="labor"
-        >
-          Labor
-        </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon type="tool" />
+                {t("menus.jobsdetail.partssublet")}
+              </span>
+            }
+            key="partssublet"
+          >
+            Partssublet
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon type="calendar" />
-              {t("menus.jobsdetail.dates")}
-            </span>
-          }
-          key="dates"
-        >
-          <JobsDetailDatesComponent job={job} />}
-        </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon component={FaHardHat} />
+                {t("menus.jobsdetail.labor")}
+              </span>
+            }
+            key="labor"
+          >
+            Labor
+          </Tabs.TabPane>
 
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon type="file-image" />
-              {t("jobs.labels.documents")}
-            </span>
-          }
-          key="documents"
-        >
-          <JobsDocumentsContainer jobId={job.id} />
-        </Tabs.TabPane>
-        <Tabs.TabPane
-          tab={
-            <span>
-              <Icon component={FaRegStickyNote} />
-              {t("jobs.labels.notes")}
-            </span>
-          }
-          key="notes"
-        >
-          <JobNotesContainer jobId={job.id} />
-        </Tabs.TabPane>
-      </Tabs>
-    </Form>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon type="calendar" />
+                {t("menus.jobsdetail.dates")}
+              </span>
+            }
+            key="dates"
+          >
+            <JobsDetailDatesComponent job={job} />}
+          </Tabs.TabPane>
+
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon type="file-image" />
+                {t("jobs.labels.documents")}
+              </span>
+            }
+            key="documents"
+          >
+            <JobsDocumentsContainer jobId={job.id} />
+          </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <Icon component={FaRegStickyNote} />
+                {t("jobs.labels.notes")}
+              </span>
+            }
+            key="notes"
+          >
+            <JobNotesContainer jobId={job.id} />
+          </Tabs.TabPane>
+        </Tabs>
+      </Form>
+    </div>
   );
 }

From f7e050da58124b43f2f4e6755f2a93aec85c85e4 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 15:35:18 -0800
Subject: [PATCH 03/10] Jobs table updates for missing CIECA fields.

---
 _reference/CiecaOpCodesReference.json         | 192 ++++++++++++++
 bodyshop_translations.babel                   |  21 ++
 .../jobs-detail-financial.component.jsx       |   6 +-
 client/src/graphql/jobs.queries.js            |   1 +
 client/src/translations/en_us/common.json     |   1 +
 client/src/translations/es/common.json        |   1 +
 client/src/translations/fr/common.json        |   1 +
 .../1580424750331_jobs_fields/down.yaml       |   1 +
 .../1580424750331_jobs_fields/up.yaml         |   7 +
 .../down.yaml                                 | 235 +++++++++++++++++
 .../up.yaml                                   | 243 +++++++++++++++++
 .../down.yaml                                 | 233 +++++++++++++++++
 .../up.yaml                                   | 241 +++++++++++++++++
 .../down.yaml                                 | 235 +++++++++++++++++
 .../up.yaml                                   | 243 +++++++++++++++++
 .../1580425245598_run_sql_migration/down.yaml |   1 +
 .../1580425245598_run_sql_migration/up.yaml   |  13 +
 .../down.yaml                                 |  50 ++++
 .../up.yaml                                   |  74 ++++++
 .../down.yaml                                 |  48 ++++
 .../up.yaml                                   |  72 ++++++
 .../down.yaml                                 |  50 ++++
 .../up.yaml                                   |  74 ++++++
 .../down.yaml                                 |   3 +
 .../up.yaml                                   |   3 +
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 244 ++++++++++++++++++
 .../down.yaml                                 | 241 +++++++++++++++++
 .../up.yaml                                   | 242 +++++++++++++++++
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 243 +++++++++++++++++
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 244 ++++++++++++++++++
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 244 ++++++++++++++++++
 35 files changed, 4478 insertions(+), 1 deletion(-)
 create mode 100644 _reference/CiecaOpCodesReference.json
 create mode 100644 hasura/migrations/1580424750331_jobs_fields/down.yaml
 create mode 100644 hasura/migrations/1580424750331_jobs_fields/up.yaml
 create mode 100644 hasura/migrations/1580424775529_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580424775529_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580424780619_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580424780619_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580424785911_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580424785911_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580425245598_run_sql_migration/down.yaml
 create mode 100644 hasura/migrations/1580425245598_run_sql_migration/up.yaml
 create mode 100644 hasura/migrations/1580425277537_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580425277537_update_permission_user_public_table_joblines/up.yaml
 create mode 100644 hasura/migrations/1580425285636_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580425285636_update_permission_user_public_table_joblines/up.yaml
 create mode 100644 hasura/migrations/1580425296863_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580425296863_update_permission_user_public_table_joblines/up.yaml
 create mode 100644 hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/down.yaml
 create mode 100644 hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/up.yaml
 create mode 100644 hasura/migrations/1580425481308_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580425481308_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580425487863_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580425487863_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580425491775_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580425491775_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580425495615_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580425495615_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1580425498865_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1580425498865_update_permission_user_public_table_jobs/up.yaml

diff --git a/_reference/CiecaOpCodesReference.json b/_reference/CiecaOpCodesReference.json
new file mode 100644
index 000000000..f9f50346c
--- /dev/null
+++ b/_reference/CiecaOpCodesReference.json
@@ -0,0 +1,192 @@
+{
+  "OP0": {
+    "desc": "REMOVE / REPLACE PARTIAL",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP1": {
+    "desc": "REFINISH / REPAIR",
+    "opcode": "OP1",
+    "partcode": "PAE"
+  },
+  "OP10": {
+    "desc": "REPAIR , PARTIAL",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  },
+  "OP100": {
+    "desc": "REPLACE PRE-PRICED",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP101": {
+    "desc": "REMOVE/REPLACE RECYCLED PART",
+    "opcode": "OP11",
+    "partcode": "PAL"
+  },
+  "OP103": {
+    "desc": "REMOVE / REPLACE PARTIAL",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP104": {
+    "desc": "REMOVE / REPLACE PARTIAL LABOUR",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP105": {
+    "desc": "!!ADJUST MANUALLY!!",
+    "opcode": "OP99",
+    "partcode": "PAE"
+  },
+  "OP106": {
+    "desc": "REPAIR , PARTIAL",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  },
+  "OP107": {
+    "desc": "CHIPGUARD",
+    "opcode": "OP6",
+    "partcode": "PAE"
+  },
+  "OP108": {
+    "desc": "MULTI TONE",
+    "opcode": "OP6",
+    "partcode": "PAE"
+  },
+  "OP109": {
+    "desc": "REPLACE PRE-PRICED",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP11": {
+    "desc": "REMOVE / REPLACE",
+    "opcode": "OP11",
+    "partcode": "PAN"
+  },
+  "OP110": {
+    "desc": "REFINISH / REPAIR",
+    "opcode": "OP1",
+    "partcode": "PAE"
+  },
+  "OP111": {
+    "desc": "REMOVE / REPLACE",
+    "opcode": "OP11",
+    "partcode": "PAN"
+  },
+  "OP112": {
+    "desc": "REMOVE / REPLACE",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP113": {
+    "desc": "REPLACE PRE-PRICED",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP114": {
+    "desc": "REPLACE PRE-PRICED",
+    "opcode": "OP11",
+    "partcode": "PAA"
+  },
+  "OP12": {
+    "desc": "REMOVE / REPLACE PARTIAL",
+    "opcode": "OP11",
+    "partcode": "PAN"
+  },
+  "OP120": {
+    "desc": "REPAIR , PARTIAL",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  },
+  "OP13": {
+    "desc": "ADDITIONAL COSTS",
+    "opcode": "OP13",
+    "partcode": "PAE"
+  },
+  "OP14": {
+    "desc": "ADDITIONAL OPERATIONS",
+    "opcode": "OP14",
+    "partcode": "PAE"
+  },
+  "OP15": {
+    "desc": "BLEND",
+    "opcode": "OP15",
+    "partcode": "PAE"
+  },
+  "OP16": {
+    "desc": "SUBLET",
+    "opcode": "OP16",
+    "partcode": "PAS"
+  },
+  "OP17": {
+    "desc": "POLICY LIMIT ADJUSTMENT",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  },
+  "OP18": {
+    "desc": "APPEAR ALLOWANCE",
+    "opcode": "OP7",
+    "partcode": "PAE"
+  },
+  "OP2": {
+    "desc": "REMOVE / INSTALL",
+    "opcode": "OP2",
+    "partcode": "PAE"
+  },
+  "OP24": {
+    "desc": "CHIPGUARD",
+    "opcode": "OP6",
+    "partcode": "PAE"
+  },
+  "OP25": {
+    "desc": "TWO TONE",
+    "opcode": "OP6",
+    "partcode": "PAE"
+  },
+  "OP26": {
+    "desc": "PAINTLESS DENT REPAIR",
+    "opcode": "OP16",
+    "partcode": "PAE"
+  },
+  "OP260": {
+    "desc": "SUBLET",
+    "opcode": "OP16",
+    "partcode": "PAE"
+  },
+  "OP3": {
+    "desc": "ADDITIONAL LABOR",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  },
+  "OP4": {
+    "desc": "ALIGNMENT",
+    "opcode": "OP4",
+    "partcode": "PAS"
+  },
+  "OP5": {
+    "desc": "OVERHAUL",
+    "opcode": "OP5",
+    "partcode": "PAE"
+  },
+  "OP6": {
+    "desc": "REFINISH",
+    "opcode": "OP6",
+    "partcode": "PAE"
+  },
+  "OP7": {
+    "desc": "INSPECT",
+    "opcode": "OP7",
+    "partcode": "PAE"
+  },
+  "OP8": {
+    "desc": "CHECK / ADJUST",
+    "opcode": "OP8",
+    "partcode": "PAE"
+  },
+  "OP9": {
+    "desc": "REPAIR",
+    "opcode": "OP9",
+    "partcode": "PAE"
+  }
+}
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 152f7805e..b60aba470 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -2063,6 +2063,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>rate_laa</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>rate_lab</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
index 360d22de2..37a2bae9a 100644
--- a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
+++ b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
@@ -170,7 +170,11 @@ export default function JobsDetailFinancials({ job }) {
           initialValue: job.rate_matd
         })(<InputNumber name="rate_matd" />)}
       </Form.Item>
-
+<Form.Item label={t("jobs.fields.rate_laa")}>
+{getFieldDecorator("rate_laa", {
+initialValue: job.rate_laa
+})(<InputNumber name="rate_laa" />)}
+ </Form.Item>
 
     </div>
   );
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index c04fd8fb2..307f96b59 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -181,6 +181,7 @@ export const GET_JOB_BY_PK = gql`
       rate_ma3s
       rate_mabl
       rate_macs
+      rate_laa
       rate_matd
       actual_in
       scheduled_completion
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c8b2c725e..236e1b25f 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -122,6 +122,7 @@
 				"rate_la2": "LA2 Rate",
 				"rate_la3": "LA3 Rate",
 				"rate_la4": "LA4 Rate",
+				"rate_laa": "Aluminum Rate",
 				"rate_lab": "Labor Rate",
 				"rate_lad": "Diagnostic Rate",
 				"rate_lae": "Electrical Rate",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 769f114cd..8b430b09c 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -122,6 +122,7 @@
 				"rate_la2": "Tarifa LA2",
 				"rate_la3": "Tarifa LA3",
 				"rate_la4": "Tarifa LA4",
+				"rate_laa": "Tasa de aluminio",
 				"rate_lab": "Tasa de trabajo",
 				"rate_lad": "Tasa de diagnóstico",
 				"rate_lae": "tarifa eléctrica",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index c416bb92f..53405272e 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -122,6 +122,7 @@
 				"rate_la2": "Taux LA2",
 				"rate_la3": "Taux LA3",
 				"rate_la4": "Taux LA4",
+				"rate_laa": "Taux d'aluminium",
 				"rate_lab": "Taux de la main-d'œuvre",
 				"rate_lad": "Taux de diagnostic",
 				"rate_lae": "Tarif électrique",
diff --git a/hasura/migrations/1580424750331_jobs_fields/down.yaml b/hasura/migrations/1580424750331_jobs_fields/down.yaml
new file mode 100644
index 000000000..fe51488c7
--- /dev/null
+++ b/hasura/migrations/1580424750331_jobs_fields/down.yaml
@@ -0,0 +1 @@
+[]
diff --git a/hasura/migrations/1580424750331_jobs_fields/up.yaml b/hasura/migrations/1580424750331_jobs_fields/up.yaml
new file mode 100644
index 000000000..4faaad5d3
--- /dev/null
+++ b/hasura/migrations/1580424750331_jobs_fields/up.yaml
@@ -0,0 +1,7 @@
+- args:
+    cascade: true
+    sql: "alter table jobs\r\nadd column tax_prethr numeric,\r\nadd column tax_thramt
+      numeric,\r\nadd column tax_str_rt   numeric,\r\nadd column tax_lbr_rt   numeric,\r\nadd
+      column adj_g_disc   numeric,\r\nadd column adj_towdis   numeric,\r\nadd column
+      adj_strdis   numeric,\r\nadd column tax_predis   numeric"
+  type: run_sql
diff --git a/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..c78859077
--- /dev/null
+++ b/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,235 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - claim_total
+      - deductible
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..c60b5b21b
--- /dev/null
+++ b/hasura/migrations/1580424775529_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - claim_total
+      - deductible
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      - tax_prethr
+      - tax_thramt
+      - tax_str_rt
+      - tax_lbr_rt
+      - adj_g_disc
+      - adj_towdis
+      - adj_strdis
+      - tax_predis
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..6b5aa011f
--- /dev/null
+++ b/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,233 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..5312d6320
--- /dev/null
+++ b/hasura/migrations/1580424780619_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,241 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..7d2fcd6cc
--- /dev/null
+++ b/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,235 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..4d5d66b53
--- /dev/null
+++ b/hasura/migrations/1580424785911_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425245598_run_sql_migration/down.yaml b/hasura/migrations/1580425245598_run_sql_migration/down.yaml
new file mode 100644
index 000000000..fe51488c7
--- /dev/null
+++ b/hasura/migrations/1580425245598_run_sql_migration/down.yaml
@@ -0,0 +1 @@
+[]
diff --git a/hasura/migrations/1580425245598_run_sql_migration/up.yaml b/hasura/migrations/1580425245598_run_sql_migration/up.yaml
new file mode 100644
index 000000000..338b11bb7
--- /dev/null
+++ b/hasura/migrations/1580425245598_run_sql_migration/up.yaml
@@ -0,0 +1,13 @@
+- args:
+    cascade: true
+    sql: "alter table joblines\r\n\r\nadd column glass_flag bool,\r\nadd column price_inc
+      bool,\r\nadd column alt_part_i bool,\r\nadd column price_j bool,\r\nadd column
+      cert_part bool,\r\nadd column alt_co_id text,\r\nadd column alt_overrd bool,\r\nadd
+      column alt_partm text,\r\nadd column prt_dsmk_p numeric,\r\nadd column prt_dsmk_m
+      numeric,\r\nadd column lbr_inc bool,\r\n\r\nadd column lbr_hrs_j bool,\r\nadd
+      column lbr_typ_j bool,\r\nadd column lbr_op_j bool,\r\nadd column paint_stg
+      integer,\r\nadd column paint_tone integer,\r\nadd column lbr_tax bool,\r\n\r\nadd
+      column misc_amt numeric,\r\nadd column misc_sublt bool,\r\nadd column misc_tax
+      bool,\r\nadd column bett_type text,\r\nadd column bett_pctg numeric,\r\nadd
+      column bett_amt numeric,\r\nadd column bett_tax bool"
+  type: run_sql
diff --git a/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..d7b2de7cd
--- /dev/null
+++ b/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,50 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..dc213864d
--- /dev/null
+++ b/hasura/migrations/1580425277537_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,74 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      - glass_flag
+      - price_inc
+      - alt_part_i
+      - price_j
+      - cert_part
+      - alt_co_id
+      - alt_overrd
+      - alt_partm
+      - prt_dsmk_p
+      - prt_dsmk_m
+      - lbr_inc
+      - lbr_hrs_j
+      - lbr_typ_j
+      - lbr_op_j
+      - paint_stg
+      - paint_tone
+      - lbr_tax
+      - misc_amt
+      - misc_sublt
+      - misc_tax
+      - bett_type
+      - bett_pctg
+      - bett_amt
+      - bett_tax
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..7c4eb1024
--- /dev/null
+++ b/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,48 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - tax_part
+      - est_seq
+      - part_qty
+      - unq_seq
+      - act_price
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - mod_lb_hrs
+      - alt_partno
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - line_ref
+      - mod_lbr_ty
+      - oem_partno
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..b143512d8
--- /dev/null
+++ b/hasura/migrations/1580425285636_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,72 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      - glass_flag
+      - price_inc
+      - alt_part_i
+      - price_j
+      - cert_part
+      - alt_co_id
+      - alt_overrd
+      - alt_partm
+      - prt_dsmk_p
+      - prt_dsmk_m
+      - lbr_inc
+      - lbr_hrs_j
+      - lbr_typ_j
+      - lbr_op_j
+      - paint_stg
+      - paint_tone
+      - lbr_tax
+      - misc_amt
+      - misc_sublt
+      - misc_tax
+      - bett_type
+      - bett_pctg
+      - bett_amt
+      - bett_tax
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..ca3225d6b
--- /dev/null
+++ b/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,50 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - tax_part
+      - est_seq
+      - part_qty
+      - unq_seq
+      - act_price
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - mod_lb_hrs
+      - alt_partno
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - line_ref
+      - mod_lbr_ty
+      - oem_partno
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..6d1063cc8
--- /dev/null
+++ b/hasura/migrations/1580425296863_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,74 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - alt_overrd
+      - alt_part_i
+      - bett_tax
+      - cert_part
+      - glass_flag
+      - lbr_hrs_j
+      - lbr_inc
+      - lbr_op_j
+      - lbr_tax
+      - lbr_typ_j
+      - misc_sublt
+      - misc_tax
+      - price_inc
+      - price_j
+      - tax_part
+      - est_seq
+      - paint_stg
+      - paint_tone
+      - part_qty
+      - unq_seq
+      - act_price
+      - bett_amt
+      - bett_pctg
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - line_ref
+      - misc_amt
+      - mod_lb_hrs
+      - prt_dsmk_m
+      - prt_dsmk_p
+      - alt_co_id
+      - alt_partm
+      - alt_partno
+      - bett_type
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - mod_lbr_ty
+      - oem_partno
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/down.yaml b/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/down.yaml
new file mode 100644
index 000000000..785d08ad2
--- /dev/null
+++ b/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/down.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" DROP COLUMN "rate_laa";
+  type: run_sql
diff --git a/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/up.yaml b/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/up.yaml
new file mode 100644
index 000000000..d7b745111
--- /dev/null
+++ b/hasura/migrations/1580425460879_alter_table_public_jobs_add_column_rate_laa/up.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" ADD COLUMN "rate_laa" numeric NULL;
+  type: run_sql
diff --git a/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..c60b5b21b
--- /dev/null
+++ b/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - claim_total
+      - deductible
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      - tax_prethr
+      - tax_thramt
+      - tax_str_rt
+      - tax_lbr_rt
+      - adj_g_disc
+      - adj_towdis
+      - adj_strdis
+      - tax_predis
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..a1e5cbdde
--- /dev/null
+++ b/hasura/migrations/1580425481308_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,244 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - claim_total
+      - deductible
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      - tax_prethr
+      - tax_thramt
+      - tax_str_rt
+      - tax_lbr_rt
+      - adj_g_disc
+      - adj_towdis
+      - adj_strdis
+      - tax_predis
+      - rate_laa
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..5312d6320
--- /dev/null
+++ b/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,241 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..57466d6e6
--- /dev/null
+++ b/hasura/migrations/1580425487863_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,242 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..4d5d66b53
--- /dev/null
+++ b/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..4d5d66b53
--- /dev/null
+++ b/hasura/migrations/1580425491775_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..4d5d66b53
--- /dev/null
+++ b/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..4371eaab0
--- /dev/null
+++ b/hasura/migrations/1580425495615_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,244 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..4d5d66b53
--- /dev/null
+++ b/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..4371eaab0
--- /dev/null
+++ b/hasura/migrations/1580425498865_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,244 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - claim_total
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission

From 24fc50826c2062df0b5d93e8adb5599295342f14 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 17:18:36 -0800
Subject: [PATCH 04/10] Fixed joblines query sorting. Added in additional
 fields. Added region to bodyshop.

---
 bodyshop_translations.babel                   | 21 ++++++
 .../job-detail-lines/job-lines.component.jsx  | 38 +++++++---
 client/src/graphql/apollo-error-handling.js   | 23 +++---
 client/src/graphql/jobs-lines.queries.js      | 14 +++-
 client/src/graphql/jobs.queries.js            |  1 +
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 client/src/utils/CurrencyFormatter.jsx        |  2 +
 client/src/utils/sorters.js                   | 18 +++--
 .../down.yaml                                 |  3 +
 .../up.yaml                                   |  4 +
 .../down.yaml                                 | 39 ++++++++++
 .../up.yaml                                   | 40 ++++++++++
 .../down.yaml                                 |  3 +
 .../up.yaml                                   |  3 +
 .../down.yaml                                 | 74 ++++++++++++++++++
 .../up.yaml                                   | 75 +++++++++++++++++++
 .../down.yaml                                 | 72 ++++++++++++++++++
 .../up.yaml                                   | 73 ++++++++++++++++++
 .../down.yaml                                 | 74 ++++++++++++++++++
 .../up.yaml                                   | 75 +++++++++++++++++++
 22 files changed, 628 insertions(+), 27 deletions(-)
 create mode 100644 hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/down.yaml
 create mode 100644 hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/up.yaml
 create mode 100644 hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/down.yaml
 create mode 100644 hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/up.yaml
 create mode 100644 hasura/migrations/1580428876888_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580428876888_update_permission_user_public_table_joblines/up.yaml
 create mode 100644 hasura/migrations/1580428884075_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580428884075_update_permission_user_public_table_joblines/up.yaml
 create mode 100644 hasura/migrations/1580428891595_update_permission_user_public_table_joblines/down.yaml
 create mode 100644 hasura/migrations/1580428891595_update_permission_user_public_table_joblines/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index b60aba470..6ce698947 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -552,6 +552,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>oem_partno</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>part_type</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 02ab7ff4a..010b92df0 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -17,30 +17,50 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
   const columns = [
     {
       title: t("joblines.fields.unq_seq"),
-      dataIndex: "joblines.unq_seq",
-      key: "joblines.unq_seq",
+      dataIndex: "unq_seq",
+      key: "unq_seq",
       // onFilter: (value, record) => record.ro_number.includes(value),
       // filteredValue: state.filteredInfo.text || null,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => a.unq_seq - b.unq_seq,
       sortOrder:
         state.sortedInfo.columnKey === "unq_seq" && state.sortedInfo.order,
       //ellipsis: true,
-      editable: true
+      editable: true,
+      width: 75
     },
     {
       title: t("joblines.fields.line_desc"),
       dataIndex: "line_desc",
-      key: "joblines.line_desc",
+      key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       ellipsis: true,
       editable: true
     },
+    {
+      title: t("joblines.fields.oem_partno"),
+      dataIndex: "oem_partno",
+      key: "oem_partno",
+      sorter: (a, b) =>
+        alphaSort(
+          a.oem_partno ? a.oem_partno : a.op_code_desc,
+          b.oem_partno ? b.oem_partno : b.op_code_desc
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
+      ellipsis: true,
+      editable: true,
+      render: (text, record) => (
+        <span>
+          {record.oem_partno ? record.oem_partno : record.op_code_desc}
+        </span>
+      )
+    },
     {
       title: t("joblines.fields.part_type"),
       dataIndex: "part_type",
-      key: "joblines.part_type",
+      key: "part_type",
       sorter: (a, b) => alphaSort(a.part_type, b.part_type),
       sortOrder:
         state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
@@ -50,7 +70,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
     {
       title: t("joblines.fields.db_price"),
       dataIndex: "db_price",
-      key: "joblines.db_price",
+      key: "db_price",
       sorter: (a, b) => a.db_price - b.db_price,
       sortOrder:
         state.sortedInfo.columnKey === "db_price" && state.sortedInfo.order,
@@ -62,7 +82,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
     {
       title: t("joblines.fields.act_price"),
       dataIndex: "act_price",
-      key: "joblines.act_price",
+      key: "act_price",
       sorter: (a, b) => a.act_price - b.act_price,
       sortOrder:
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
@@ -112,7 +132,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
 
       <Table
         size="small"
-        pagination={{ position: "bottom" }}
+        pagination={{ position: "bottom", defaultPageSize: 50 }}
         columns={columns.map(item => ({ ...item }))}
         rowKey="id"
         dataSource={jobLines}
diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js
index c38c13d78..f6e72f694 100644
--- a/client/src/graphql/apollo-error-handling.js
+++ b/client/src/graphql/apollo-error-handling.js
@@ -26,6 +26,7 @@ const errorLink = onError(
       //User access token has expired
       //props.history.push("/network-error");
       console.log("We need a new token!");
+      console.log("Old Token", window.localStorage.getItem("token"));
       // Let's refresh token through async request
 
       auth.currentUser.getIdToken(true).then(token => {
@@ -39,16 +40,18 @@ const errorLink = onError(
             }
           }));
 
-          return new Observable(observer => {
-            const subscriber = {
-              next: observer.next.bind(observer),
-              error: observer.error.bind(observer),
-              complete: observer.complete.bind(observer)
-            };
-            console.log("About to resend the request.");
-            // Retry last failed request
-            forward(operation).subscribe(subscriber);
-          });
+          return forward(operation);
+
+          // return new Observable(observer => {
+          //   const subscriber = {
+          //     next: observer.next.bind(observer),
+          //     error: observer.error.bind(observer),
+          //     complete: observer.complete.bind(observer)
+          //   };
+          //   console.log("About to resend the request.");
+          //   // Retry last failed request
+          //   forward(operation).subscribe(subscriber);
+          // });
         }
       });
 
diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js
index 4203fdf06..334097e37 100644
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -2,10 +2,22 @@ import { gql } from "apollo-boost";
 
 export const GET_JOB_LINES_BY_PK = gql`
   query GET_JOB_LINES_BY_PK($id: uuid!) {
-    joblines(where: { jobid: { _eq: $id } }) {
+    joblines(where: { jobid: { _eq: $id } }, order_by: { unq_seq: asc }) {
       id
+      unq_seq
       line_ind
       line_desc
+      part_type
+      oem_partno
+      db_price
+      act_price
+      part_qty
+      mod_lbr_ty
+      db_hrs
+      mod_lb_hrs
+      lbr_op
+      lbr_amt
+      op_code_desc
     }
   }
 `;
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 307f96b59..472779f40 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -211,6 +211,7 @@ export const GET_JOB_BY_PK = gql`
         mod_lb_hrs
         lbr_op
         lbr_amt
+        op_code_desc
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 236e1b25f..fea8428bb 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -43,6 +43,7 @@
 				"act_price": "Actual Price",
 				"db_price": "Database Price",
 				"line_desc": "Line Description",
+				"oem_partno": "OEM Part #",
 				"part_type": "Part Type",
 				"unq_seq": "Seq #"
 			}
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 8b430b09c..721511590 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -43,6 +43,7 @@
 				"act_price": "Precio actual",
 				"db_price": "Precio de base de datos",
 				"line_desc": "Descripción de línea",
+				"oem_partno": "OEM parte #",
 				"part_type": "Tipo de parte",
 				"unq_seq": "Seq #"
 			}
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 53405272e..45c50354a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -43,6 +43,7 @@
 				"act_price": "Prix actuel",
 				"db_price": "Prix de la base de données",
 				"line_desc": "Description de la ligne",
+				"oem_partno": "Pièce OEM #",
 				"part_type": "Type de pièce",
 				"unq_seq": "Seq #"
 			}
diff --git a/client/src/utils/CurrencyFormatter.jsx b/client/src/utils/CurrencyFormatter.jsx
index 083c2cf70..babb6cc85 100644
--- a/client/src/utils/CurrencyFormatter.jsx
+++ b/client/src/utils/CurrencyFormatter.jsx
@@ -5,6 +5,8 @@ export default function CurrencyFormatter(props) {
   return (
     <NumberFormat
       thousandSeparator={true}
+      decimalScale={2}
+      fixedDecimalScale={true}
       prefix={"$"}
       value={props.children}
       displayType={"text"}
diff --git a/client/src/utils/sorters.js b/client/src/utils/sorters.js
index 6010a29a7..c089d83c0 100644
--- a/client/src/utils/sorters.js
+++ b/client/src/utils/sorters.js
@@ -1,9 +1,13 @@
 export function alphaSort(a, b) {
-  if (a > b) {
-    return false;
-  }
-  if (b > a) {
-    return true;
-  }
-  return true;
+  let A;
+  let B;
+  A = a ? a.toLowerCase() : "";
+
+  B = b ? b.toLowerCase() : "";
+
+  if (A < B)
+    //sort string ascending
+    return -1;
+  if (A > B) return 1;
+  return 0; //default return value (no sorting)
 }
diff --git a/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/down.yaml b/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/down.yaml
new file mode 100644
index 000000000..6b1476237
--- /dev/null
+++ b/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/down.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "region_config";
+  type: run_sql
diff --git a/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/up.yaml b/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/up.yaml
new file mode 100644
index 000000000..b9a0e7e8e
--- /dev/null
+++ b/hasura/migrations/1580427566710_alter_table_public_bodyshops_add_column_region_config/up.yaml
@@ -0,0 +1,4 @@
+- args:
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "region_config" text NOT NULL
+      DEFAULT 'CA_BC';
+  type: run_sql
diff --git a/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..80ca70d5d
--- /dev/null
+++ b/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - logo_img_path
+      - md_ro_statuses
+      - shopname
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..0575c9859
--- /dev/null
+++ b/hasura/migrations/1580427579544_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - address1
+      - address2
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - insurance_vendor_id
+      - logo_img_path
+      - md_ro_statuses
+      - region_config
+      - shopname
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/down.yaml b/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/down.yaml
new file mode 100644
index 000000000..8b33d277c
--- /dev/null
+++ b/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/down.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."joblines" DROP COLUMN "op_code_desc";
+  type: run_sql
diff --git a/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/up.yaml b/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/up.yaml
new file mode 100644
index 000000000..f70b7a310
--- /dev/null
+++ b/hasura/migrations/1580428867144_alter_table_public_joblines_add_column_op_code_desc/up.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."joblines" ADD COLUMN "op_code_desc" text NULL;
+  type: run_sql
diff --git a/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..dc213864d
--- /dev/null
+++ b/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,74 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      - glass_flag
+      - price_inc
+      - alt_part_i
+      - price_j
+      - cert_part
+      - alt_co_id
+      - alt_overrd
+      - alt_partm
+      - prt_dsmk_p
+      - prt_dsmk_m
+      - lbr_inc
+      - lbr_hrs_j
+      - lbr_typ_j
+      - lbr_op_j
+      - paint_stg
+      - paint_tone
+      - lbr_tax
+      - misc_amt
+      - misc_sublt
+      - misc_tax
+      - bett_type
+      - bett_pctg
+      - bett_amt
+      - bett_tax
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..3d0722715
--- /dev/null
+++ b/hasura/migrations/1580428876888_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,75 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      - glass_flag
+      - price_inc
+      - alt_part_i
+      - price_j
+      - cert_part
+      - alt_co_id
+      - alt_overrd
+      - alt_partm
+      - prt_dsmk_p
+      - prt_dsmk_m
+      - lbr_inc
+      - lbr_hrs_j
+      - lbr_typ_j
+      - lbr_op_j
+      - paint_stg
+      - paint_tone
+      - lbr_tax
+      - misc_amt
+      - misc_sublt
+      - misc_tax
+      - bett_type
+      - bett_pctg
+      - bett_amt
+      - bett_tax
+      - op_code_desc
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..b143512d8
--- /dev/null
+++ b/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,72 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - jobid
+      - unq_seq
+      - line_ind
+      - line_desc
+      - part_type
+      - oem_partno
+      - est_seq
+      - db_ref
+      - line_ref
+      - tax_part
+      - db_price
+      - act_price
+      - part_qty
+      - alt_partno
+      - mod_lbr_ty
+      - db_hrs
+      - mod_lb_hrs
+      - lbr_op
+      - lbr_amt
+      - glass_flag
+      - price_inc
+      - alt_part_i
+      - price_j
+      - cert_part
+      - alt_co_id
+      - alt_overrd
+      - alt_partm
+      - prt_dsmk_p
+      - prt_dsmk_m
+      - lbr_inc
+      - lbr_hrs_j
+      - lbr_typ_j
+      - lbr_op_j
+      - paint_stg
+      - paint_tone
+      - lbr_tax
+      - misc_amt
+      - misc_sublt
+      - misc_tax
+      - bett_type
+      - bett_pctg
+      - bett_amt
+      - bett_tax
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..32c4e42a2
--- /dev/null
+++ b/hasura/migrations/1580428884075_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,73 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - alt_overrd
+      - alt_part_i
+      - bett_tax
+      - cert_part
+      - glass_flag
+      - lbr_hrs_j
+      - lbr_inc
+      - lbr_op_j
+      - lbr_tax
+      - lbr_typ_j
+      - misc_sublt
+      - misc_tax
+      - price_inc
+      - price_j
+      - tax_part
+      - est_seq
+      - paint_stg
+      - paint_tone
+      - part_qty
+      - unq_seq
+      - act_price
+      - bett_amt
+      - bett_pctg
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - line_ref
+      - misc_amt
+      - mod_lb_hrs
+      - prt_dsmk_m
+      - prt_dsmk_p
+      - alt_co_id
+      - alt_partm
+      - alt_partno
+      - bett_type
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - mod_lbr_ty
+      - oem_partno
+      - op_code_desc
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/down.yaml b/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/down.yaml
new file mode 100644
index 000000000..6d1063cc8
--- /dev/null
+++ b/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/down.yaml
@@ -0,0 +1,74 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - alt_overrd
+      - alt_part_i
+      - bett_tax
+      - cert_part
+      - glass_flag
+      - lbr_hrs_j
+      - lbr_inc
+      - lbr_op_j
+      - lbr_tax
+      - lbr_typ_j
+      - misc_sublt
+      - misc_tax
+      - price_inc
+      - price_j
+      - tax_part
+      - est_seq
+      - paint_stg
+      - paint_tone
+      - part_qty
+      - unq_seq
+      - act_price
+      - bett_amt
+      - bett_pctg
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - line_ref
+      - misc_amt
+      - mod_lb_hrs
+      - prt_dsmk_m
+      - prt_dsmk_p
+      - alt_co_id
+      - alt_partm
+      - alt_partno
+      - bett_type
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - mod_lbr_ty
+      - oem_partno
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/up.yaml b/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/up.yaml
new file mode 100644
index 000000000..befcc2bb7
--- /dev/null
+++ b/hasura/migrations/1580428891595_update_permission_user_public_table_joblines/up.yaml
@@ -0,0 +1,75 @@
+- args:
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - alt_overrd
+      - alt_part_i
+      - bett_tax
+      - cert_part
+      - glass_flag
+      - lbr_hrs_j
+      - lbr_inc
+      - lbr_op_j
+      - lbr_tax
+      - lbr_typ_j
+      - misc_sublt
+      - misc_tax
+      - price_inc
+      - price_j
+      - tax_part
+      - est_seq
+      - paint_stg
+      - paint_tone
+      - part_qty
+      - unq_seq
+      - act_price
+      - bett_amt
+      - bett_pctg
+      - db_hrs
+      - db_price
+      - lbr_amt
+      - line_ref
+      - misc_amt
+      - mod_lb_hrs
+      - prt_dsmk_m
+      - prt_dsmk_p
+      - alt_co_id
+      - alt_partm
+      - alt_partno
+      - bett_type
+      - db_ref
+      - lbr_op
+      - line_desc
+      - line_ind
+      - mod_lbr_ty
+      - oem_partno
+      - op_code_desc
+      - part_type
+      - created_at
+      - updated_at
+      - id
+      - jobid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: joblines
+      schema: public
+  type: create_update_permission

From d9f351afe626c4801233e9676e3ca07b89ebd4de Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 18:24:24 -0800
Subject: [PATCH 05/10] Removed enter to submit detail page. Added filtering
 for jobs lines.

---
 _reference/DeploymentChecklist.md             |   5 +-
 .../job-detail-lines/job-lines.component.jsx  |  66 +++++-----
 .../job-detail-lines/job-lines.container.jsx  | 123 +++++++++++-------
 .../jobs-detail-header.component.jsx          |   9 +-
 .../jobs-detail.page.component.jsx            |   3 +-
 5 files changed, 123 insertions(+), 83 deletions(-)

diff --git a/_reference/DeploymentChecklist.md b/_reference/DeploymentChecklist.md
index dd6c96e29..a1ea46e38 100644
--- a/_reference/DeploymentChecklist.md
+++ b/_reference/DeploymentChecklist.md
@@ -8,4 +8,7 @@ Bucket=
 
 __React Based__
 REACT_APP_GRAPHQL_ENDPOINT
-REACT_APP_GRAPHQL_ENDPOINT_WS
\ No newline at end of file
+REACT_APP_GRAPHQL_ENDPOINT_WS
+
+__MetaData__
+Region based OpCodes
\ No newline at end of file
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 010b92df0..60da20fd3 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -1,15 +1,18 @@
-import { Button, Table, Form, Input, Alert } from "antd";
-import React, { useState, useContext } from "react";
+import { Input, Table } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 //import EditableCell from "./job-lines-cell.component";
 
-export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
-  const { getFieldDecorator, isFieldsTouched, resetFields } = form;
+export default function JobLinesComponent({
+  jobLines,
+  form,
+  handleSubmit,
+  setSearchText
+}) {
   const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" }
+    sortedInfo: {}
   });
 
   const { t } = useTranslation();
@@ -51,6 +54,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
         state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
       ellipsis: true,
       editable: true,
+      width: "20%",
       render: (text, record) => (
         <span>
           {record.oem_partno ? record.oem_partno : record.op_code_desc}
@@ -65,7 +69,8 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
       sortOrder:
         state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
       ellipsis: true,
-      editable: true
+      editable: true,
+      width: "10%"
     },
     {
       title: t("joblines.fields.db_price"),
@@ -75,6 +80,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
       sortOrder:
         state.sortedInfo.columnKey === "db_price" && state.sortedInfo.order,
       ellipsis: true,
+      width: "10%",
       render: (text, record) => (
         <CurrencyFormatter>{record.db_price}</CurrencyFormatter>
       )
@@ -87,6 +93,7 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
       sortOrder:
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
+      width: "10%",
       render: (text, record) => (
         <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
       )
@@ -113,31 +120,24 @@ export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
   };
 
   return (
-    <Form onSubmit={handleSubmit} {...formItemLayout}>
-      <div>Testing Place</div>
-
-      {isFieldsTouched() ? (
-        <Alert
-          message={
-            <div>
-              {t("general.messages.unsavedchanges")}
-              <Button onClick={() => resetFields()}>
-                {t("general.actions.reset")}
-              </Button>
-            </div>
-          }
-          closable
-        />
-      ) : null}
-
-      <Table
-        size="small"
-        pagination={{ position: "bottom", defaultPageSize: 50 }}
-        columns={columns.map(item => ({ ...item }))}
-        rowKey="id"
-        dataSource={jobLines}
-        onChange={handleTableChange}
-      />
-    </Form>
+    <Table
+      title={() => {
+        return (
+          <Input.Search
+            placeholder="Search..."
+            onChange={e => {
+              e.preventDefault();
+              setSearchText(e.target.value);
+            }}
+          />
+        );
+      }}
+      size="small"
+      pagination={{ position: "bottom", defaultPageSize: 50 }}
+      columns={columns.map(item => ({ ...item }))}
+      rowKey="id"
+      dataSource={jobLines}
+      onChange={handleTableChange}
+    />
   );
 }
diff --git a/client/src/components/job-detail-lines/job-lines.container.jsx b/client/src/components/job-detail-lines/job-lines.container.jsx
index d91845908..668b0ef63 100644
--- a/client/src/components/job-detail-lines/job-lines.container.jsx
+++ b/client/src/components/job-detail-lines/job-lines.container.jsx
@@ -1,52 +1,83 @@
-import React from "react";
-import JobLinesComponent from "./job-lines.component";
 import { useQuery } from "@apollo/react-hooks";
-import AlertComponent from "../alert/alert.component";
-import { Form, notification } from "antd";
-import { GET_JOB_LINES_BY_PK } from "../../graphql/jobs-lines.queries";
+import { notification } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { GET_JOB_LINES_BY_PK } from "../../graphql/jobs-lines.queries";
+import AlertComponent from "../alert/alert.component";
+import JobLinesComponent from "./job-lines.component";
 
-export default Form.create({ name: "JobsDetailJobLines" })(
-  function JobLinesContainer({ jobId, form }) {
-    const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
-      variables: { id: jobId },
-      fetchPolicy: "network-only"
+//export default Form.create({ name: "JobsDetailJobLines" })(
+
+export default function JobLinesContainer({ jobId, form }) {
+  const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
+    variables: { id: jobId },
+    fetchPolicy: "network-only"
+  });
+
+  const [searchText, setSearchText] = useState("");
+  const { t } = useTranslation();
+
+  const handleSubmit = e => {
+    e.preventDefault();
+
+    form.validateFieldsAndScroll((err, values) => {
+      if (err) {
+        notification["error"]({
+          message: t("jobs.errors.validationtitle"),
+          description: t("jobs.errors.validation")
+        });
+      }
+      if (!err) {
+        console.log("Save the est lines!", values);
+        // mutationUpdateJob({
+        //   variables: { jobId: data.jobs_by_pk.id, job: values }
+        // }).then(r => {
+        //   notification["success"]({
+        //     message: t("jobs.successes.savetitle")
+        //   });
+        //   //TODO: Better way to reset the field decorators?
+        //   refetch().then(r => form.resetFields());
+        // });
+      }
     });
-    const { t } = useTranslation();
-    const handleSubmit = e => {
-      e.preventDefault();
+  };
 
-      form.validateFieldsAndScroll((err, values) => {
-        if (err) {
-          notification["error"]({
-            message: t("jobs.errors.validationtitle"),
-            description: t("jobs.errors.validation")
-          });
-        }
-        if (!err) {
-          console.log("Save the est lines!", values);
-          // mutationUpdateJob({
-          //   variables: { jobId: data.jobs_by_pk.id, job: values }
-          // }).then(r => {
-          //   notification["success"]({
-          //     message: t("jobs.successes.savetitle")
-          //   });
-          //   //TODO: Better way to reset the field decorators?
-          //   refetch().then(r => form.resetFields());
-          // });
-        }
-      });
-    };
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
-    if (error) return <AlertComponent message={error.message} type="error" />;
-
-    return (
-      <JobLinesComponent
-        loading={loading}
-        jobLines={data && data.joblines ? data.joblines : null}
-        handleSubmit={handleSubmit}
-        form={form}
-      />
-    );
-  }
-);
+  return (
+    <JobLinesComponent
+      loading={loading}
+      jobLines={
+        data && data.joblines
+          ? searchText
+            ? data.joblines.filter(
+                jl =>
+                  jl.unq_seq
+                    ?.toString()
+                    .toLowerCase()
+                    .includes(searchText.toLowerCase()) ||
+                  jl.line_desc
+                    ?.toLowerCase()
+                    .includes(searchText.toLowerCase()) ||
+                  jl.part_type
+                    ?.toLowerCase()
+                    .includes(searchText.toLowerCase()) ||
+                  jl.oem_partno
+                    ?.toLowerCase()
+                    .includes(searchText.toLowerCase()) ||
+                  jl.op_code_desc
+                    ?.toLowerCase()
+                    .includes(searchText.toLowerCase()) ||
+                  jl.db_price?.toString().includes(searchText.toLowerCase()) ||
+                  jl.act_price?.toString().includes(searchText.toLowerCase())
+              )
+            : data.joblines
+          : null
+      }
+      handleSubmit={handleSubmit}
+      form={form}
+      setSearchText={setSearchText}
+    />
+  );
+}
+//);
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index b9da502d5..6d89061d2 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -18,7 +18,7 @@ export default function JobsDetailHeader({
   job,
   mutationConvertJob,
   refetch,
-  getFieldDecorator
+  handleSubmit
 }) {
   const { t } = useTranslation();
 
@@ -76,7 +76,12 @@ export default function JobsDetailHeader({
     >
       {t("jobs.actions.convert")}
     </Button>,
-    <Button type="primary" key="submit" htmlType="submit">
+    <Button
+      type="primary"
+      key="submit"
+      htmlType="button"
+      onClick={handleSubmit}
+    >
       {t("general.labels.save")}
     </Button>
   ];
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index b4baa1503..63cdfb102 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -41,11 +41,12 @@ export default function JobsDetailPage({
 
   return (
     <div>
-      <Form onSubmit={handleSubmit} {...formItemLayout}>
+      <Form onSubmit={handleSubmit} {...formItemLayout} autoComplete={"off"}>
         <JobsDetailHeader
           job={job}
           mutationConvertJob={mutationConvertJob}
           refetch={refetch}
+          handleSubmit={handleSubmit}
         />
 
         {isFieldsTouched() ? (

From 0225e34f7b711b4801b2bfd5428189d2aea96e6d Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 18:29:40 -0800
Subject: [PATCH 06/10] Fixed up header comments + duplicate selections

---
 .../components/header/header.component.jsx    |  2 +-
 .../components/header/header.container.jsx    | 23 +------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 217977bee..c1b5dce1e 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -34,7 +34,7 @@ export default ({ landingHeader, navItems, selectedNavItem }) => {
             </Link>
           </Menu.Item>
           <Menu.SubMenu title={t("menus.header.jobs")}>
-            <Menu.Item key='jobs'>
+            <Menu.Item key='activejobs'>
               <Link to='/manage/jobs'>
                 <Icon type='home' />
                 {t("menus.header.activejobs")}
diff --git a/client/src/components/header/header.container.jsx b/client/src/components/header/header.container.jsx
index db3d0e9f2..299d55caf 100644
--- a/client/src/components/header/header.container.jsx
+++ b/client/src/components/header/header.container.jsx
@@ -13,30 +13,9 @@ import HeaderComponent from "./header.component";
 export default ({ landingHeader, signedIn }) => {
   const hookSelectedNavItem = useQuery(GET_CURRENT_SELECTED_NAV_ITEM);
 
-  // let hookNavItems;
-  // if (landingHeader) {
-  //   hookNavItems = useQuery(GET_LANDING_NAV_ITEMS, {
-  //     fetchPolicy: "network-only"
-  //   });
-  // } else {
-  //   hookNavItems = useQuery(GET_NAV_ITEMS, {
-  //     fetchPolicy: "network-only"
-  //   });
-  // }
-
-  // if (hookNavItems.loading || hookSelectedNavItem.loading)
-  //   return <LoadingSpinner />;
-  // if (hookNavItems.error)
-  //   return <AlertComponent message={hookNavItems.error.message} />;
-  // if (hookSelectedNavItem.error)
-  //   return console.log(
-  //     "Unable to load Selected Navigation Item.",
-  //     hookSelectedNavItem.error
-  //   );
-
   const { selectedNavItem } = hookSelectedNavItem.data;
-  // const navItems = JSON.parse(hookNavItems.data.masterdata_by_pk.value);
 
+  console.log("selectedNavItem", selectedNavItem);
   return (
     <HeaderComponent
       landingHeader={landingHeader}

From f1ac052a1b4a9488586d01cdf7d423e9ef7554a5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 30 Jan 2020 18:59:51 -0800
Subject: [PATCH 07/10] Another attempt at fixing broken retry for apollo error
 handling.

---
 .../components/header/header.component.jsx    | 13 ++----------
 .../owner-find-modal.container.jsx            |  5 ++++-
 client/src/graphql/apollo-error-handling.js   | 20 +++++++++++--------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index c1b5dce1e..5a59274c4 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -11,9 +11,11 @@ import "./header.styles.scss";
 export default ({ landingHeader, navItems, selectedNavItem }) => {
   const apolloClient = useApolloClient();
   const { t } = useTranslation();
+  
   const handleClick = e => {
     apolloClient.writeData({ data: { selectedNavItem: e.key } });
   };
+
   return (
     <Row type='flex' justify='space-around'>
       <Col span={16}>
@@ -48,17 +50,6 @@ export default ({ landingHeader, navItems, selectedNavItem }) => {
             </Menu.Item>
           </Menu.SubMenu>
 
-          {
-            //   navItems.map(navItem => (
-            //   <Menu.Item key={navItem.title}>
-            //     <Link to={navItem.path}>
-            //       {navItem.icontype ? <Icon type={navItem.icontype} /> : null}
-            //       {navItem.title}
-            //     </Link>
-            //   </Menu.Item>
-            // ))
-          }
-
           {!landingHeader ? null : (
             <Menu.Item>
               <ManageSignInButton />
diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index bd12e1559..26d9fc3be 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -21,7 +21,10 @@ export default function OwnerFindModalContainer({
   const ownersList = useQuery(QUERY_SEARCH_OWNER_BY_IDX, {
     variables: {
       search: owner
-        ? `${owner.ownr_fn} ${owner.ownr_ln} ${owner.ownr_addr1} ${owner.ownr_city} ${owner.ownr_zip} ${owner.ownr_ea} ${owner.ownr_ph1} ${owner.ownr_ph2}`
+        ? `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${owner.ownr_addr1 ||
+            ""} ${owner.ownr_city || ""} ${owner.ownr_zip ||
+            ""} ${owner.ownr_ea || ""} ${owner.ownr_ph1 ||
+            ""} ${owner.ownr_ph2 || ""}`
         : null
     },
     skip: !owner,
diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js
index f6e72f694..7b5443ede 100644
--- a/client/src/graphql/apollo-error-handling.js
+++ b/client/src/graphql/apollo-error-handling.js
@@ -5,13 +5,15 @@ import { auth } from "../firebase/firebase.utils";
 
 const errorLink = onError(
   ({ graphQLErrors, networkError, operation, forward }) => {
-    // console.log("graphQLErrors", graphQLErrors);
-    // console.log("networkError", networkError);
-    // console.log("operation", operation);
-    // console.log("forward", forward);
+    if (graphQLErrors)
+      graphQLErrors.forEach(({ message, locations, path }) =>
+        console.log(
+          `[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`
+        )
+      );
+    if (networkError) console.log(`[Network error]: ${networkError}`);
 
     let expired = false;
-
     if (graphQLErrors) {
       if (graphQLErrors[0].message.includes("JWTExpired")) {
         expired = true;
@@ -33,12 +35,14 @@ const errorLink = onError(
         if (token) {
           console.log("Got the new token.", token);
           window.localStorage.setItem("token", token);
-          operation.setContext(({ headers = {} }) => ({
+
+          const oldHeaders = operation.getContext().headers;
+          operation.setContext({
             headers: {
-              ...headers,
+              ...oldHeaders,
               authorization: token ? `Bearer ${token}` : ""
             }
-          }));
+          });
 
           return forward(operation);
 

From 3060c16dd35d52f52371e956c4229ae38dc5ef36 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 31 Jan 2020 13:20:15 -0800
Subject: [PATCH 08/10] BREAKING CHANGES: Converted to use Redux stores. Login
 now working using Redux.

---
 client/package.json                           |   6 +
 client/src/App/App.container.jsx              |  47 +----
 client/src/App/App.js                         | 171 ++++++++----------
 .../chat-window/chat-window.container.jsx     |  21 ++-
 .../current-user-dropdown.component.jsx       |  46 +++--
 .../components/header/header.component.jsx    |  30 +--
 .../components/header/header.container.jsx    |  19 +-
 .../src/components/header/header.styles.scss  |   4 -
 .../job-detail-lines/job-lines.component.jsx  |   1 +
 .../manage-sign-in-button.component.jsx       |  25 ++-
 .../sign-in-form/sign-in-form.component.jsx   | 157 +++++++++-------
 .../sign-in-form/sign-in-form.container.jsx   |  46 -----
 client/src/firebase/firebase.utils.js         |  10 +-
 client/src/graphql/apollo-error-handling.js   |   1 -
 client/src/graphql/resolvers.js               |  31 ----
 client/src/index.js                           |  20 +-
 client/src/pages/sign-in/sign-in.page.jsx     |   4 +-
 client/src/redux/root.reducer.js              |  24 +++
 client/src/redux/root.saga.js                 |  11 ++
 client/src/redux/store.js                     |  19 ++
 client/src/redux/user/user.actions.js         |  35 ++++
 client/src/redux/user/user.reducer.js         |  42 +++++
 client/src/redux/user/user.sagas.js           |  87 +++++++++
 client/src/redux/user/user.selectors.js       |  13 ++
 client/src/redux/user/user.types.js           |  17 ++
 client/yarn.lock                              | 101 ++++++++++-
 26 files changed, 628 insertions(+), 360 deletions(-)
 delete mode 100644 client/src/components/header/header.styles.scss
 delete mode 100644 client/src/components/sign-in-form/sign-in-form.container.jsx
 delete mode 100644 client/src/graphql/resolvers.js
 create mode 100644 client/src/redux/root.reducer.js
 create mode 100644 client/src/redux/root.saga.js
 create mode 100644 client/src/redux/store.js
 create mode 100644 client/src/redux/user/user.actions.js
 create mode 100644 client/src/redux/user/user.reducer.js
 create mode 100644 client/src/redux/user/user.sagas.js
 create mode 100644 client/src/redux/user/user.selectors.js
 create mode 100644 client/src/redux/user/user.types.js

diff --git a/client/package.json b/client/package.json
index 6485f4584..de8c9b498 100644
--- a/client/package.json
+++ b/client/package.json
@@ -26,9 +26,15 @@
     "react-image-file-resizer": "^0.2.1",
     "react-moment": "^0.9.7",
     "react-number-format": "^4.3.1",
+    "react-redux": "^7.1.3",
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.2.0",
     "react-trello": "^2.2.3",
+    "redux": "^4.0.5",
+    "redux-logger": "^3.0.6",
+    "redux-persist": "^6.0.0",
+    "redux-saga": "^1.1.3",
+    "reselect": "^4.0.0",
     "styled-components": "^4.4.1",
     "subscriptions-transport-ws": "^0.9.16"
   },
diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index fa2168fce..27db52240 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -1,23 +1,20 @@
-import React, { Component } from "react";
-
-import App from "./App";
-import Spin from "../components/loading-spinner/loading-spinner.component";
-
+import { ApolloLink } from "apollo-boost";
+import { InMemoryCache } from "apollo-cache-inmemory";
 import ApolloClient from "apollo-client";
 import { split } from "apollo-link";
+import { setContext } from "apollo-link-context";
 import { HttpLink } from "apollo-link-http";
+import apolloLogger from "apollo-link-logger";
 import { WebSocketLink } from "apollo-link-ws";
 import { getMainDefinition } from "apollo-utilities";
-import { InMemoryCache } from "apollo-cache-inmemory";
-import { setContext } from "apollo-link-context";
-import { resolvers, typeDefs } from "../graphql/resolvers";
-import apolloLogger from "apollo-link-logger";
-import { ApolloLink } from "apollo-boost";
+import React, { Component } from "react";
 import { ApolloProvider } from "react-apollo";
-import { persistCache } from "apollo-cache-persist";
-import initialState from "../graphql/initial-state";
+import SpinnerComponent from "../components/loading-spinner/loading-spinner.component";
 //import { shouldRefreshToken, refreshToken } from "../graphql/middleware";
 import errorLink from "../graphql/apollo-error-handling";
+import App from "./App";
+
+
 
 class AppContainer extends Component {
   state = {
@@ -69,14 +66,8 @@ class AppContainer extends Component {
     );
 
     const authLink = setContext((_, { headers }) => {
-      // get the authentication token from local storage if it exists
       const token = localStorage.getItem("token");
-      // return the headers to the context so httpLink can read them
       if (token) {
-        // if (shouldRefreshToken) {
-        //   refreshToken();
-        // }
-
         return {
           headers: {
             ...headers,
@@ -99,31 +90,13 @@ class AppContainer extends Component {
     const client = new ApolloClient({
       link: ApolloLink.from(middlewares),
       cache,
-      typeDefs,
-      resolvers,
       connectToDevTools: true
     });
 
-    client.writeData({
-      data: initialState
-    });
-
-    try {
-      await persistCache({
-        cache,
-        storage: window.sessionStorage,
-        debug: true
-      });
-    } catch (error) {
-      console.error("Error restoring Apollo cache", error);
-    }
-
     this.setState({
       client,
       loaded: true
     });
-
-    //Init local state.
   }
 
   componentWillUnmount() {}
@@ -132,7 +105,7 @@ class AppContainer extends Component {
     const { client, loaded } = this.state;
 
     if (!loaded) {
-      return <Spin />;
+      return <SpinnerComponent />;
     }
 
     return (
diff --git a/client/src/App/App.js b/client/src/App/App.js
index 5ff998489..ac2111752 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -1,22 +1,20 @@
-import React, { useEffect, Suspense, lazy, useState } from "react";
-import { useApolloClient, useQuery } from "@apollo/react-hooks";
-import { Switch, Route, Redirect } from "react-router-dom";
-import firebase from "../firebase/firebase.utils";
+import { useApolloClient } from "@apollo/react-hooks";
 import i18next from "i18next";
-
-import "./App.css";
-
+import React, { lazy, Suspense, useEffect, useState } from "react";
+import { Route, Switch } from "react-router-dom";
+import ErrorBoundary from "../components/error-boundary/error-boundary.component";
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
-import AlertComponent from "../components/alert/alert.component";
-import ErrorBoundary from "../components/error-boundary/error-boundary.component";
-
 import { auth } from "../firebase/firebase.utils";
 import { UPSERT_USER } from "../graphql/user.queries";
-import { GET_CURRENT_USER, GET_LANGUAGE } from "../graphql/local.queries";
-// import { QUERY_BODYSHOP } from "../graphql/bodyshop.queries";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 
+// import { QUERY_BODYSHOP } from "../graphql/bodyshop.queries";
 import PrivateRoute from "../utils/private-route";
+import "./App.css";
+import { checkUserSession } from "../redux/user/user.actions";
+import { selectCurrentUser } from "../redux/user/user.selectors";
 
 const LandingPage = lazy(() => import("../pages/landing/landing.page"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page"));
@@ -25,110 +23,85 @@ const Unauthorized = lazy(() =>
   import("../pages/unauthorized/unauthorized.component")
 );
 
-export default () => {
-  const apolloClient = useApolloClient();
-  const [loaded, setloaded] = useState(false);
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = dispatch => ({
+  checkUserSession: () => dispatch(checkUserSession())
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(({ checkUserSession, currentUser }) => {
   useEffect(() => {
-    //Run the auth code only on the first render.
-    const unsubscribeFromAuth = auth.onAuthStateChanged(async user => {
-      console.log("Auth State Changed.");
-      setloaded(true);
-      if (user) {
-        let token;
-        token = await user.getIdToken();
-        const idTokenResult = await user.getIdTokenResult();
-        const hasuraClaim =
-          idTokenResult.claims["https://hasura.io/jwt/claims"];
-        if (!hasuraClaim) {
-          // Check if refresh is required.
-          const metadataRef = firebase
-            .database()
-            .ref("metadata/" + user.uid + "/refreshTime");
+    checkUserSession();
+    return () => {};
+  }, [checkUserSession]);
 
-          metadataRef.on("value", async () => {
-            // Force refresh to pick up the latest custom claims changes.
-            token = await user.getIdToken(true);
-          });
-        }
+  // useEffect(() => {
+  //   //Run the auth code only on the first render.
+  //   const unsubscribeFromAuth = auth.onAuthStateChanged(async user => {
+  //     console.log("onAuthStateChanged: User:", user);
+  //     if (user) {
+  //       let token;
+  //       token = await user.getIdToken();
 
-        //add the bearer token to the headers.
-        localStorage.setItem("token", token);
-        const now = new Date();
-        window.sessionStorage.setItem(`lastTokenRefreshTime`, now);
-        // window.sessionStorage.setItem("user", user);
+  //       //add the bearer token to the headers.
+  //       localStorage.setItem("token", token);
+  //       const now = new Date();
+  //       window.sessionStorage.setItem(`lastTokenRefreshTime`, now);
 
-        apolloClient
-          .mutate({
-            mutation: UPSERT_USER,
-            variables: { authEmail: user.email, authToken: user.uid }
-          })
-          .then()
-          .catch(error => {
-            console.log("User login upsert error.", error);
-          });
+  //       //token = await user.getIdToken(true); //how to refresh the token.
 
-        apolloClient.writeData({
-          data: {
-            currentUser: {
-              email: user.email,
-              displayName: user.displayName,
-              token,
-              uid: user.uid,
-              photoUrl: user.photoURL,
-              __typename: "currentUser"
-            }
-          }
-        });
-      } else {
-        apolloClient.writeData({ data: { currentUser: null } });
-        localStorage.removeItem("token");
-      }
-    });
+  //       apolloClient
+  //         .mutate({
+  //           mutation: UPSERT_USER,
+  //           variables: { authEmail: user.email, authToken: user.uid }
+  //         })
+  //         .then()
+  //         .catch(error => {
+  //           console.log("User login upsert error.", error);
+  //         });
 
-    return function cleanup() {
-      unsubscribeFromAuth();
-    };
-  }, [apolloClient]);
-  const HookCurrentUser = useQuery(GET_CURRENT_USER);
-  const HookLanguage = useQuery(GET_LANGUAGE);
+  //     } else {
+  //       localStorage.removeItem("token");
+  //     }
+  //     setloaded(true);
+  //   });
 
-  if (!loaded) return <LoadingSpinner />;
-  if (HookCurrentUser.loading || HookLanguage.loading)
-    return <LoadingSpinner />;
-  if (HookCurrentUser.error || HookLanguage.error)
-    return (
-      <AlertComponent
-        message={HookCurrentUser.error.message || HookLanguage.error.message}
-      />
-    );
+  //   return function cleanup() {
+  //     unsubscribeFromAuth();
+  //   };
+  // }, [apolloClient]);
 
-  if (HookLanguage.data.language)
-    i18next.changeLanguage(HookLanguage.data.language, (err, t) => {
+  if (false)
+    i18next.changeLanguage("en_US", (err, t) => {
       if (err)
         return console.log("Error encountered when changing languages.", err);
     });
 
+  console.log("currentUser", currentUser);
+  if (currentUser.authorized === null) {
+    //TODO: Translate this.
+    return <LoadingSpinner message="Waiting for Current Auth to persist." />;
+  }
+
   return (
     <div>
       <Switch>
         <ErrorBoundary>
           <Suspense fallback={<LoadingSpinner />}>
-            <Route exact path='/' component={LandingPage} />
-            <Route exact path='/unauthorized' component={Unauthorized} />
-            <Route
-              exact
-              path='/signin'
-              render={() =>
-                HookCurrentUser.data.currentUser ? (
-                  <Redirect to='/manage' />
-                ) : (
-                  <SignInPage />
-                )
-              }
-            />
+            <Route exact path="/" component={LandingPage} />
+            <Route exact path="/unauthorized" component={Unauthorized} />
+
+            <Route exact path="/signin" component={SignInPage} />
+
             <PrivateRoute
-              isAuthorized={HookCurrentUser.data.currentUser ? true : false}
-              path='/manage'
+              //isAuthorized={HookCurrentUser.data.currentUser ? true : false}
+              isAuthorized={currentUser.authorized}
+              path="/manage"
               component={ManagePage}
             />
           </Suspense>
@@ -136,4 +109,4 @@ export default () => {
       </Switch>
     </div>
   );
-};
+});
diff --git a/client/src/components/chat-window/chat-window.container.jsx b/client/src/components/chat-window/chat-window.container.jsx
index cd70e1060..940e7b416 100644
--- a/client/src/components/chat-window/chat-window.container.jsx
+++ b/client/src/components/chat-window/chat-window.container.jsx
@@ -1,8 +1,22 @@
 import React, { useState } from "react";
 import ChatWindowComponent from "./chat-window.component";
 import { Button } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 
-export default function ChatWindowContainer() {
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = dispatch => ({
+  // signOutStart: () => dispatch(signOutStart())
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(function ChatWindowContainer({ currentUser }) {
   const [visible, setVisible] = useState(false);
   return (
     <div style={{ position: "absolute", zIndex: 1000 }}>
@@ -10,9 +24,10 @@ export default function ChatWindowContainer() {
       <Button
         onClick={() => {
           setVisible(!visible);
-        }}>
+        }}
+      >
         Open!
       </Button>
     </div>
   );
-}
+});
diff --git a/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx b/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
index 5f23bca64..f7735f5d0 100644
--- a/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
+++ b/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
@@ -1,17 +1,29 @@
-import { useApolloClient, useQuery } from "@apollo/react-hooks";
+import { useApolloClient } from "@apollo/react-hooks";
 import { Avatar, Col, Dropdown, Icon, Menu, Row } from "antd";
 import i18next from "i18next";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import UserImage from "../../assets/User.svg";
-import { GET_CURRENT_USER } from "../../graphql/local.queries";
-import AlertComponent from "../alert/alert.component";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 import SignOut from "../sign-out/sign-out.component";
 
-export default function CurrentUserDropdown() {
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = dispatch => ({
+  // signOutStart: () => dispatch(signOutStart())
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(function CurrentUserDropdown({ currentUser }) {
   const { t } = useTranslation();
-  const { loading, error, data } = useQuery(GET_CURRENT_USER);
+
   const client = useApolloClient();
 
   const handleMenuClick = e => {
@@ -24,43 +36,39 @@ export default function CurrentUserDropdown() {
     }
   };
   const menu = (
-    <Menu mode='vertical' onClick={handleMenuClick}>
+    <Menu mode="vertical" onClick={handleMenuClick}>
       <Menu.Item>
         <SignOut />
       </Menu.Item>
       <Menu.Item>
-        <Link to='/manage/profile'> {t("menus.currentuser.profile")}</Link>
+        <Link to="/manage/profile"> {t("menus.currentuser.profile")}</Link>
       </Menu.Item>
       <Menu.SubMenu
         title={
           <span>
-            <Icon type='global' />
+            <Icon type="global" />
             <span>{t("menus.currentuser.languageselector")}</span>
           </span>
-        }>
-        <Menu.Item actiontype='lang-select' key='en_us'>
+        }
+      >
+        <Menu.Item actiontype="lang-select" key="en_us">
           {t("general.languages.english")}
         </Menu.Item>
-        <Menu.Item actiontype='lang-select' key='fr'>
+        <Menu.Item actiontype="lang-select" key="fr">
           {t("general.languages.french")}
         </Menu.Item>
-        <Menu.Item actiontype='lang-select' key='es'>
+        <Menu.Item actiontype="lang-select" key="es">
           {t("general.languages.spanish")}
         </Menu.Item>
       </Menu.SubMenu>
     </Menu>
   );
 
-  if (loading) return null;
-  if (error) return <AlertComponent message={error.message} type='error' />;
-
-  const { currentUser } = data;
-
   return (
     <Dropdown overlay={menu}>
       <Row>
         <Col span={8}>
-          <Avatar size='large' alt='Avatar' src={UserImage} />
+          <Avatar size="large" alt="Avatar" src={UserImage} />
         </Col>
         <Col span={16} style={{ color: "white" }}>
           {currentUser.displayName || t("general.labels.unknown")}
@@ -68,4 +76,4 @@ export default function CurrentUserDropdown() {
       </Row>
     </Dropdown>
   );
-}
+});
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 5a59274c4..0067db0d6 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -6,45 +6,45 @@ import { Link } from "react-router-dom";
 import CurrentUserDropdown from "../current-user-dropdown/current-user-dropdown.component";
 import GlobalSearch from "../global-search/global-search.component";
 import ManageSignInButton from "../manage-sign-in-button/manage-sign-in-button.component";
-import "./header.styles.scss";
 
 export default ({ landingHeader, navItems, selectedNavItem }) => {
   const apolloClient = useApolloClient();
   const { t } = useTranslation();
-  
+
   const handleClick = e => {
     apolloClient.writeData({ data: { selectedNavItem: e.key } });
   };
 
   return (
-    <Row type='flex' justify='space-around'>
+    <Row type="flex" justify="space-around">
       <Col span={16}>
         <Menu
-          theme='dark'
-          className='header'
+          theme="dark"
+          className="header"
           onClick={handleClick}
           selectedKeys={selectedNavItem}
-          mode='horizontal'>
+          mode="horizontal"
+        >
           <Menu.Item>
             <GlobalSearch />
           </Menu.Item>
 
-          <Menu.Item key='home'>
-            <Link to='/manage'>
-              <Icon type='home' />
+          <Menu.Item key="home">
+            <Link to="/manage">
+              <Icon type="home" />
               {t("menus.header.home")}
             </Link>
           </Menu.Item>
           <Menu.SubMenu title={t("menus.header.jobs")}>
-            <Menu.Item key='activejobs'>
-              <Link to='/manage/jobs'>
-                <Icon type='home' />
+            <Menu.Item key="activejobs">
+              <Link to="/manage/jobs">
+                <Icon type="home" />
                 {t("menus.header.activejobs")}
               </Link>
             </Menu.Item>
-            <Menu.Item key='availablejobs'>
-              <Link to='/manage/available'>
-                <Icon type='home' />
+            <Menu.Item key="availablejobs">
+              <Link to="/manage/available">
+                <Icon type="home" />
                 {t("menus.header.availablejobs")}
               </Link>
             </Menu.Item>
diff --git a/client/src/components/header/header.container.jsx b/client/src/components/header/header.container.jsx
index 299d55caf..d971b7c46 100644
--- a/client/src/components/header/header.container.jsx
+++ b/client/src/components/header/header.container.jsx
@@ -1,25 +1,8 @@
 import React from "react";
-import "./header.styles.scss";
-import { useQuery } from "react-apollo";
-// //import {
-//   GET_LANDING_NAV_ITEMS,
-//   GET_NAV_ITEMS
-// } from "../../graphql/metadata.queries";
-import { GET_CURRENT_SELECTED_NAV_ITEM } from "../../graphql/local.queries";
-//import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-//import AlertComponent from "../alert/alert.component";
 import HeaderComponent from "./header.component";
 
 export default ({ landingHeader, signedIn }) => {
-  const hookSelectedNavItem = useQuery(GET_CURRENT_SELECTED_NAV_ITEM);
-
-  const { selectedNavItem } = hookSelectedNavItem.data;
-
-  console.log("selectedNavItem", selectedNavItem);
   return (
-    <HeaderComponent
-      landingHeader={landingHeader}
-      selectedNavItem={selectedNavItem}
-    />
+    <HeaderComponent landingHeader={landingHeader} selectedNavItem={null} />
   );
 };
diff --git a/client/src/components/header/header.styles.scss b/client/src/components/header/header.styles.scss
deleted file mode 100644
index 3766e1b90..000000000
--- a/client/src/components/header/header.styles.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.header{
-        text-align: center;     
-        width: 100%; 
-}
\ No newline at end of file
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 60da20fd3..a02f0bed8 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -132,6 +132,7 @@ export default function JobLinesComponent({
           />
         );
       }}
+      {...formItemLayout}
       size="small"
       pagination={{ position: "bottom", defaultPageSize: 50 }}
       columns={columns.map(item => ({ ...item }))}
diff --git a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
index f2ae7dd19..85a87a58c 100644
--- a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
+++ b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
@@ -4,18 +4,23 @@ import { Link } from "react-router-dom";
 import { GET_CURRENT_USER } from "../../graphql/local.queries";
 import { Icon } from "antd";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 
-export default function ManageSignInButton() {
-  const {
-    loading,
-    error,
-    data: { currentUser }
-  } = useQuery(GET_CURRENT_USER);
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
 
-  if (loading) return <LoadingSpinner />;
-  if (error) return error.message;
+const mapDispatchToProps = dispatch => ({
+  // signOutStart: () => dispatch(signOutStart())
+});
 
-  return currentUser ? (
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(function ManageSignInButton({ currentUser }) {
+  return currentUser.isAuthorized ? (
     <div>
       {" "}
       <Link to="/manage">
@@ -31,4 +36,4 @@ export default function ManageSignInButton() {
       </Link>
     </div>
   );
-}
+});
diff --git a/client/src/components/sign-in-form/sign-in-form.component.jsx b/client/src/components/sign-in-form/sign-in-form.component.jsx
index 2038e12d8..e41aeff39 100644
--- a/client/src/components/sign-in-form/sign-in-form.component.jsx
+++ b/client/src/components/sign-in-form/sign-in-form.component.jsx
@@ -1,76 +1,97 @@
+import { Button, Form, Icon, Input } from "antd";
 import React from "react";
-import { auth } from "../../firebase/firebase.utils";
-import { Form, Icon, Input, Button, Alert } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import Logo from "../../assets/logo240.png";
+import { emailSignInStart } from "../../redux/user/user.actions";
+import {
+  selectCurrentUser,
+  selectSignInError
+} from "../../redux/user/user.selectors";
+import { Redirect } from "react-router-dom";
 
-class SignInForm extends React.Component {
-  constructor() {
-    super();
-    this.state = {
-      errorMessage: null
-    };
-  }
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  signInError: selectSignInError
+});
 
-  handleSubmit = e => {
-    e.preventDefault();
+const mapDispatchToProps = dispatch => ({
+  emailSignInStart: (email, password) =>
+    dispatch(emailSignInStart({ email, password }))
+});
 
-    this.props.form.validateFields(async (err, values) => {
-      if (!err) {
-        const { email, password } = values;
-        try {
-          await auth.signInWithEmailAndPassword(email, password);
-
-          this.props.form.resetFields();
-        } catch (error) {
-          this.setState({ ...this.state, errorMessage: error.message });
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(
+  Form.create({ name: "sign_in" })(function SignInComponent({
+    form,
+    emailSignInStart,
+    currentUser,
+    signInError
+  }) {
+    const handleSubmit = e => {
+      e.preventDefault();
+      form.validateFields(async (err, values) => {
+        if (!err) {
+          const { email, password } = values;
+          emailSignInStart(email, password);
+          //Try to do the login using a saga here.
         }
-      }
-    });
-  };
-
-  render() {
-    const { getFieldDecorator } = this.props.form;
-    const { errorMessage } = this.state;
+      });
+    };
 
+    console.log("currentUser", currentUser);
+    const { getFieldDecorator } = form;
     return (
-      <Form onSubmit={this.handleSubmit} className="login-form">
-        <Form.Item label="E-mail">
-          {getFieldDecorator("email", {
-            rules: [
-              {
-                type: "email",
-                message: "Please enter a valid email."
-              },
-              {
-                required: true,
-                message: "Please your email."
-              }
-            ]
-          })(<Input />)}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator("password", {
-            rules: [{ required: true, message: "Please enter your password." }]
-          })(
-            <Input
-              prefix={<Icon type="lock" style={{ color: "rgba(0,0,0,.25)" }} />}
-              type="password"
-              placeholder="Password"
-            />
-          )}
-        </Form.Item>
-        <Form.Item>
-          <div className="login-form-forgot">Forgot password</div>
-          <Button
-            type="primary"
-            htmlType="submit"
-            className="login-form-button"
-          >
-            Log in
-          </Button>
-        </Form.Item>
-        {errorMessage ? <Alert message={errorMessage} type="error" /> : null}
-      </Form>
+      <div>
+        {currentUser.authorized === true ? <Redirect to="/manage?" /> : null}
+
+        <img src={Logo} height="100" width="100" alt="Bodyshop.app" />
+
+        <Form onSubmit={handleSubmit} className="login-form">
+          <Form.Item label="E-mail">
+            {getFieldDecorator("email", {
+              rules: [
+                {
+                  type: "email",
+                  message: "Please enter a valid email."
+                },
+                {
+                  required: true,
+                  message: "Please your email."
+                }
+              ]
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator("password", {
+              rules: [
+                { required: true, message: "Please enter your password." }
+              ]
+            })(
+              <Input
+                prefix={
+                  <Icon type="lock" style={{ color: "rgba(0,0,0,.25)" }} />
+                }
+                type="password"
+                placeholder="Password"
+              />
+            )}
+          </Form.Item>
+          <Form.Item>
+            <div className="login-form-forgot">Forgot password</div>
+            <Button
+              type="primary"
+              htmlType="submit"
+              className="login-form-button"
+            >
+              Log in
+            </Button>
+          </Form.Item>
+          {signInError ? <div>{signInError.message}</div> : null}
+        </Form>
+      </div>
     );
-  }
-}
-export default Form.create({ name: "sign_in" })(SignInForm);
+  })
+);
diff --git a/client/src/components/sign-in-form/sign-in-form.container.jsx b/client/src/components/sign-in-form/sign-in-form.container.jsx
deleted file mode 100644
index 85ca228d4..000000000
--- a/client/src/components/sign-in-form/sign-in-form.container.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from "react";
-import { ApolloConsumer } from "react-apollo";
-import SignInFormComponent from "./sign-in-form.component";
-import { Row, Col, Layout, Typography } from "antd";
-import FooterComponent from "../footer/footer.component";
-import Logo from "../../assets/logo240.png";
-
-const { Content, Footer } = Layout;
-
-export default function SignInFormContainer() {
-  return (
-    <ApolloConsumer>
-      {client => {
-        return (
-          <Layout>
-            <Content>
-              <Row align="middle">
-                <Col span={2} offset={8}>
-                  <div>
-                    <img
-                      src={Logo}
-                      height="100"
-                      width="100"
-                      alt="Bodyshop.app"
-                    />
-                  </div>
-                </Col>
-                <Col span={6}>
-                  <Typography.Title>Bodyshop.app</Typography.Title>
-                </Col>
-              </Row>
-              <Row>
-                <Col span={8} offset={8}>
-                  <SignInFormComponent apolloClient={client} />
-                </Col>
-              </Row>
-            </Content>
-            <Footer>
-              <FooterComponent />
-            </Footer>
-          </Layout>
-        );
-      }}
-    </ApolloConsumer>
-  );
-}
diff --git a/client/src/firebase/firebase.utils.js b/client/src/firebase/firebase.utils.js
index 4a2a8fae7..56426cfb7 100644
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -38,6 +38,14 @@ export const firestore = firebase.firestore();
 
 const provider = new firebase.auth.GoogleAuthProvider();
 provider.setCustomParameters({ prompt: "select_account" });
-export const signInWithGoogle = () => auth.signInWithPopup(provider);
 
 export default firebase;
+
+export const getCurrentUser = () => {
+  return new Promise((resolve, reject) => {
+    const unsubscribe = auth.onAuthStateChanged(userAuth => {
+      unsubscribe();
+      resolve(userAuth);
+    }, reject);
+  });
+};
diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js
index 7b5443ede..28394033b 100644
--- a/client/src/graphql/apollo-error-handling.js
+++ b/client/src/graphql/apollo-error-handling.js
@@ -1,5 +1,4 @@
 import { onError } from "apollo-link-error";
-import { Observable } from "apollo-link";
 import { auth } from "../firebase/firebase.utils";
 //https://stackoverflow.com/questions/57163454/refreshing-a-token-with-apollo-client-firebase-auth
 
diff --git a/client/src/graphql/resolvers.js b/client/src/graphql/resolvers.js
deleted file mode 100644
index b293bfd8b..000000000
--- a/client/src/graphql/resolvers.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { gql } from "apollo-boost";
-import { GET_CURRENT_USER } from "./local.queries";
-
-export const typeDefs = gql`
-  extend type Mutation {
-    SetCurrentUser(user: User!): User!
-  }
-
-  extend type User {
-    email: String!
-    displayName: String!
-    token: String!
-  }
-
-  extend type Jobs {
-    id: uuid!
-  }
-`;
-
-export const resolvers = {
-  Mutation: {
-    setCurrentUser: (_root, { user }, { cache }) => {
-      cache.writeQuery({
-        query: GET_CURRENT_USER,
-        data: { currentUser: user }
-      });
-
-      return user;
-    }
-  }
-};
diff --git a/client/src/index.js b/client/src/index.js
index b29d04ea2..8cb47c9a0 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -3,16 +3,26 @@ import ReactDOM from "react-dom";
 import { BrowserRouter } from "react-router-dom";
 import "./translations/i18n";
 import * as serviceWorker from "./serviceWorker";
-
-import "./index.css";
+import { Provider } from "react-redux";
+import { PersistGate } from "redux-persist/integration/react";
+import { store, persistor } from "./redux/store";
 import AppContainer from "./App/App.container";
+import "./index.css";
+import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
 
 require("dotenv").config();
 
 ReactDOM.render(
-  <BrowserRouter>
-    <AppContainer />
-  </BrowserRouter>,
+  <Provider store={store}>
+    <BrowserRouter>
+      <PersistGate
+        loading={<LoadingSpinner message="PersistGate Loading." />}
+        persistor={persistor}
+      >
+        <AppContainer />
+      </PersistGate>
+    </BrowserRouter>
+  </Provider>,
   document.getElementById("root")
 );
 
diff --git a/client/src/pages/sign-in/sign-in.page.jsx b/client/src/pages/sign-in/sign-in.page.jsx
index 2de375129..15f6566a2 100644
--- a/client/src/pages/sign-in/sign-in.page.jsx
+++ b/client/src/pages/sign-in/sign-in.page.jsx
@@ -1,6 +1,6 @@
 import React from "react";
-import SignInContainer from "../../components/sign-in-form/sign-in-form.container";
+import SignIn from "../../components/sign-in-form/sign-in-form.component";
 
 export default () => {
-  return <SignInContainer />;
+  return <SignIn />;
 };
diff --git a/client/src/redux/root.reducer.js b/client/src/redux/root.reducer.js
new file mode 100644
index 000000000..a219a04af
--- /dev/null
+++ b/client/src/redux/root.reducer.js
@@ -0,0 +1,24 @@
+import { combineReducers } from "redux";
+import { persistReducer } from "redux-persist";
+import storage from "redux-persist/lib/storage";
+
+import userReducer from "./user/user.reducer";
+// import cartReducer from './cart/cart.reducer';
+// import directoryReducer from './directory/directory.reducer';
+// import shopReducer from './shop/shop.reducer';
+
+const persistConfig = {
+  key: "root",
+  storage,
+  //whitelist: ["cart"]
+  blacklist: ["user"]
+};
+
+const rootReducer = combineReducers({
+  user: userReducer
+  //   cart: cartReducer,
+  //   directory: directoryReducer,
+  //   shop: shopReducer
+});
+
+export default persistReducer(persistConfig, rootReducer);
diff --git a/client/src/redux/root.saga.js b/client/src/redux/root.saga.js
new file mode 100644
index 000000000..03f871ee8
--- /dev/null
+++ b/client/src/redux/root.saga.js
@@ -0,0 +1,11 @@
+import { all, call } from "redux-saga/effects";
+
+//List of all Sagas
+// import { shopSagas } from "./shop/shop.sagas";
+import { userSagas } from "./user/user.sagas";
+//import { cartSagas } from "./cart/cart.sagas";
+
+export default function* rootSaga() {
+  //All starts all the Sagas concurrently.
+  yield all([call(userSagas)]);
+}
diff --git a/client/src/redux/store.js b/client/src/redux/store.js
new file mode 100644
index 000000000..736d68033
--- /dev/null
+++ b/client/src/redux/store.js
@@ -0,0 +1,19 @@
+import { createStore, applyMiddleware } from "redux";
+import { persistStore } from "redux-persist";
+import logger from "redux-logger";
+import createSagaMiddleware from "redux-saga";
+import rootReducer from "./root.reducer";
+import rootSaga from "./root.saga";
+
+const sagaMiddleWare = createSagaMiddleware();
+const middlewares = [sagaMiddleWare];
+if (process.env.NODE_ENV === "development") {
+  middlewares.push(logger);
+}
+
+export const store = createStore(rootReducer, applyMiddleware(...middlewares));
+sagaMiddleWare.run(rootSaga);
+
+export const persistor = persistStore(store);
+
+export default { store, persistStore };
diff --git a/client/src/redux/user/user.actions.js b/client/src/redux/user/user.actions.js
new file mode 100644
index 000000000..334ad2d8a
--- /dev/null
+++ b/client/src/redux/user/user.actions.js
@@ -0,0 +1,35 @@
+import UserActionTypes from "./user.types";
+
+export const signInSuccess = user => ({
+  type: UserActionTypes.SIGN_IN_SUCCESS,
+  payload: user
+});
+export const signInFailure = errorMsg => ({
+  type: UserActionTypes.SIGN_IN_FAILURE,
+  payload: errorMsg
+});
+
+export const emailSignInStart = emailAndPassword => ({
+  type: UserActionTypes.EMAIL_SIGN_IN_START,
+  payload: emailAndPassword
+});
+
+export const checkUserSession = () => ({
+  type: UserActionTypes.CHECK_USER_SESSION
+});
+
+export const signOutStart = () => ({
+  type: UserActionTypes.SIGN_OUT_START
+});
+export const signOutSuccess = () => ({
+  type: UserActionTypes.SIGN_OUT_SUCCESS
+});
+
+export const signOutFailure = error => ({
+  type: UserActionTypes.SIGN_OUT_FAILURE,
+  payload: error
+});
+
+export const unauthorizedUser = () => ({
+  type: UserActionTypes.UNAUTHORIZED_USER
+});
diff --git a/client/src/redux/user/user.reducer.js b/client/src/redux/user/user.reducer.js
new file mode 100644
index 000000000..fa9535d9e
--- /dev/null
+++ b/client/src/redux/user/user.reducer.js
@@ -0,0 +1,42 @@
+import UserActionTypes from "./user.types";
+
+const INITIAL_STATE = {
+  currentUser: {
+    authorized: null
+  },
+  error: null
+};
+
+const userReducer = (state = INITIAL_STATE, action) => {
+  switch (action.type) {
+    case UserActionTypes.SIGN_IN_SUCCESS:
+      return {
+        ...state,
+        currentUser: action.payload,
+        error: null
+      };
+    case UserActionTypes.SIGN_OUT_SUCCESS:
+      return {
+        ...state,
+        currentUser: { authorized: false },
+        error: null
+      };
+    case UserActionTypes.UNAUTHORIZED_USER:
+      return {
+        ...state,
+        error: null,
+        currentUser: { authorized: false }
+      };
+    case UserActionTypes.SIGN_IN_FAILURE:
+    case UserActionTypes.SIGN_OUT_FAILURE:
+    case UserActionTypes.EMAIL_SIGN_UP_FAILURE:
+      return {
+        ...state,
+        error: action.payload
+      };
+    default:
+      return state;
+  }
+};
+
+export default userReducer;
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
new file mode 100644
index 000000000..f67356042
--- /dev/null
+++ b/client/src/redux/user/user.sagas.js
@@ -0,0 +1,87 @@
+import { all, call, put, takeLatest } from "redux-saga/effects";
+import { auth, getCurrentUser } from "../../firebase/firebase.utils";
+import {
+  signInFailure,
+  signInSuccess,
+  signOutFailure,
+  signOutSuccess,
+  unauthorizedUser
+} from "./user.actions";
+import UserActionTypes from "./user.types";
+
+// export function* getSnapshotFromUserAuth(userAuth) {
+//   try {
+//     const userRef = yield call(createUserProfileDocument, userAuth);
+//     //const userSnapshot = yield userRef.get();
+//   } catch (error) {
+//     yield put(signInFailure(error));
+//   }
+// }
+
+export function* signInWithEmail({ payload: { email, password } }) {
+  try {
+    const { user } = yield auth.signInWithEmailAndPassword(email, password);
+    yield put(
+      signInSuccess({
+        id: user.uid,
+        email: user.email,
+        displayName: user.displayName,
+        authorized: true
+      })
+    );
+  } catch (error) {
+    yield put(signInFailure(error));
+  }
+}
+//This is the listener fo rthe call, and when it finds it, it triggers somethign else.
+export function* onEmailSignInStart() {
+  yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
+}
+
+export function* isUserAuthenticated() {
+  try {
+    const user = yield getCurrentUser();
+    if (!user) {
+      yield put(unauthorizedUser());
+      return;
+    }
+    yield put(
+      signInSuccess({
+        id: user.uid,
+        email: user.email,
+        displayName: user.displayName,
+        authorized: true
+      })
+    );
+  } catch (error) {
+    yield put(signInFailure(error));
+  }
+}
+
+export function* onCheckUserSession() {
+  yield takeLatest(UserActionTypes.CHECK_USER_SESSION, isUserAuthenticated);
+}
+
+export function* signOutStart() {
+  try {
+    yield auth.signOut();
+    yield put(signOutSuccess());
+  } catch (error) {
+    yield put(signOutFailure(error.message));
+  }
+}
+
+export function* onSignOutStart() {
+  yield takeLatest(UserActionTypes.SIGN_OUT_START, signOutStart);
+}
+
+export function* userSagas() {
+  yield all([
+    // call(onGoogleSignInStart),
+    call(onEmailSignInStart),
+    call(onCheckUserSession),
+    call(onSignOutStart)
+    // call(onEmailSignUpStart),
+    // call(onEmailSignUpSuccess)
+  ]);
+}
diff --git a/client/src/redux/user/user.selectors.js b/client/src/redux/user/user.selectors.js
new file mode 100644
index 000000000..ecddf5c33
--- /dev/null
+++ b/client/src/redux/user/user.selectors.js
@@ -0,0 +1,13 @@
+import { createSelector } from "reselect";
+
+const selectUser = state => state.user;
+
+export const selectCurrentUser = createSelector(
+  [selectUser],
+  user => user.currentUser
+);
+
+export const selectSignInError = createSelector(
+  [selectUser],
+  user => user.error
+);
diff --git a/client/src/redux/user/user.types.js b/client/src/redux/user/user.types.js
new file mode 100644
index 000000000..07a32eb3b
--- /dev/null
+++ b/client/src/redux/user/user.types.js
@@ -0,0 +1,17 @@
+const UserActionTypes = {
+    SET_CURRENT_USER: "SET_CURRENT_USER",
+    GOOGLE_SIGN_IN_START: "GOOGLE_SIGN_IN_START",
+    SIGN_IN_SUCCESS: "SIGN_IN_SUCCESS",
+    SIGN_IN_FAILURE: "SIGN_IN_FAILURE",
+    EMAIL_SIGN_IN_START: "EMAIL_SIGN_IN_START",
+    CHECK_USER_SESSION: "CHECK_USER_SESSION",
+    SIGN_OUT_START: "SIGN_OUT_START",
+    SIGN_OUT_SUCCESS: "SIGN_OUT_SUCCESS",
+    SIGN_OUT_FAILURE: "SIGN_OUT_FAILURE",
+    EMAIL_SIGN_UP_START: "EMAIL_SIGN_UP_START",
+    EMAIL_SIGN_UP_SUCCESS: "EMAIL_SIGN_UP_SUCCESS",
+    EMAIL_SIGN_UP_FAILURE: "EMAIL_SIGN_UP_FAILURE",
+    UNAUTHORIZED_USER: "UNAUTHORIZED_USER"
+  };
+  export default UserActionTypes;
+  
\ No newline at end of file
diff --git a/client/yarn.lock b/client/yarn.lock
index d73e081cd..5d1c69033 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1026,6 +1026,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.5.5":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
+  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.4.0", "@babel/template@^7.6.0", "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -1569,6 +1576,50 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
+"@redux-saga/core@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
+  integrity sha512-8tInBftak8TPzE6X13ABmEtRJGjtK17w7VUs7qV17S8hCO5S3+aUTWZ/DBsBJPdE8Z5jOPwYALyvofgq1Ws+kg==
+  dependencies:
+    "@babel/runtime" "^7.6.3"
+    "@redux-saga/deferred" "^1.1.2"
+    "@redux-saga/delay-p" "^1.1.2"
+    "@redux-saga/is" "^1.1.2"
+    "@redux-saga/symbols" "^1.1.2"
+    "@redux-saga/types" "^1.1.0"
+    redux "^4.0.4"
+    typescript-tuple "^2.2.1"
+
+"@redux-saga/deferred@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.2.tgz#59937a0eba71fff289f1310233bc518117a71888"
+  integrity sha512-908rDLHFN2UUzt2jb4uOzj6afpjgJe3MjICaUNO3bvkV/kN/cNeI9PMr8BsFXB/MR8WTAZQq/PlTq8Kww3TBSQ==
+
+"@redux-saga/delay-p@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.2.tgz#8f515f4b009b05b02a37a7c3d0ca9ddc157bb355"
+  integrity sha512-ojc+1IoC6OP65Ts5+ZHbEYdrohmIw1j9P7HS9MOJezqMYtCDgpkoqB5enAAZrNtnbSL6gVCWPHaoaTY5KeO0/g==
+  dependencies:
+    "@redux-saga/symbols" "^1.1.2"
+
+"@redux-saga/is@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.2.tgz#ae6c8421f58fcba80faf7cadb7d65b303b97e58e"
+  integrity sha512-OLbunKVsCVNTKEf2cH4TYyNbbPgvmZ52iaxBD4I1fTif4+MTXMa4/Z07L83zW/hTCXwpSZvXogqMqLfex2Tg6w==
+  dependencies:
+    "@redux-saga/symbols" "^1.1.2"
+    "@redux-saga/types" "^1.1.0"
+
+"@redux-saga/symbols@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.2.tgz#216a672a487fc256872b8034835afc22a2d0595d"
+  integrity sha512-EfdGnF423glv3uMwLsGAtE6bg+R9MdqlHEzExnfagXPrIiuxwr3bdiAwz3gi+PsrQ3yBlaBpfGLtDG8rf3LgQQ==
+
+"@redux-saga/types@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204"
+  integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg==
+
 "@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1"
@@ -10425,6 +10476,18 @@ react-redux@^5.0.7:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
+react-redux@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.3.tgz#717a3d7bbe3a1b2d535c94885ce04cdc5a33fc79"
+  integrity sha512-uI1wca+ECG9RoVkWQFF4jDMqmaw0/qnvaSvOoL/GA4dNxf6LoV8sUAcNDvE5NWKs4hFpn0t6wswNQnY3f7HT3w==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    hoist-non-react-statics "^3.3.0"
+    invariant "^2.2.4"
+    loose-envify "^1.4.0"
+    prop-types "^15.7.2"
+    react-is "^16.9.0"
+
 react-router-dom@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
@@ -10691,7 +10754,19 @@ redux-logger@^3.0.6:
   dependencies:
     deep-diff "^0.3.5"
 
-redux@^4.0.0:
+redux-persist@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8"
+  integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
+
+redux-saga@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.3.tgz#9f3e6aebd3c994bbc0f6901a625f9a42b51d1112"
+  integrity sha512-RkSn/z0mwaSa5/xH/hQLo8gNf4tlvT18qXDNvedihLcfzh+jMchDgaariQoehCpgRltEm4zHKJyINEz6aqswTw==
+  dependencies:
+    "@redux-saga/core" "^1.1.3"
+
+redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
   integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
@@ -10888,6 +10963,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
 resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -12269,6 +12349,25 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript-compare@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
+  integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
+  dependencies:
+    typescript-logic "^0.0.0"
+
+typescript-logic@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
+  integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
+
+typescript-tuple@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
+  integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
+  dependencies:
+    typescript-compare "^0.0.2"
+
 ua-parser-js@^0.7.18:
   version "0.7.21"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"

From e2518a95ab024fd5c0a117a1d11142e9fa9698d1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 31 Jan 2020 13:57:27 -0800
Subject: [PATCH 09/10] Replaced remaining parts of app to use Redux.

---
 client/src/App/App.js                         | 52 ++-----------------
 .../current-user-dropdown.component.jsx       | 14 ++---
 .../components/header/header.component.jsx    |  9 +---
 .../jobs-documents.container.jsx              | 27 ++++++----
 .../manage-sign-in-button.component.jsx       | 36 +++++--------
 .../sign-in-form/sign-in-form.component.jsx   | 27 +++++++---
 .../sign-out/sign-out.component.jsx           | 16 +-----
 client/src/graphql/local.queries.js           | 25 ---------
 client/src/redux/user/user.actions.js         |  5 ++
 client/src/redux/user/user.reducer.js         |  9 +++-
 client/src/redux/user/user.sagas.js           | 20 +++----
 client/src/redux/user/user.types.js           | 32 ++++++------
 12 files changed, 104 insertions(+), 168 deletions(-)
 delete mode 100644 client/src/graphql/local.queries.js

diff --git a/client/src/App/App.js b/client/src/App/App.js
index ac2111752..d6159b39b 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -1,20 +1,16 @@
-import { useApolloClient } from "@apollo/react-hooks";
 import i18next from "i18next";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import React, { lazy, Suspense, useEffect } from "react";
+import { connect } from "react-redux";
 import { Route, Switch } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import ErrorBoundary from "../components/error-boundary/error-boundary.component";
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
-import { auth } from "../firebase/firebase.utils";
-import { UPSERT_USER } from "../graphql/user.queries";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-
+import { checkUserSession } from "../redux/user/user.actions";
+import { selectCurrentUser } from "../redux/user/user.selectors";
 // import { QUERY_BODYSHOP } from "../graphql/bodyshop.queries";
 import PrivateRoute from "../utils/private-route";
 import "./App.css";
-import { checkUserSession } from "../redux/user/user.actions";
-import { selectCurrentUser } from "../redux/user/user.selectors";
 
 const LandingPage = lazy(() => import("../pages/landing/landing.page"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page"));
@@ -26,11 +22,9 @@ const Unauthorized = lazy(() =>
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
-
 const mapDispatchToProps = dispatch => ({
   checkUserSession: () => dispatch(checkUserSession())
 });
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps
@@ -40,42 +34,6 @@ export default connect(
     return () => {};
   }, [checkUserSession]);
 
-  // useEffect(() => {
-  //   //Run the auth code only on the first render.
-  //   const unsubscribeFromAuth = auth.onAuthStateChanged(async user => {
-  //     console.log("onAuthStateChanged: User:", user);
-  //     if (user) {
-  //       let token;
-  //       token = await user.getIdToken();
-
-  //       //add the bearer token to the headers.
-  //       localStorage.setItem("token", token);
-  //       const now = new Date();
-  //       window.sessionStorage.setItem(`lastTokenRefreshTime`, now);
-
-  //       //token = await user.getIdToken(true); //how to refresh the token.
-
-  //       apolloClient
-  //         .mutate({
-  //           mutation: UPSERT_USER,
-  //           variables: { authEmail: user.email, authToken: user.uid }
-  //         })
-  //         .then()
-  //         .catch(error => {
-  //           console.log("User login upsert error.", error);
-  //         });
-
-  //     } else {
-  //       localStorage.removeItem("token");
-  //     }
-  //     setloaded(true);
-  //   });
-
-  //   return function cleanup() {
-  //     unsubscribeFromAuth();
-  //   };
-  // }, [apolloClient]);
-
   if (false)
     i18next.changeLanguage("en_US", (err, t) => {
       if (err)
diff --git a/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx b/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
index f7735f5d0..dbf6b6a45 100644
--- a/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
+++ b/client/src/components/current-user-dropdown/current-user-dropdown.component.jsx
@@ -1,4 +1,3 @@
-import { useApolloClient } from "@apollo/react-hooks";
 import { Avatar, Col, Dropdown, Icon, Menu, Row } from "antd";
 import i18next from "i18next";
 import React from "react";
@@ -7,6 +6,7 @@ import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import UserImage from "../../assets/User.svg";
+import { setUserLanguage, signOutStart } from "../../redux/user/user.actions";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 import SignOut from "../sign-out/sign-out.component";
 
@@ -15,30 +15,30 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = dispatch => ({
-  // signOutStart: () => dispatch(signOutStart())
+  signOutStart: () => dispatch(signOutStart()),
+  setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(function CurrentUserDropdown({ currentUser }) {
+)(function CurrentUserDropdown({ currentUser, signOutStart, setUserLanguage }) {
   const { t } = useTranslation();
 
-  const client = useApolloClient();
-
   const handleMenuClick = e => {
     if (e.item.props.actiontype === "lang-select") {
       i18next.changeLanguage(e.key, (err, t) => {
         if (err)
           return console.log("Error encountered when changing languages.", err);
-        client.writeData({ data: { language: e.key } });
+        setUserLanguage(e.key);
+        console.log("clicking");
       });
     }
   };
   const menu = (
     <Menu mode="vertical" onClick={handleMenuClick}>
       <Menu.Item>
-        <SignOut />
+        <SignOut signOutStart={signOutStart} />
       </Menu.Item>
       <Menu.Item>
         <Link to="/manage/profile"> {t("menus.currentuser.profile")}</Link>
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 0067db0d6..e1ec729b3 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -1,4 +1,3 @@
-import { useApolloClient } from "@apollo/react-hooks";
 import { Col, Icon, Menu, Row } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -7,21 +6,15 @@ import CurrentUserDropdown from "../current-user-dropdown/current-user-dropdown.
 import GlobalSearch from "../global-search/global-search.component";
 import ManageSignInButton from "../manage-sign-in-button/manage-sign-in-button.component";
 
-export default ({ landingHeader, navItems, selectedNavItem }) => {
-  const apolloClient = useApolloClient();
+export default ({ landingHeader, selectedNavItem }) => {
   const { t } = useTranslation();
 
-  const handleClick = e => {
-    apolloClient.writeData({ data: { selectedNavItem: e.key } });
-  };
-
   return (
     <Row type="flex" justify="space-around">
       <Col span={16}>
         <Menu
           theme="dark"
           className="header"
-          onClick={handleClick}
           selectedKeys={selectedNavItem}
           mode="horizontal"
         >
diff --git a/client/src/components/jobs-documents/jobs-documents.container.jsx b/client/src/components/jobs-documents/jobs-documents.container.jsx
index 32aedb3f5..dd48114dc 100644
--- a/client/src/components/jobs-documents/jobs-documents.container.jsx
+++ b/client/src/components/jobs-documents/jobs-documents.container.jsx
@@ -1,13 +1,22 @@
 import React from "react";
 import { useQuery } from "react-apollo";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { QUERY_SHOP_ID } from "../../graphql/bodyshop.queries";
 import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import JobDocuments from "./jobs-documents.component";
-import { GET_CURRENT_USER } from "../../graphql/local.queries";
 
-export default function JobsDocumentsContainer({ jobId }) {
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+export default connect(
+  mapStateToProps,
+  null
+)(function JobsDocumentsContainer({ jobId, currentUser }) {
   const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
     variables: { jobId: jobId },
     fetchPolicy: "network-only"
@@ -17,14 +26,12 @@ export default function JobsDocumentsContainer({ jobId }) {
     fetchPolicy: "network-only"
   });
 
-  const user = useQuery(GET_CURRENT_USER);
-
-  if (loading || shopData.loading || user.loading) return <LoadingSpinner />;
-  if (error || shopData.error || user.error)
+  if (loading || shopData.loading) return <LoadingSpinner />;
+  if (error || shopData.error)
     return (
       <AlertComponent
-        type='error'
-        message={error.message || shopData.error.message || user.error.message}
+        type="error"
+        message={error.message || shopData.error.message}
       />
     );
 
@@ -32,7 +39,7 @@ export default function JobsDocumentsContainer({ jobId }) {
     <JobDocuments
       data={data.documents}
       jobId={jobId}
-      currentUser={user.data.currentUser}
+      currentUser={currentUser}
       shopId={
         shopData.data?.bodyshops[0]?.id
           ? shopData.data?.bodyshops[0]?.id
@@ -40,4 +47,4 @@ export default function JobsDocumentsContainer({ jobId }) {
       }
     />
   );
-}
+});
diff --git a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
index 85a87a58c..55ffe1281 100644
--- a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
+++ b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx
@@ -1,10 +1,7 @@
-import React from "react";
-import { useQuery } from "react-apollo";
-import { Link } from "react-router-dom";
-import { GET_CURRENT_USER } from "../../graphql/local.queries";
 import { Icon } from "antd";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import React from "react";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 
@@ -12,28 +9,19 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-const mapDispatchToProps = dispatch => ({
-  // signOutStart: () => dispatch(signOutStart())
-});
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(function ManageSignInButton({ currentUser }) {
-  return currentUser.isAuthorized ? (
-    <div>
-      {" "}
-      <Link to="/manage">
-        <Icon type="build" />
-        Manage
-      </Link>
-    </div>
+  return currentUser.authorized ? (
+    <Link to="/manage">
+      <Icon type="build" />
+      Manage
+    </Link>
   ) : (
-    <div>
-      <Link to="/signin">
-        <Icon type="login" />
-        Sign In
-      </Link>
-    </div>
+    <Link to="/signin">
+      <Icon type="login" />
+      Sign In
+    </Link>
   );
 });
diff --git a/client/src/components/sign-in-form/sign-in-form.component.jsx b/client/src/components/sign-in-form/sign-in-form.component.jsx
index e41aeff39..1a93c9a77 100644
--- a/client/src/components/sign-in-form/sign-in-form.component.jsx
+++ b/client/src/components/sign-in-form/sign-in-form.component.jsx
@@ -1,14 +1,13 @@
 import { Button, Form, Icon, Input } from "antd";
 import React from "react";
+import { useApolloClient } from "react-apollo";
 import { connect } from "react-redux";
+import { Redirect } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import Logo from "../../assets/logo240.png";
+import { UPSERT_USER } from "../../graphql/user.queries";
 import { emailSignInStart } from "../../redux/user/user.actions";
-import {
-  selectCurrentUser,
-  selectSignInError
-} from "../../redux/user/user.selectors";
-import { Redirect } from "react-router-dom";
+import { selectCurrentUser, selectSignInError } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -30,6 +29,8 @@ export default connect(
     currentUser,
     signInError
   }) {
+    const apolloClient = useApolloClient();
+
     const handleSubmit = e => {
       e.preventDefault();
       form.validateFields(async (err, values) => {
@@ -41,7 +42,21 @@ export default connect(
       });
     };
 
-    console.log("currentUser", currentUser);
+    if (currentUser.authorized === true) {
+      apolloClient
+        .mutate({
+          mutation: UPSERT_USER,
+          variables: {
+            authEmail: currentUser.email,
+            authToken: currentUser.uid
+          }
+        })
+        .then()
+        .catch(error => {
+          console.log("User login upsert error.", error);
+        });
+    }
+
     const { getFieldDecorator } = form;
     return (
       <div>
diff --git a/client/src/components/sign-out/sign-out.component.jsx b/client/src/components/sign-out/sign-out.component.jsx
index 9e995d819..4dfc90ece 100644
--- a/client/src/components/sign-out/sign-out.component.jsx
+++ b/client/src/components/sign-out/sign-out.component.jsx
@@ -1,20 +1,8 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import firebase from "../../firebase/firebase.utils";
-
-export default function SignoutComponent() {
-  const signOut = async () => {
-    try {
-      await firebase.auth().signOut();
-      // this.setState({
-      //   redirect: true
-      // });
-    } catch (error) {
-      console.log(error);
-    }
-  };
 
+export default function SignoutComponent({ signOutStart }) {
   const { t } = useTranslation();
 
-  return <div onClick={signOut}>{t("user.actions.signout")}</div>;
+  return <div onClick={signOutStart}>{t("user.actions.signout")}</div>;
 }
diff --git a/client/src/graphql/local.queries.js b/client/src/graphql/local.queries.js
deleted file mode 100644
index 7611dfd32..000000000
--- a/client/src/graphql/local.queries.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { gql } from "apollo-boost";
-
-export const GET_CURRENT_USER = gql`
-  query GET_CURRENT_USER {
-    currentUser @client {
-      email
-      displayName
-      token
-      uid
-      photoUrl
-    }
-  }
-`;
-
-export const GET_CURRENT_SELECTED_NAV_ITEM = gql`
-  query GET_CURRENT_SELECTED_NAV_ITEM {
-    selectedNavItem @client
-  }
-`;
-
-export const GET_LANGUAGE = gql`
-  query GET_USER_LANGUAGE {
-    language @client
-  }
-`;
diff --git a/client/src/redux/user/user.actions.js b/client/src/redux/user/user.actions.js
index 334ad2d8a..90cd48c41 100644
--- a/client/src/redux/user/user.actions.js
+++ b/client/src/redux/user/user.actions.js
@@ -33,3 +33,8 @@ export const signOutFailure = error => ({
 export const unauthorizedUser = () => ({
   type: UserActionTypes.UNAUTHORIZED_USER
 });
+
+export const setUserLanguage = language => ({
+  type: UserActionTypes.SET_USER_LANGUAGE,
+  payload: language
+});
diff --git a/client/src/redux/user/user.reducer.js b/client/src/redux/user/user.reducer.js
index fa9535d9e..89a6eb41c 100644
--- a/client/src/redux/user/user.reducer.js
+++ b/client/src/redux/user/user.reducer.js
@@ -2,7 +2,8 @@ import UserActionTypes from "./user.types";
 
 const INITIAL_STATE = {
   currentUser: {
-    authorized: null
+    authorized: null,
+    language: "en_US"
   },
   error: null
 };
@@ -27,9 +28,15 @@ const userReducer = (state = INITIAL_STATE, action) => {
         error: null,
         currentUser: { authorized: false }
       };
+    case UserActionTypes.SET_USER_LANGUAGE:
+      return {
+        ...state,
+        language: action.payload
+      };
     case UserActionTypes.SIGN_IN_FAILURE:
     case UserActionTypes.SIGN_OUT_FAILURE:
     case UserActionTypes.EMAIL_SIGN_UP_FAILURE:
+      console.log("Reduced getting called.");
       return {
         ...state,
         error: action.payload
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index f67356042..9a7db1526 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -1,12 +1,6 @@
 import { all, call, put, takeLatest } from "redux-saga/effects";
 import { auth, getCurrentUser } from "../../firebase/firebase.utils";
-import {
-  signInFailure,
-  signInSuccess,
-  signOutFailure,
-  signOutSuccess,
-  unauthorizedUser
-} from "./user.actions";
+import { signInFailure, signInSuccess, signOutFailure, signOutSuccess, unauthorizedUser } from "./user.actions";
 import UserActionTypes from "./user.types";
 
 // export function* getSnapshotFromUserAuth(userAuth) {
@@ -23,7 +17,7 @@ export function* signInWithEmail({ payload: { email, password } }) {
     const { user } = yield auth.signInWithEmailAndPassword(email, password);
     yield put(
       signInSuccess({
-        id: user.uid,
+        uid: user.uid,
         email: user.email,
         displayName: user.displayName,
         authorized: true
@@ -45,9 +39,13 @@ export function* isUserAuthenticated() {
       yield put(unauthorizedUser());
       return;
     }
+    let token = yield user.getIdToken();
+    localStorage.setItem("token", token);
+    window.sessionStorage.setItem(`lastTokenRefreshTime`, new Date());
+
     yield put(
       signInSuccess({
-        id: user.uid,
+        uid: user.uid,
         email: user.email,
         displayName: user.displayName,
         authorized: true
@@ -66,6 +64,7 @@ export function* signOutStart() {
   try {
     yield auth.signOut();
     yield put(signOutSuccess());
+    localStorage.removeItem("token");
   } catch (error) {
     yield put(signOutFailure(error.message));
   }
@@ -75,12 +74,13 @@ export function* onSignOutStart() {
   yield takeLatest(UserActionTypes.SIGN_OUT_START, signOutStart);
 }
 
+
 export function* userSagas() {
   yield all([
     // call(onGoogleSignInStart),
     call(onEmailSignInStart),
     call(onCheckUserSession),
-    call(onSignOutStart)
+    call(onSignOutStart),
     // call(onEmailSignUpStart),
     // call(onEmailSignUpSuccess)
   ]);
diff --git a/client/src/redux/user/user.types.js b/client/src/redux/user/user.types.js
index 07a32eb3b..d4d2c2919 100644
--- a/client/src/redux/user/user.types.js
+++ b/client/src/redux/user/user.types.js
@@ -1,17 +1,17 @@
 const UserActionTypes = {
-    SET_CURRENT_USER: "SET_CURRENT_USER",
-    GOOGLE_SIGN_IN_START: "GOOGLE_SIGN_IN_START",
-    SIGN_IN_SUCCESS: "SIGN_IN_SUCCESS",
-    SIGN_IN_FAILURE: "SIGN_IN_FAILURE",
-    EMAIL_SIGN_IN_START: "EMAIL_SIGN_IN_START",
-    CHECK_USER_SESSION: "CHECK_USER_SESSION",
-    SIGN_OUT_START: "SIGN_OUT_START",
-    SIGN_OUT_SUCCESS: "SIGN_OUT_SUCCESS",
-    SIGN_OUT_FAILURE: "SIGN_OUT_FAILURE",
-    EMAIL_SIGN_UP_START: "EMAIL_SIGN_UP_START",
-    EMAIL_SIGN_UP_SUCCESS: "EMAIL_SIGN_UP_SUCCESS",
-    EMAIL_SIGN_UP_FAILURE: "EMAIL_SIGN_UP_FAILURE",
-    UNAUTHORIZED_USER: "UNAUTHORIZED_USER"
-  };
-  export default UserActionTypes;
-  
\ No newline at end of file
+  SET_CURRENT_USER: "SET_CURRENT_USER",
+  GOOGLE_SIGN_IN_START: "GOOGLE_SIGN_IN_START",
+  SIGN_IN_SUCCESS: "SIGN_IN_SUCCESS",
+  SIGN_IN_FAILURE: "SIGN_IN_FAILURE",
+  EMAIL_SIGN_IN_START: "EMAIL_SIGN_IN_START",
+  CHECK_USER_SESSION: "CHECK_USER_SESSION",
+  SIGN_OUT_START: "SIGN_OUT_START",
+  SIGN_OUT_SUCCESS: "SIGN_OUT_SUCCESS",
+  SIGN_OUT_FAILURE: "SIGN_OUT_FAILURE",
+  EMAIL_SIGN_UP_START: "EMAIL_SIGN_UP_START",
+  EMAIL_SIGN_UP_SUCCESS: "EMAIL_SIGN_UP_SUCCESS",
+  EMAIL_SIGN_UP_FAILURE: "EMAIL_SIGN_UP_FAILURE",
+  UNAUTHORIZED_USER: "UNAUTHORIZED_USER",
+  SET_USER_LANGUAGE: "SET_USER_LANGUAGE"
+};
+export default UserActionTypes;

From 55cec20914efe4b1ef7aab23ddc38ad9a29a5a72 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 31 Jan 2020 14:42:54 -0800
Subject: [PATCH 10/10] Created sider for Chat messages.

---
 .../chat-window/chat-window.component.jsx     |  6 +-
 .../chat-window/chat-window.container.jsx     | 21 +++--
 .../jobs-list/jobs-list.component.jsx         | 25 +++---
 client/src/pages/manage/manage.page.jsx       | 82 ++++++++++---------
 4 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/client/src/components/chat-window/chat-window.component.jsx b/client/src/components/chat-window/chat-window.component.jsx
index e4fd51848..0ec7f9120 100644
--- a/client/src/components/chat-window/chat-window.component.jsx
+++ b/client/src/components/chat-window/chat-window.component.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-
-export default function ChatWindowComponent() {
-  return <div>Chat Windows and more</div>;
+import { Drawer } from "antd";
+export default function ChatWindowComponent({ ...drawerProps }) {
+  return <Drawer {...drawerProps}>Chat Windows and more</Drawer>;
 }
diff --git a/client/src/components/chat-window/chat-window.container.jsx b/client/src/components/chat-window/chat-window.container.jsx
index 940e7b416..d3d237a15 100644
--- a/client/src/components/chat-window/chat-window.container.jsx
+++ b/client/src/components/chat-window/chat-window.container.jsx
@@ -6,7 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  //currentUser: selectCurrentUser
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -16,18 +16,17 @@ const mapDispatchToProps = dispatch => ({
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(function ChatWindowContainer({ currentUser }) {
+)(function ChatWindowContainer() {
   const [visible, setVisible] = useState(false);
   return (
-    <div style={{ position: "absolute", zIndex: 1000 }}>
-      {visible ? <ChatWindowComponent /> : null}
-      <Button
-        onClick={() => {
-          setVisible(!visible);
-        }}
-      >
-        Open!
-      </Button>
+    <div>
+      <Button onClick={() => setVisible(!visible)}>Drawer!</Button>
+      <ChatWindowComponent
+        mask={false}
+        maskClosable={false}
+        visible={visible}
+        zIndex={0}
+      />
     </div>
   );
 });
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 17635845d..76d0f7eac 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -28,7 +28,7 @@ export default withRouter(function JobsList({
       width: "8%",
       // onFilter: (value, record) => record.ro_number.includes(value),
       // filteredValue: state.filteredInfo.text || null,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
@@ -74,7 +74,7 @@ export default withRouter(function JobsList({
             <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
             <Icon
               style={{ margin: 4 }}
-              type='message'
+              type="message"
               onClick={() => {
                 alert("SMSing will happen here.");
               }}
@@ -91,7 +91,7 @@ export default withRouter(function JobsList({
       key: "status",
       width: "10%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
@@ -122,7 +122,7 @@ export default withRouter(function JobsList({
       key: "plate_no",
       width: "8%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.vehicle?.plate_no, b.vehicle?.plate_no),
       sortOrder:
         state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
       render: (text, record) => {
@@ -139,7 +139,7 @@ export default withRouter(function JobsList({
       key: "clm_no",
       width: "12%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
         state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
       render: (text, record) => {
@@ -155,11 +155,9 @@ export default withRouter(function JobsList({
       dataIndex: "clm_total",
       key: "clm_total",
       width: "8%",
-      // sorter: (a, b) => {
-      //   return a > b;
-      // },
-      // sortOrder:
-      //   state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
       render: (text, record) => {
         return record.clm_total ? (
           <span>{record.clm_total}</span>
@@ -196,7 +194,6 @@ export default withRouter(function JobsList({
     if (record) {
       if (record.id) {
         setSelectedJob(record.id);
-        history.push(`#${record.id}`);
         return;
       }
     }
@@ -210,7 +207,7 @@ export default withRouter(function JobsList({
         title={() => {
           return (
             <Input.Search
-              placeholder='Search...'
+              placeholder="Search..."
               onSearch={value => {
                 console.log(value);
               }}
@@ -218,10 +215,10 @@ export default withRouter(function JobsList({
             />
           );
         }}
-        size='small'
+        size="small"
         pagination={{ position: "top" }}
         columns={columns.map(item => ({ ...item }))}
-        rowKey='id'
+        rowKey="id"
         dataSource={jobs}
         rowSelection={{ selectedRowKeys: [selectedJob] }}
         onChange={handleTableChange}
diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx
index 07ebc470c..f30afcf45 100644
--- a/client/src/pages/manage/manage.page.jsx
+++ b/client/src/pages/manage/manage.page.jsx
@@ -10,7 +10,6 @@ import HeaderContainer from "../../components/header/header.container";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import "./manage.page.styles.scss";
 
-
 //const WhiteBoardPage = lazy(() => import("../white-board/white-board.page"));
 const ManageRootPage = lazy(() =>
   import("../manage-root/manage-root.page.container")
@@ -27,7 +26,7 @@ const JobsAvailablePage = lazy(() =>
   import("../jobs-available/jobs-available.page.container")
 );
 
-const { Header, Content, Footer } = Layout;
+const { Header, Content, Footer, Sider } = Layout;
 //This page will handle all routing for the entire application.
 export default function Manage({ match }) {
   const { t } = useTranslation();
@@ -37,49 +36,58 @@ export default function Manage({ match }) {
   }, [t]);
 
   return (
-    <Layout>
+    <Layout style={{ minHeight: "100vh" }}>
       <Header>
         <HeaderContainer />
       </Header>
+      <Layout>
+        <Sider
+          collapsible
+          defaultCollapsed
+          theme="light"
+          collapsedWidth={0}
+          width={300}
+        >
+          <chatWindowContainer />
+        </Sider>
 
-      <Content className="content-container">
-        <ErrorBoundary>
-          <Suspense
-            fallback={
-              <LoadingSpinner message={t("general.labels.loadingapp")} />
-            }
-          >
-            <Route exact path={`${match.path}`} component={ManageRootPage} />
+        <Content className="content-container" style={{ margin: "50px" }}>
+          <ErrorBoundary>
+            <Suspense
+              fallback={
+                <LoadingSpinner message={t("general.labels.loadingapp")} />
+              }
+            >
+              <Route exact path={`${match.path}`} component={ManageRootPage} />
 
-            <Route exact path={`${match.path}/jobs`} component={JobsPage} />
+              <Route exact path={`${match.path}/jobs`} component={JobsPage} />
 
-            <Route
-              exact
-              path={`${match.path}/jobs/:jobId`}
-              component={JobsDetailPage}
-            />
-            <Route
-              exact
-              path={`${match.path}/jobs/:jobId/documents`}
-              component={JobsDocumentsPage}
-            />
-            <Route
-              exact
-              path={`${match.path}/profile`}
-              component={ProfilePage}
-            />
-
-            <Route
-              exact
-              path={`${match.path}/available`}
-              component={JobsAvailablePage}
-            />
-          </Suspense>
-        </ErrorBoundary>
-      </Content>
+              <Route
+                exact
+                path={`${match.path}/jobs/:jobId`}
+                component={JobsDetailPage}
+              />
+              <Route
+                exact
+                path={`${match.path}/jobs/:jobId/documents`}
+                component={JobsDocumentsPage}
+              />
+              <Route
+                exact
+                path={`${match.path}/profile`}
+                component={ProfilePage}
+              />
 
+              <Route
+                exact
+                path={`${match.path}/available`}
+                component={JobsAvailablePage}
+              />
+            </Suspense>
+          </ErrorBoundary>
+        </Content>
+      </Layout>
       <Footer>
-        <ChatWindowContainer />
         <FooterComponent />
       </Footer>
       <BackTop />