Chore: Duplicate certain user fields to workspaceMember (#1514)

* Move certain user fields to workspaceMember Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Merge main Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Update the generated GraphQL Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Update hooks Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Refactor according to review Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> * Rework typing * Fix tests * Remove console logs --------- Co-authored-by: v1b3m <vibenjamin6@gmail.com> Co-authored-by: chiazokam <chiazokamecheta@gmail.com> Co-authored-by: Charles Bochet <charles@twenty.com>
2023-09-16 01:32:58 +01:00
parent 0a7a0ac6cb
commit 549335054a
23 changed files with 890 additions and 115 deletions
--- a/front/src/modules/users/components/UserProvider.tsx
+++ b/front/src/modules/users/components/UserProvider.tsx
@ -14,8 +14,14 @@ export function UserProvider({ children }: React.PropsWithChildren) {
    if (!loading) {
      setIsLoading(false);
    }
-    if (data?.currentUser) {
-      setCurrentUser(data?.currentUser);
+    if (data?.currentUser?.workspaceMember?.settings) {
+      setCurrentUser({
+        ...data.currentUser,
+        workspaceMember: {
+          ...data.currentUser.workspaceMember,
+          settings: data.currentUser.workspaceMember.settings,
+        },
+      });
    }
  }, [setCurrentUser, data, isLoading, loading]);

--- a/front/src/modules/users/graphql/mutations/updateUser.ts
+++ b/front/src/modules/users/graphql/mutations/updateUser.ts
@ -18,6 +18,33 @@ export const UPDATE_USER = gql`
          logo
          inviteHash
        }
+        assignedActivities {
+          id
+          title
+        }
+        authoredActivities {
+          id
+          title
+        }
+        authoredAttachments {
+          id
+          name
+          type
+        }
+        settings {
+          id
+          colorScheme
+          locale
+        }
+        companies {
+          id
+          name
+          domainName
+        }
+        comments {
+          id
+          body
+        }
      }
      settings {
        id
--- a/front/src/modules/users/graphql/queries/getCurrentUser.ts
+++ b/front/src/modules/users/graphql/queries/getCurrentUser.ts
@ -20,6 +20,33 @@ export const GET_CURRENT_USER = gql`
          logo
          inviteHash
        }
+        assignedActivities {
+          id
+          title
+        }
+        authoredActivities {
+          id
+          title
+        }
+        authoredAttachments {
+          id
+          name
+          type
+        }
+        settings {
+          id
+          colorScheme
+          locale
+        }
+        companies {
+          id
+          name
+          domainName
+        }
+        comments {
+          id
+          body
+        }
      }
      settings {
        id