From d1766c268dbef0ce310ede8e48defb9cbc0f08af Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 23 Dec 2020 15:25:14 -0800
Subject: [PATCH] Changed permissions for viewing users IO-421

---
 .../time-ticket-list.component.jsx            | 13 +++++----
 .../down.yaml                                 | 25 +++++++++++++++++
 .../up.yaml                                   | 28 +++++++++++++++++++
 hasura/migrations/metadata.yaml               |  7 +++--
 4 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 hasura/migrations/1608765772036_update_permission_user_public_table_users/down.yaml
 create mode 100644 hasura/migrations/1608765772036_update_permission_user_public_table_users/up.yaml

diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index 749d7d8b4..a2f65868a 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -1,13 +1,14 @@
 import { Table } from "antd";
-import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { onlyUnique } from "../../utils/arrayHelper";
-import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import { DateFormatter } from "../../utils/DateFormatter";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import moment from "moment";
+import { onlyUnique } from "../../utils/arrayHelper";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 export default function TimeTicketList({
   disabled,
@@ -129,7 +130,7 @@ export default function TimeTicketList({
       },
     },
 
-    ({
+    {
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
@@ -165,7 +166,7 @@ export default function TimeTicketList({
           )}
         </div>
       ),
-    }: null),
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
diff --git a/hasura/migrations/1608765772036_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1608765772036_update_permission_user_public_table_users/down.yaml
new file mode 100644
index 000000000..3822a6184
--- /dev/null
+++ b/hasura/migrations/1608765772036_update_permission_user_public_table_users/down.yaml
@@ -0,0 +1,25 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - authid
+      - created_at
+      - dashboardlayout
+      - email
+      - fcmtokens
+      - updated_at
+      computed_fields: []
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1608765772036_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1608765772036_update_permission_user_public_table_users/up.yaml
new file mode 100644
index 000000000..6fdc8d980
--- /dev/null
+++ b/hasura/migrations/1608765772036_update_permission_user_public_table_users/up.yaml
@@ -0,0 +1,28 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - authid
+      - created_at
+      - dashboardlayout
+      - email
+      - fcmtokens
+      - updated_at
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              active:
+                _eq: true
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 7b5fd15f1..474e5af9b 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -3874,8 +3874,11 @@ tables:
       - fcmtokens
       - updated_at
       filter:
-        authid:
-          _eq: X-Hasura-User-Id
+        associations:
+          bodyshop:
+            associations:
+              active:
+                _eq: true
   update_permissions:
   - role: user
     permission: