From ef96186dfbff4087d021e1f59ff930e3fdcaccbb Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 15 May 2020 09:16:58 -0700
Subject: [PATCH] Added all jobs page with pagination BOD-80

---
 bodyshop_translations.babel                   |  65 ++++-
 .../components/header/header.component.jsx    |   3 +
 .../jobs-list-paginated.component.jsx         | 220 +++++++++++++++
 client/src/graphql/jobs.queries.js            |  60 ++++-
 .../src/pages/jobs-all/jobs-all.container.jsx |  95 +++++++
 .../pages/manage/manage.page.component.jsx    |   7 +
 client/src/translations/en_us/common.json     |   3 +
 client/src/translations/es/common.json        |   3 +
 client/src/translations/fr/common.json        |   3 +
 .../down.yaml                                 | 254 ++++++++++++++++++
 .../up.yaml                                   | 254 ++++++++++++++++++
 hasura/migrations/metadata.yaml               |   1 +
 12 files changed, 966 insertions(+), 2 deletions(-)
 create mode 100644 client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
 create mode 100644 client/src/pages/jobs-all/jobs-all.container.jsx
 create mode 100644 hasura/migrations/1589499599269_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1589499599269_update_permission_user_public_table_jobs/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bf1239ac9..22b12f42a 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.6.1">
+<babeledit_project be_version="2.6.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -10402,6 +10402,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>alljobs</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>availablejobs</name>
                                         <definition_loaded>false</definition_loaded>
@@ -13620,6 +13641,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobs-all</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>jobs-detail</name>
                                         <definition_loaded>false</definition_loaded>
@@ -14042,6 +14084,27 @@
                                     </translation>
                                 </translations>
                             </concept_node>
