From 450ce3dbc3bbbb1f3a600b78c46704e78ec4b5b6 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 19 Feb 2021 09:43:08 -0800
Subject: [PATCH] Added voiding of ROs IO-639

---
 bodyshop_translations.babel                   |  86 +++++-
 .../components/header/header.component.jsx    |   1 +
 .../jobs-detail-header-actions.component.jsx  |  40 ++-
 .../shop-info.rostatus.component.jsx          |  32 ++-
 client/src/graphql/jobs.queries.js            |   4 +-
 .../jobs-detail.page.container.jsx            |  16 +-
 client/src/translations/en_us/common.json     |  14 +-
 client/src/translations/es/common.json        |  12 +-
 client/src/translations/fr/common.json        |  12 +-
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |   6 +
 .../down.yaml                                 | 262 +++++++++++++++++
 .../up.yaml                                   | 263 +++++++++++++++++
 .../down.yaml                                 | 263 +++++++++++++++++
 .../up.yaml                                   | 264 ++++++++++++++++++
 .../down.yaml                                 | 262 +++++++++++++++++
 .../up.yaml                                   | 263 +++++++++++++++++
 hasura/migrations/metadata.yaml               |   3 +
 18 files changed, 1782 insertions(+), 26 deletions(-)
 create mode 100644 hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/down.yaml
 create mode 100644 hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/up.yaml
 create mode 100644 hasura/migrations/1613754454833_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1613754454833_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1613754473488_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1613754473488_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1613754485354_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1613754485354_update_permission_user_public_table_jobs/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index d4900752a..26337e9f7 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -14324,6 +14324,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>voiding</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>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -19792,6 +19813,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>voidjob</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>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -20133,6 +20175,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>voided</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>
                                 </children>
                             </folder_node>
                         </children>
@@ -21208,6 +21271,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>void</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>
                                 </children>
                             </folder_node>
                             <folder_node>
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 2640b2a0b..35927301e 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -75,6 +75,7 @@ function Header({
         className="header-main-menu"
         selectedKeys={[selectedHeader]}
         onClick={handleMenuClick}
+        subMenuCloseDelay={0.3}
       >
         <Menu.Item key="home">
           <Link to="/manage">
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index baa0d7dbe..3d5f3b028 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -267,7 +267,6 @@ export function JobsDetailHeaderActions({
         key="jobcosting"
         onClick={() => {
           logImEXEvent("job_header_job_costing");
-
           setJobCostingContext({
             actions: { refetch: refetch },
             context: {
@@ -309,6 +308,45 @@ export function JobsDetailHeaderActions({
           </Popconfirm>
         </Menu.Item>
       )}
+      {!jobRO && job.converted && (
+        <Menu.Item>
+          <Popconfirm
+            title={t("jobs.labels.voidjob")}
+            okText="Yes"
+            cancelText="No"
+            onClick={(e) => e.stopPropagation()}
+            onConfirm={async () => {
+              //delete the job.
+              const result = await updateJob({
+                variables: {
+                  jobId: job.id,
+                  job: {
+                    status: bodyshop.md_ro_statuses.default_void,
+                    voided: true,
+                  },
+                },
+              });
+
+              if (!!!result.errors) {
+                notification["success"]({
+                  message: t("jobs.successes.voided"),
+                });
+                //go back to jobs list.
+                history.push(`/manage/`);
+              } else {
+                notification["error"]({
+                  message: t("jobs.errors.voiding", {
+                    error: JSON.stringify(result.errors),
+                  }),
+                });
+              }
+            }}
+            getPopupContainer={(trigger) => trigger.parentNode}
+          >
+            {t("menus.jobsactions.void")}
+          </Popconfirm>
+        </Menu.Item>
+      )}
     </Menu>
   );
   return (
diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx
index b8691763e..35ec3b94a 100644
--- a/client/src/components/shop-info/shop-info.rostatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx
@@ -169,7 +169,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -185,7 +187,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -201,7 +205,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -217,7 +223,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -233,7 +241,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -249,7 +259,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -265,7 +277,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
@@ -281,7 +295,9 @@ export default function ShopInfoROStatusComponent({ form }) {
             >
               <Select>
                 {options.map((item, idx) => (
-                  <Select.Option key={idx}>{item}</Select.Option>
+                  <Select.Option key={idx} value={item}>
+                    {item}
+                  </Select.Option>
                 ))}
               </Select>
             </Form.Item>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index b7b61a101..4439fc27b 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -473,6 +473,7 @@ export const GET_JOB_BY_PK = gql`
       class
       category
       deliverchecklist
+      voided
       joblines(where: { jobid: { _eq: $id } }, order_by: { line_no: asc }) {
         id
         line_no
@@ -615,6 +616,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       updated_at
       clm_total
       ded_amt
+      voided
       cccontracts {
         id
         agreementnumber
@@ -657,7 +659,7 @@ export const QUERY_TECH_JOB_DETAILS = gql`
       date_invoiced
       date_open
       date_exported
-
+      voided
       date_scheduled
       date_estimated
       employee_body
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 7e9e0545f..df37d5665 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
@@ -2,6 +2,7 @@ import { useMutation, useQuery } from "@apollo/react-hooks";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
 import NotFound from "../../components/not-found/not-found.component";
@@ -13,9 +14,14 @@ import {
   setJobReadOnly,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { CreateRecentItem } from "../../utils/create-recent-item";
 import JobsDetailPage from "./jobs-detail.page.component";
 
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   addRecentItem: (item) => dispatch(addRecentItem(item)),
@@ -24,6 +30,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 function JobsDetailPageContainer({
+  bodyshop,
   match,
   setBreadcrumbs,
   addRecentItem,
@@ -64,7 +71,9 @@ function JobsDetailPageContainer({
 
     if (data && data.jobs_by_pk) {
       setJobReadOnly(
-        !!data.jobs_by_pk.date_exported || !!data.jobs_by_pk.date_invoiced
+        data.jobs_by_pk.date_exported ||
+          data.jobs_by_pk.date_invoiced ||
+          data.jobs_by_pk.voided
       );
 
       addRecentItem(
@@ -108,4 +117,7 @@ function JobsDetailPageContainer({
     <AlertComponent message={t("jobs.errors.noaccess")} type="error" />
   );
 }
-export default connect(null, mapDispatchToProps)(JobsDetailPageContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDetailPageContainer);
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 71eb8418f..6f0b53a26 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -909,9 +909,10 @@
 				"noowner": "No owner associated.",
 				"novehicle": "No vehicle associated.",
 				"saving": "Error encountered while saving record.",
-				"updating": "Error while updating job(s). {{error}}",
+				"updating": "Error while updating job(s).  {{error}}",
 				"validation": "Please ensure all fields are entered correctly.",
-				"validationtitle": "Validation Error"
+				"validationtitle": "Validation Error",
+				"voiding": "Error voiding job.  {{error}}"
 			},
 			"fields": {
 				"actual_completion": "Actual Completion",
@@ -1189,7 +1190,8 @@
 				"totals": "Totals",
 				"vehicle_info": "Vehicle",
 				"vehicleassociation": "Vehicle Association",
-				"viewallocations": "View Allocations"
+				"viewallocations": "View Allocations",
+				"voidjob": "Are you sure you want to void this job? This cannot be easily undone. "
 			},
 			"successes": {
 				"addedtoproduction": "Job added to production board.",
@@ -1207,7 +1209,8 @@
 				"save": "Job saved successfully.",
 				"savetitle": "Record saved successfully.",
 				"supplemented": "Job supplemented successfully. ",
-				"updated": "Job(s) updated successfully."
+				"updated": "Job(s) updated successfully.",
+				"voided": "Job voided successfully."
 			}
 		},
 		"menus": {
@@ -1267,7 +1270,8 @@
 				"deletejob": "Delete Job",
 				"duplicate": "Duplicate this Job",
 				"duplicatenolines": "Duplicate this Job without Repair Data",
-				"newcccontract": "Create Courtesy Car Contract"
+				"newcccontract": "Create Courtesy Car Contract",
+				"void": "Void Job"
 			},
 			"jobsdetail": {
 				"claimdetail": "Claim Details",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e937ea970..e56a68771 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -911,7 +911,8 @@
 				"saving": "Se encontró un error al guardar el registro.",
 				"updating": "",
 				"validation": "Asegúrese de que todos los campos se ingresen correctamente.",
-				"validationtitle": "Error de validacion"
+				"validationtitle": "Error de validacion",
+				"voiding": ""
 			},
 			"fields": {
 				"actual_completion": "Realización real",
@@ -1189,7 +1190,8 @@
 				"totals": "",
 				"vehicle_info": "Vehículo",
 				"vehicleassociation": "",
-				"viewallocations": ""
+				"viewallocations": "",
+				"voidjob": ""
 			},
 			"successes": {
 				"addedtoproduction": "",
@@ -1207,7 +1209,8 @@
 				"save": "Trabajo guardado con éxito.",
 				"savetitle": "Registro guardado con éxito.",
 				"supplemented": "Trabajo complementado con éxito.",
-				"updated": ""
+				"updated": "",
+				"voided": ""
 			}
 		},
 		"menus": {
@@ -1267,7 +1270,8 @@
 				"deletejob": "",
 				"duplicate": "",
 				"duplicatenolines": "",
-				"newcccontract": ""
+				"newcccontract": "",
+				"void": ""
 			},
 			"jobsdetail": {
 				"claimdetail": "Detalles de la reclamación",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 83d743192..9706e5cfc 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -911,7 +911,8 @@
 				"saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.",
 				"updating": "",
 				"validation": "Veuillez vous assurer que tous les champs sont correctement entrés.",
-				"validationtitle": "Erreur de validation"
+				"validationtitle": "Erreur de validation",
+				"voiding": ""
 			},
 			"fields": {
 				"actual_completion": "Achèvement réel",
@@ -1189,7 +1190,8 @@
 				"totals": "",
 				"vehicle_info": "Véhicule",
 				"vehicleassociation": "",
-				"viewallocations": ""
+				"viewallocations": "",
+				"voidjob": ""
 			},
 			"successes": {
 				"addedtoproduction": "",
@@ -1207,7 +1209,8 @@
 				"save": "Le travail a été enregistré avec succès.",
 				"savetitle": "Enregistrement enregistré avec succès.",
 				"supplemented": "Travail complété avec succès.",
-				"updated": ""
+				"updated": "",
+				"voided": ""
 			}
 		},
 		"menus": {
@@ -1267,7 +1270,8 @@
 				"deletejob": "",
 				"duplicate": "",
 				"duplicatenolines": "",
-				"newcccontract": ""
+				"newcccontract": "",
+				"void": ""
 			},
 			"jobsdetail": {
 				"claimdetail": "Détails de la réclamation",
diff --git a/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/down.yaml b/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/down.yaml
new file mode 100644
index 000000000..064eeee63
--- /dev/null
+++ b/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."jobs" DROP COLUMN "voided";
+  type: run_sql
diff --git a/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/up.yaml b/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/up.yaml
new file mode 100644
index 000000000..311db9a1a
--- /dev/null
+++ b/hasura/migrations/1613753847629_alter_table_public_jobs_add_column_voided/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."jobs" ADD COLUMN "voided" boolean NOT NULL DEFAULT
+      false;
+  type: run_sql
diff --git a/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..a1edd15a6
--- /dev/null
+++ b/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,262 @@
+- 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:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..0745cc906
--- /dev/null
+++ b/hasura/migrations/1613754454833_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,263 @@
+- 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:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      - voided
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1613754473488_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1613754473488_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..ba019ac4c
--- /dev/null
+++ b/hasura/migrations/1613754473488_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,263 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      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/1613754473488_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1613754473488_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..7f9701478
--- /dev/null
+++ b/hasura/migrations/1613754473488_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,264 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      - voided
+      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/1613754485354_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1613754485354_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..470a9347b
--- /dev/null
+++ b/hasura/migrations/1613754485354_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,262 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1613754485354_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1613754485354_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..48d3bf179
--- /dev/null
+++ b/hasura/migrations/1613754485354_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,263 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - 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
+      - alt_transport
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - ca_gst_registrant
+      - cat_no
+      - category
+      - cieca_stl
+      - cieca_ttl
+      - ciecaid
+      - class
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deliverchecklist
+      - depreciation_taxes
+      - employee_body
+      - employee_prep
+      - employee_refinish
+      - 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
+      - federal_tax_rate
+      - g_bett_amt
+      - id
+      - inproduction
+      - 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
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - 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
+      - intakechecklist
+      - invoice_allocation
+      - invoice_date
+      - job_totals
+      - kanbanparent
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - lbr_adjustments
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - 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
+      - parts_tax_rates
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - plate_no
+      - plate_st
+      - po_number
+      - policy_no
+      - production_vars
+      - queued_for_parts
+      - 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
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - status
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_registration_number
+      - tax_shop_mat_rt
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - v_color
+      - v_make_desc
+      - v_model_desc
+      - v_model_yr
+      - v_vin
+      - vehicleid
+      - voided
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 83dd2a869..abfbe1792 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -2456,6 +2456,7 @@ tables:
       - v_model_yr
       - v_vin
       - vehicleid
+      - voided
   select_permissions:
   - role: user
     permission:
@@ -2698,6 +2699,7 @@ tables:
       - v_model_yr
       - v_vin
       - vehicleid
+      - voided
       filter:
         bodyshop:
           associations:
@@ -2950,6 +2952,7 @@ tables:
       - v_model_yr
       - v_vin
       - vehicleid
+      - voided
       filter:
         bodyshop:
           associations: