From 9ff9baa78ccdbd213ebb3ad0e298cb28383bd3ca Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 2 Jun 2021 08:49:10 -0700
Subject: [PATCH] IO-1096 Added order by to Parts Order

---
 bodyshop_translations.babel                   | 21 +++++++++
 .../chat-conversation-title.component.jsx     | 27 +++++------
 .../chat-tag-ro/chat-tag-ro.component.jsx     | 46 +++++++++----------
 .../job-documents.utility.js                  |  2 +-
 .../jobs-documents-gallery.component.jsx      |  1 -
 .../parts-order-list-table.component.jsx      |  6 +++
 .../parts-order-modal.component.jsx           |  1 +
 .../parts-order-modal.container.jsx           |  1 +
 client/src/graphql/bills.queries.js           |  2 +-
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 .../down.yaml                                 |  5 ++
 .../up.yaml                                   |  6 +++
 .../down.yaml                                 |  5 ++
 .../up.yaml                                   |  5 ++
 .../down.yaml                                 |  5 ++
 .../up.yaml                                   | 10 ++++
 .../down.yaml                                 | 37 +++++++++++++++
 .../up.yaml                                   | 38 +++++++++++++++
 .../down.yaml                                 | 38 +++++++++++++++
 .../up.yaml                                   | 39 ++++++++++++++++
 .../down.yaml                                 | 36 +++++++++++++++
 .../up.yaml                                   | 37 +++++++++++++++
 .../down.yaml                                 | 30 ++++++++++++
 .../up.yaml                                   | 31 +++++++++++++
 .../down.yaml                                 | 29 ++++++++++++
 .../up.yaml                                   | 30 ++++++++++++
 hasura/migrations/metadata.yaml               | 17 ++++---
 29 files changed, 461 insertions(+), 47 deletions(-)
 create mode 100644 hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/down.yaml
 create mode 100644 hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/up.yaml
 create mode 100644 hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/down.yaml
 create mode 100644 hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/up.yaml
 create mode 100644 hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/down.yaml
 create mode 100644 hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/up.yaml
 create mode 100644 hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/down.yaml
 create mode 100644 hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/up.yaml
 create mode 100644 hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/down.yaml
 create mode 100644 hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/up.yaml
 create mode 100644 hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/down.yaml
 create mode 100644 hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/up.yaml
 create mode 100644 hasura/migrations/1622648112396_update_permission_user_public_table_conversations/down.yaml
 create mode 100644 hasura/migrations/1622648112396_update_permission_user_public_table_conversations/up.yaml
 create mode 100644 hasura/migrations/1622648118751_update_permission_user_public_table_conversations/down.yaml
 create mode 100644 hasura/migrations/1622648118751_update_permission_user_public_table_conversations/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 8d960bdfe..afae10463 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -26853,6 +26853,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>orderedby</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>quantity</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
index 61cc3147c..7fa5bf585 100644
--- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
+++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
@@ -1,3 +1,4 @@
+import { Space } from "antd";
 import React from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
@@ -5,20 +6,16 @@ import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 
 export default function ChatConversationTitle({ conversation }) {
   return (
-    <div>
-      <div className="imex-flex-row">
-        <ChatConversationTitleTags
-          jobConversations={
-            (conversation && conversation.job_conversations) || []
-          }
-        />
-        <ChatTagRoContainer conversation={conversation || []} />
-      </div>
-      <div className="imex-flex-row">
-        <PhoneNumberFormatter>
-          {conversation && conversation.phone_num}
-        </PhoneNumberFormatter>
-      </div>
-    </div>
+    <Space flex>
+      <PhoneNumberFormatter>
+        {conversation && conversation.phone_num}
+      </PhoneNumberFormatter>
+      <ChatConversationTitleTags
+        jobConversations={
+          (conversation && conversation.job_conversations) || []
+        }
+      />
+      <ChatTagRoContainer conversation={conversation || []} />
+    </Space>
   );
 }
diff --git a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
index 106e91393..fef423b69 100644
--- a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
@@ -1,5 +1,5 @@
 import { CloseCircleOutlined, LoadingOutlined } from "@ant-design/icons";
-import { Select, Empty } from "antd";
+import { Select, Empty, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 
@@ -13,27 +13,27 @@ export default function ChatTagRoComponent({
   const { t } = useTranslation();
 
   return (
-    <div>
-      <Select
-        showSearch
-        autoFocus
-        style={{
-          width: 300,
-        }}
-        placeholder={t("general.labels.search")}
-        filterOption={false}
-        onSearch={handleSearch}
-        onSelect={handleInsertTag}
-        notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
-      >
-        {roOptions.map((item, idx) => (
-          <Select.Option key={item.id || idx}>
-            {` ${item.ro_number || ""} | ${item.ownr_fn || ""} ${
-              item.ownr_ln || ""
-            } ${item.ownr_co_nm || ""}`}
-          </Select.Option>
-        ))}
-      </Select>
+    <Space flex>
+      <div style={{ width: "15rem" }}>
+        <Select
+          showSearch
+          autoFocus
+          dropdownMatchSelectWidth
+          placeholder={t("general.labels.search")}
+          filterOption={false}
+          onSearch={handleSearch}
+          onSelect={handleInsertTag}
+          notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
+        >
+          {roOptions.map((item, idx) => (
+            <Select.Option key={item.id || idx}>
+              {` ${item.ro_number || ""} | ${item.ownr_fn || ""} ${
+                item.ownr_ln || ""
+              } ${item.ownr_co_nm || ""}`}
+            </Select.Option>
+          ))}
+        </Select>
+      </div>
       {loading ? <LoadingOutlined /> : null}
 
       {loading ? (
@@ -41,6 +41,6 @@ export default function ChatTagRoComponent({
       ) : (
         <CloseCircleOutlined onClick={() => setVisible(false)} />
       )}
-    </div>
+    </Space>
   );
 }
diff --git a/client/src/components/jobs-documents-gallery/job-documents.utility.js b/client/src/components/jobs-documents-gallery/job-documents.utility.js
index 054c51063..49ac4fbef 100644
--- a/client/src/components/jobs-documents-gallery/job-documents.utility.js
+++ b/client/src/components/jobs-documents-gallery/job-documents.utility.js
@@ -2,7 +2,7 @@ import { DetermineFileType } from "../documents-upload/documents-upload.utility"
 
 export const GenerateSrcUrl = (value) => {
   let extension = value.extension;
-  if (extension && extension.includes("heic")) extension = "jpg";
+  if (extension && extension.toLowerCase().includes("heic")) extension = "jpg";
 
   return `${process.env.REACT_APP_CLOUDINARY_ENDPOINT}/${DetermineFileType(
     value.type
diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
index 4a543401c..2b29a7b3c 100644
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
@@ -166,7 +166,6 @@ function JobsDocumentsComponent({
                     zIndex: "5",
                   }}
                   onClick={() => {
-                    console.log(`Clicked`);
                     const newWindow = window.open(
                       `${window.location.protocol}//${window.location.host}/edit?documentId=${galleryImages.images[index].id}`,
                       "_blank",
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index 9ae6695e5..436229c0c 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -237,6 +237,11 @@ export function PartsOrderListTableComponent({
         <DateFormatter>{record.deliver_by}</DateFormatter>
       ),
     },
+    {
+      title: t("parts_orders.fields.orderedby"),
+      dataIndex: "orderedby",
+      key: "orderedby",
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -336,6 +341,7 @@ export function PartsOrderListTableComponent({
           />
         ),
       },
+
       {
         title: t("general.labels.actions"),
         dataIndex: "actions",
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 81c289d95..03f6d4edd 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -73,6 +73,7 @@ export default function PartsOrderModalComponent({
                 <Form.Item required={false} key={field.key}>
                   <LayoutFormRow grow noDivider>
                     <Form.Item
+                      span={8}
                       label={t("parts_orders.fields.line_desc")}
                       key={`${index}line_desc`}
                       name={[field.name, "line_desc"]}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index 107bc99f8..a565acc73 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -81,6 +81,7 @@ export function PartsOrderModalContainer({
         po: [
           {
             ...values,
+            orderedby: currentUser.email,
             jobid: jobId,
             user_email: currentUser.email,
             return: isReturn,
diff --git a/client/src/graphql/bills.queries.js b/client/src/graphql/bills.queries.js
index 69648c933..aa6948d6a 100644
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -73,7 +73,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
       order_date
       deliver_by
       return
-
+      orderedby
       parts_order_lines {
         id
         act_price
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c2f783fb3..999241966 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1602,6 +1602,7 @@
 				"oem_partno": "Part #",
 				"order_date": "Order Date",
 				"order_number": "Order Number",
+				"orderedby": "Ordered By",
 				"quantity": "Qty.",
 				"return": "Return",
 				"status": "Status"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 19b3c3226..5ca2a0a64 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1602,6 +1602,7 @@
 				"oem_partno": "",
 				"order_date": "",
 				"order_number": "",
+				"orderedby": "",
 				"quantity": "",
 				"return": "",
 				"status": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 885581ca3..bfa444b8a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1602,6 +1602,7 @@
 				"oem_partno": "",
 				"order_date": "",
 				"order_number": "",
+				"orderedby": "",
 				"quantity": "",
 				"return": "",
 				"status": ""
diff --git a/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/down.yaml b/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/down.yaml
new file mode 100644
index 000000000..e3564fbac
--- /dev/null
+++ b/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."conversations" DROP COLUMN "archived";
+  type: run_sql
diff --git a/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/up.yaml b/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/up.yaml
new file mode 100644
index 000000000..728c78a86
--- /dev/null
+++ b/hasura/migrations/1622647828371_alter_table_public_conversations_add_column_archived/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."conversations" ADD COLUMN "archived" boolean NOT NULL
+      DEFAULT false;
+  type: run_sql
diff --git a/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/down.yaml b/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/down.yaml
new file mode 100644
index 000000000..3ce027bbb
--- /dev/null
+++ b/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" DROP COLUMN "orderedby";
+  type: run_sql
diff --git a/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/up.yaml b/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/up.yaml
new file mode 100644
index 000000000..da4d4e462
--- /dev/null
+++ b/hasura/migrations/1622648039058_alter_table_public_parts_orders_add_column_orderedby/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_orders" ADD COLUMN "orderedby" text NULL;
+  type: run_sql
diff --git a/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/down.yaml b/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/down.yaml
new file mode 100644
index 000000000..4b1ccfb84
--- /dev/null
+++ b/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."parts_orders" drop constraint "parts_orders_orderedby_fkey";
+  type: run_sql
diff --git a/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/up.yaml b/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/up.yaml
new file mode 100644
index 000000000..34c9c53f3
--- /dev/null
+++ b/hasura/migrations/1622648063952_set_fk_public_parts_orders_orderedby/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."parts_orders"
+                 add constraint "parts_orders_orderedby_fkey"
+                 foreign key ("orderedby")
+                 references "public"."users"
+                 ("email") on update set null on delete set null;
+  type: run_sql
diff --git a/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..23d6f2c78
--- /dev/null
+++ b/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..f65ebc8d9
--- /dev/null
+++ b/hasura/migrations/1622648072730_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - orderedby
+      - return
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..2df440493
--- /dev/null
+++ b/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - return
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..4fc57b4f7
--- /dev/null
+++ b/hasura/migrations/1622648079209_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - orderedby
+      - return
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/down.yaml b/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/down.yaml
new file mode 100644
index 000000000..3a374a190
--- /dev/null
+++ b/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/down.yaml
@@ -0,0 +1,36 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/up.yaml b/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/up.yaml
new file mode 100644
index 000000000..7fb9b294f
--- /dev/null
+++ b/hasura/migrations/1622648087365_update_permission_user_public_table_parts_orders/up.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - created_at
+      - deliver_by
+      - id
+      - jobid
+      - order_date
+      - order_number
+      - orderedby
+      - returnfrombill
+      - status
+      - updated_at
+      - user_email
+      - vendorid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_orders
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/down.yaml b/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/down.yaml
new file mode 100644
index 000000000..9c9dd4ce0
--- /dev/null
+++ b/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/down.yaml
@@ -0,0 +1,30 @@
+- args:
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - phone_num
+      - created_at
+      - updated_at
+      - bodyshopid
+      - id
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/up.yaml b/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/up.yaml
new file mode 100644
index 000000000..6b394a2fd
--- /dev/null
+++ b/hasura/migrations/1622648112396_update_permission_user_public_table_conversations/up.yaml
@@ -0,0 +1,31 @@
+- args:
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - archived
+      - bodyshopid
+      - created_at
+      - id
+      - phone_num
+      - updated_at
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/down.yaml b/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/down.yaml
new file mode 100644
index 000000000..143c20b05
--- /dev/null
+++ b/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/down.yaml
@@ -0,0 +1,29 @@
+- args:
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - phone_num
+      - created_at
+      - updated_at
+      - bodyshopid
+      - id
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/up.yaml b/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/up.yaml
new file mode 100644
index 000000000..0c3147203
--- /dev/null
+++ b/hasura/migrations/1622648118751_update_permission_user_public_table_conversations/up.yaml
@@ -0,0 +1,30 @@
+- args:
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - archived
+      - bodyshopid
+      - created_at
+      - id
+      - phone_num
+      - updated_at
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: conversations
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 02291ea5a..2dcbc2190 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -1114,11 +1114,12 @@ tables:
   - role: user
     permission:
       columns:
-      - phone_num
-      - created_at
-      - updated_at
+      - archived
       - bodyshopid
+      - created_at
       - id
+      - phone_num
+      - updated_at
       filter:
         bodyshop:
           associations:
@@ -1133,11 +1134,12 @@ tables:
   - role: user
     permission:
       columns:
-      - phone_num
-      - created_at
-      - updated_at
+      - archived
       - bodyshopid
+      - created_at
       - id
+      - phone_num
+      - updated_at
       filter:
         bodyshop:
           associations:
@@ -3622,6 +3624,7 @@ tables:
       - jobid
       - order_date
       - order_number
+      - orderedby
       - return
       - returnfrombill
       - status
@@ -3638,6 +3641,7 @@ tables:
       - jobid
       - order_date
       - order_number
+      - orderedby
       - return
       - returnfrombill
       - status
@@ -3664,6 +3668,7 @@ tables:
       - jobid
       - order_date
       - order_number
+      - orderedby
       - returnfrombill
       - status
       - updated_at