From 678363d8fd6a2d616c6dea50eb176694001cbbd3 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Fri, 21 Apr 2023 14:37:46 +0200
Subject: [PATCH] Fix according to PR

---
 .../auth/__tests__/useRefreshToken.test.tsx   |  2 +-
 front/src/hooks/auth/useHasAccessToken.tsx    |  3 ---
 front/src/hooks/auth/useRedirectToSignIn.tsx  |  3 ---
 front/src/hooks/auth/useRefreshToken.tsx      | 10 ++++----
 front/src/pages/people/People.tsx             |  8 +++---
 .../people/__stories__/People.stories.tsx     |  2 +-
 .../default/tables/public_people.yaml         | 25 +++++++++++++++++++
 .../databases/default/tables/tables.yaml      |  2 +-
 .../down.sql                                  |  1 +
 .../up.sql                                    |  1 +
 10 files changed, 39 insertions(+), 18 deletions(-)
 delete mode 100644 front/src/hooks/auth/useHasAccessToken.tsx
 delete mode 100644 front/src/hooks/auth/useRedirectToSignIn.tsx
 create mode 100644 hasura/metadata/databases/default/tables/public_people.yaml
 create mode 100644 hasura/migrations/default/1682080463312_rename_table_public_persons/down.sql
 create mode 100644 hasura/migrations/default/1682080463312_rename_table_public_persons/up.sql

diff --git a/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx b/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx
index b89081773..87d26904b 100644
--- a/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx
+++ b/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx
@@ -37,7 +37,7 @@ jest.mock('@apollo/client', () => {
         },
       },
       isLoading: false,
-      error: {},
+      error: null,
     }),
   };
 });
diff --git a/front/src/hooks/auth/useHasAccessToken.tsx b/front/src/hooks/auth/useHasAccessToken.tsx
deleted file mode 100644
index 91ee21b71..000000000
--- a/front/src/hooks/auth/useHasAccessToken.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export const useHasAccessToken = () => {
-  return false;
-};
diff --git a/front/src/hooks/auth/useRedirectToSignIn.tsx b/front/src/hooks/auth/useRedirectToSignIn.tsx
deleted file mode 100644
index 5aa69d04a..000000000
--- a/front/src/hooks/auth/useRedirectToSignIn.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export const redirectToSignIn = () => {
-  return false;
-};
diff --git a/front/src/hooks/auth/useRefreshToken.tsx b/front/src/hooks/auth/useRefreshToken.tsx
index c4a0b3d60..4ab8d3102 100644
--- a/front/src/hooks/auth/useRefreshToken.tsx
+++ b/front/src/hooks/auth/useRefreshToken.tsx
@@ -15,18 +15,18 @@ export const GET_TOKEN = gql`
 
 export const useRefreshToken = () => {
   const refreshToken = localStorage.getItem('refreshToken');
-  const { data, loading } = useQuery(GET_TOKEN, {
+  const { data, loading, error } = useQuery(GET_TOKEN, {
     client: authClient,
     variables: { input: { refreshToken } },
   });
   useEffect(() => {
-    if (!loading) {
+    if (!loading && !error) {
       const accessToken = data.token.accessToken;
-      if (refreshToken && accessToken) {
+      if (accessToken) {
         localStorage.setItem('accessToken', accessToken || '');
       }
     }
-  }, [data, refreshToken, loading]);
+  }, [data, refreshToken, loading, error]);
 
-  return { loading };
+  return { loading, error };
 };
diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx
index 9de38894a..73b4c99b4 100644
--- a/front/src/pages/people/People.tsx
+++ b/front/src/pages/people/People.tsx
@@ -14,8 +14,8 @@ const StyledPeopleContainer = styled.div`
 `;
 
 export const GET_PEOPLE = gql`
-  query GetPeople($orderBy: [persons_order_by!]) {
-    persons(order_by: $orderBy) {
+  query GetPeople($orderBy: [people_order_by!]) {
+    people(order_by: $orderBy) {
       id
       phone
       email
@@ -57,7 +57,7 @@ function People() {
     setOrderBy(sorts.length ? reduceSortsToOrderBy(sorts) : defaultOrderBy);
   };
 
-  const { data } = useQuery<{ persons: GraphqlPerson[] }>(GET_PEOPLE, {
+  const { data } = useQuery<{ people: GraphqlPerson[] }>(GET_PEOPLE, {
     variables: { orderBy: orderBy },
   });
 
@@ -66,7 +66,7 @@ function People() {
       <StyledPeopleContainer>
         {
           <Table
-            data={data ? data.persons.map(mapPerson) : []}
+            data={data ? data.people.map(mapPerson) : []}
             columns={peopleColumns}
             viewName="All People"
             viewIcon={faList}
diff --git a/front/src/pages/people/__stories__/People.stories.tsx b/front/src/pages/people/__stories__/People.stories.tsx
index ec36c67e3..6ab7ed883 100644
--- a/front/src/pages/people/__stories__/People.stories.tsx
+++ b/front/src/pages/people/__stories__/People.stories.tsx
@@ -22,7 +22,7 @@ const mocks = [
     },
     result: {
       data: {
-        persons: defaultData,
+        people: defaultData,
       },
     },
   },
diff --git a/hasura/metadata/databases/default/tables/public_people.yaml b/hasura/metadata/databases/default/tables/public_people.yaml
new file mode 100644
index 000000000..d779dac14
--- /dev/null
+++ b/hasura/metadata/databases/default/tables/public_people.yaml
@@ -0,0 +1,25 @@
+table:
+  name: people
+  schema: public
+object_relationships:
+  - name: company
+    using:
+      foreign_key_constraint_on: company_id
+  - name: workspace
+    using:
+      foreign_key_constraint_on: workspace_id
+select_permissions:
+  - role: user
+    permission:
+      columns:
+        - company_id
+        - id
+        - workspace_id
+        - city
+        - email
+        - firstname
+        - lastname
+        - phone
+        - created_at
+        - updated_at
+      filter: {}
diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/hasura/metadata/databases/default/tables/tables.yaml
index d6c3f3e60..73e96ce71 100644
--- a/hasura/metadata/databases/default/tables/tables.yaml
+++ b/hasura/metadata/databases/default/tables/tables.yaml
@@ -7,5 +7,5 @@
 - "!include auth_user_security_keys.yaml"
 - "!include auth_users.yaml"
 - "!include public_companies.yaml"
-- "!include public_persons.yaml"
+- "!include public_people.yaml"
 - "!include public_workspaces.yaml"
diff --git a/hasura/migrations/default/1682080463312_rename_table_public_persons/down.sql b/hasura/migrations/default/1682080463312_rename_table_public_persons/down.sql
new file mode 100644
index 000000000..b2a04b026
--- /dev/null
+++ b/hasura/migrations/default/1682080463312_rename_table_public_persons/down.sql
@@ -0,0 +1 @@
+alter table "public"."people" rename to "persons";
diff --git a/hasura/migrations/default/1682080463312_rename_table_public_persons/up.sql b/hasura/migrations/default/1682080463312_rename_table_public_persons/up.sql
new file mode 100644
index 000000000..4e3addba1
--- /dev/null
+++ b/hasura/migrations/default/1682080463312_rename_table_public_persons/up.sql
@@ -0,0 +1 @@
+alter table "public"."persons" rename to "people";