+                            <concept_node>
+                                <name>jobs-all</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>jobs-create</name>
                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 4d204a245..68a7dca9e 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -134,6 +134,9 @@ function Header({
               <Menu.Item key='activejobs'>
                 <Link to='/manage/jobs'>{t("menus.header.activejobs")}</Link>
               </Menu.Item>
+              <Menu.Item key='alljobs'>
+                <Link to='/manage/jobs/all'>{t("menus.header.alljobs")}</Link>
+              </Menu.Item>
               <Menu.Item key='availablejobs'>
                 <Link to='/manage/available'>
                   {t("menus.header.availablejobs")}
diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
new file mode 100644
index 000000000..ca487df19
--- /dev/null
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -0,0 +1,220 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Input, Table } from "antd";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Link, useLocation } from "react-router-dom";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import PhoneFormatter from "../../utils/PhoneFormatter";
+import { alphaSort } from "../../utils/sorters";
+import StartChatButton from "../chat-open-button/chat-open-button.component";
+import { useHistory } from "react-router-dom";
+export default function JobsList({
+  searchTextState,
+
+  refetch,
+  loading,
+  jobs,
+  total,
+}) {
+  const search = queryString.parse(useLocation().search);
+  const { page, sortcolumn, sortorder } = search;
+  const history = useHistory();
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const { t } = useTranslation();
+  const setSearchText = searchTextState[1];
+
+  const columns = [
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      width: "8%",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder: sortcolumn === "ro_number" && sortorder,
+
+      render: (text, record) => (
+        <Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
+      ),
+    },
+    {
+      title: t("jobs.fields.est_number"),
+      dataIndex: "est_number",
+      key: "est_number",
+      width: "8%",
+      sorter: (a, b) => a.est_number - b.est_number,
+      sortOrder: sortcolumn === "est_number" && sortorder,
+
+      render: (text, record) => (
+        <Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
+      ),
+    },
+    {
+      title: t("jobs.fields.owner"),
+      dataIndex: "ownr_ln",
+      key: "ownr_ln",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      width: "25%",
+      sortOrder: sortcolumn === "owner" && sortorder,
+      render: (text, record) => {
+        return record.owner ? (
+          <Link to={"/manage/owners/" + record.owner.id}>
+            {`${record.ownr_fn} ${record.ownr_ln}`}
+          </Link>
+        ) : (
+          <span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.ownr_ph1"),
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.ownr_ph1 ? (
+          <span>
+            <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+            <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
+          </span>
+        ) : null;
+      },
+    },
+    {
+      title: t("jobs.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      width: "10%",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      sortOrder: sortcolumn === "status" && sortorder,
+      render: (text, record) => {
+        return record.status || t("general.labels.na");
+      },
+    },
+
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      width: "15%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link to={"/manage/vehicles/" + record.vehicleid}>
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
+          </Link>
+        ) : (
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}</span>
+        );
+      },
+    },
+    {
+      title: t("vehicles.fields.plate_no"),
+      dataIndex: "plate_no",
+      key: "plate_no",
+      width: "8%",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+      sortOrder: sortcolumn === "plate_no" && sortorder,
+      render: (text, record) => {
+        return record.plate_no ? record.plate_no : "";
+      },
+    },
+    {
+      title: t("jobs.fields.clm_no"),
+      dataIndex: "clm_no",
+      key: "clm_no",
+      width: "12%",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder: sortcolumn === "clm_no" && sortorder,
+      render: (text, record) => {
+        return record.clm_no ? (
+          <span>{record.clm_no}</span>
+        ) : (
+          t("general.labels.unknown")
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.clm_total"),
+      dataIndex: "clm_total",
+      key: "clm_total",
+      width: "10%",
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder: sortcolumn === "clm_total" && sortorder,
+      render: (text, record) => {
+        return record.clm_total ? (
+          <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.owner_owing"),
+      dataIndex: "owner_owing",
+      key: "owner_owing",
+      width: "8%",
+      render: (text, record) => (
+        <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
+      ),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    console.log("handleTableChange -> sorter", sorter);
+    search.page = pagination.current;
+    search.sortcolumn = sorter.columnKey;
+    search.sortorder = sorter.order;
+    history.push({ search: queryString.stringify(search) });
+  };
+
+  return (
+    <div>
+      THE RIGHT COMPONENT
+      <Table
+        loading={loading}
+        title={() => {
+          return (
+            <div style={{ display: "flex" }}>
+              <Button onClick={() => refetch()}>
+                <SyncOutlined />
+              </Button>
+              <Input.Search
+                placeholder={t("general.labels.search")}
+                onChange={(e) => {
+                  setSearchText(e.target.value);
+                }}
+                enterButton
+              />
+            </div>
+          );
+        }}
+        size='small'
+        pagination={{
+          position: "top",
+          pageSize: 25,
+          current: parseInt(page || 1),
+          total: total,
+        }}
+        columns={columns}
+        rowKey='id'
+        dataSource={jobs}
+        onChange={handleTableChange}
+      />
+    </div>
+  );
+}
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index a93b40cfe..d516c2025 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -442,7 +442,6 @@ export const SEARCH_FOR_JOBS = gql`
     }
   }
 `;
-
 //TODO Ensure this is always up to date.
 export const QUERY_ALL_JOB_FIELDS = gql`
   query QUERY_ALL_JOB_FIELDS($id: uuid!) {
@@ -692,3 +691,62 @@ export const QUERY_ALL_JOB_FIELDS = gql`
     }
   }
 `;
+
+export const QUERY_ALL_JOBS_PAGINATED = gql`
+  query QUERY_ALL_JOBS_PAGINATED(
+    $offset: Int
+    $limit: Int
+    $order: [jobs_order_by!]!
+  ) {
+    jobs(offset: $offset, limit: $limit, order_by: $order) {
+      ownr_fn
+      ownr_ln
+      ownr_ph1
+      ownr_ea
+      owner {
+        id
+        allow_text_message
+        preferred_contact
+      }
+      plate_no
+      plate_st
+      v_vin
+      v_model_yr
+      v_model_desc
+      v_make_desc
+      v_color
+      vehicleid
+      actual_completion
+      actual_delivery
+      actual_in
+      est_number
+      id
+      ins_co_nm
+      ins_ct_fn
+      ins_ct_ln
+      ins_ph1
+      ins_ea
+      est_co_nm
+      est_ph1
+      est_ea
+      est_ct_fn
+      est_ct_ln
+      clm_no
+      clm_total
+      owner_owing
+      ro_number
+      scheduled_completion
+      scheduled_in
+      scheduled_delivery
+      status
+      updated_at
+      ded_amt
+      vehicleid
+    }
+    jobs_aggregate {
+      aggregate {
+        count(distinct: true)
+      }
+    }
+  }
+`;
diff --git a/client/src/pages/jobs-all/jobs-all.container.jsx b/client/src/pages/jobs-all/jobs-all.container.jsx
new file mode 100644
index 000000000..fece00f3b
--- /dev/null
+++ b/client/src/pages/jobs-all/jobs-all.container.jsx
@@ -0,0 +1,95 @@
+import { useQuery } from "@apollo/react-hooks";
+import queryString from "query-string";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import AlertComponent from "../../components/alert/alert.component";
+import JobsListPaginated from "../../components/jobs-list-paginated/jobs-list-paginated.component";
+import { QUERY_ALL_JOBS_PAGINATED } from "../../graphql/jobs.queries";
+import { setBreadcrumbs } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+});
+
+export function AllJobs({ bodyshop, setBreadcrumbs }) {
+  const search = queryString.parse(useLocation().search);
+  const { page, sortcolumn, sortorder } = search;
+
+  const { loading, error, data, refetch } = useQuery(QUERY_ALL_JOBS_PAGINATED, {
+    variables: {
+      offset: page ? (page - 1) * 25 : 0,
+      limit: 25,
+      order: [
+        {
+          [sortcolumn || "est_number"]: sortorder
+            ? sortorder === "descend"
+              ? "desc"
+              : "asc"
+            : "desc",
+        },
+      ],
+    },
+  });
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    document.title = t("titles.jobs-all");
+    setBreadcrumbs([{ link: "/manage/jobs", label: t("titles.bc.jobs-all") }]);
+  }, [t, setBreadcrumbs]);
+
+  const searchTextState = useState("");
+  const searchText = searchTextState[0];
+  if (error) return <AlertComponent message={error.message} type='error' />;
+  return (
+    <div>
+      <JobsListPaginated
+        searchTextState={searchTextState}
+        refetch={refetch}
+        loading={loading}
+        searchParams={search}
+        total={data ? data.jobs_aggregate.aggregate.count : 0}
+        jobs={
+          data
+            ? searchText === ""
+              ? data.jobs
+              : data.jobs.filter(
+                  (j) =>
+                    (j.ro_number || "")
+                      .toString()
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.ownr_fn || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.ownr_ln || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.clm_no || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.plate_no || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.v_model_desc || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase()) ||
+                    (j.v_make_desc || "")
+                      .toLowerCase()
+                      .includes(searchText.toLowerCase())
+                )
+            : null
+        }
+      />
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(AllJobs);
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 05134c254..25e7e7bfb 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -86,6 +86,8 @@ const ShopTemplates = lazy(() =>
 const JobIntake = lazy(() =>
   import("../jobs-intake/jobs-intake.page.container")
 );
+const AllJobs = lazy(() => import("../jobs-all/jobs-all.container"));
+
 const { Header, Content, Footer } = Layout;
 
 export default function Manage({ match }) {
@@ -123,6 +125,11 @@ export default function Manage({ match }) {
                   exact
                   path={`${match.path}/jobs/:jobId/intake`}
                   component={JobIntake}
+                />{" "}
+                <Route
+                  exact
+                  path={`${match.path}/jobs/all`}
+                  component={AllJobs}
                 />
                 <Route
                   exact
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 4863484cc..f76aab867 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -653,6 +653,7 @@
 			"header": {
 				"accounting": "Accounting",
 				"activejobs": "Active Jobs",
+				"alljobs": "All Jobs",
 				"availablejobs": "Available Jobs",
 				"courtesycars": "Courtesy Cars",
 				"courtesycars-all": "All Courtesy Cars",
@@ -882,6 +883,7 @@
 				"invoices-list": "Invoices",
 				"jobs": "Jobs",
 				"jobs-active": "Active Jobs",
+				"jobs-all": "All Jobs",
 				"jobs-detail": "Job {{number}}",
 				"jobs-intake": "Intake",
 				"jobs-new": "Create a New Job",
@@ -903,6 +905,7 @@
 			"courtesycars-detail": "Courtesy Car {{id}} | $t(titles.app)",
 			"invoices-list": "Invoices | $t(titles.app)",
 			"jobs": "Active Jobs | $t(titles.app)",
+			"jobs-all": "All Jobs | $t(titles.app)",
 			"jobs-create": "Create a New Job | $t(titles.app)",
 			"jobs-intake": "Intake | $t(titles.app)",
 			"jobsavailable": "Available Jobs | $t(titles.app)",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index d89659873..acee08871 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -653,6 +653,7 @@
 			"header": {
 				"accounting": "",
 				"activejobs": "Empleos activos",
+				"alljobs": "",
 				"availablejobs": "Trabajos disponibles",
 				"courtesycars": "",
 				"courtesycars-all": "",
@@ -882,6 +883,7 @@
 				"invoices-list": "",
 				"jobs": "",
 				"jobs-active": "",
+				"jobs-all": "",
 				"jobs-detail": "",
 				"jobs-intake": "",
 				"jobs-new": "",
@@ -903,6 +905,7 @@
 			"courtesycars-detail": "",
 			"invoices-list": "",
 			"jobs": "Todos los trabajos | $t(titles.app)",
+			"jobs-all": "",
 			"jobs-create": "",
 			"jobs-intake": "",
 			"jobsavailable": "Empleos disponibles | $t(titles.app)",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 23c566deb..59032fab4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -653,6 +653,7 @@
 			"header": {
 				"accounting": "",
 				"activejobs": "Emplois actifs",
+				"alljobs": "",
 				"availablejobs": "Emplois disponibles",
 				"courtesycars": "",
 				"courtesycars-all": "",
@@ -882,6 +883,7 @@
 				"invoices-list": "",
 				"jobs": "",
 				"jobs-active": "",
+				"jobs-all": "",
 				"jobs-detail": "",
 				"jobs-intake": "",
 				"jobs-new": "",
@@ -903,6 +905,7 @@
 			"courtesycars-detail": "",
 			"invoices-list": "",
 			"jobs": "Tous les emplois | $t(titles.app)",
+			"jobs-all": "",
 			"jobs-create": "",
 			"jobs-intake": "",
 			"jobsavailable": "Emplois disponibles | $t(titles.app)",
diff --git a/hasura/migrations/1589499599269_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1589499599269_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..5d889adc3
--- /dev/null
+++ b/hasura/migrations/1589499599269_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,254 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      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
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - cieca_stl
+      - cieca_ttl
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - 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_date
+      - job_totals
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - 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
+      - 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
+      - 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
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - 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/1589499599269_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1589499599269_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..aa79c3907
--- /dev/null
+++ b/hasura/migrations/1589499599269_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,254 @@
+- 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
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - cieca_stl
+      - cieca_ttl
+      - 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_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - 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_date
+      - job_totals
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - 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
+      - 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
+      - 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
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - 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/metadata.yaml b/hasura/migrations/metadata.yaml
index 78aaed1b5..7e3df4606 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -2157,6 +2157,7 @@ tables:
                   _eq: X-Hasura-User-Id
             - active:
                 _eq: true
+      allow_aggregations: true
   update_permissions:
   - role: user
     permission: