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/ui/theme/hooks/useColorScheme.ts
+++ b/front/src/modules/ui/theme/hooks/useColorScheme.ts
@ -2,20 +2,36 @@ import { useCallback } from 'react';
 import { useRecoilState } from 'recoil';

 import { currentUserState } from '@/auth/states/currentUserState';
-import { ColorScheme, useUpdateUserMutation } from '~/generated/graphql';
+import {
+  ColorScheme,
+  useUpdateOneWorkspaceMemberMutation,
+  useUpdateUserMutation,
+} from '~/generated/graphql';

 export function useColorScheme() {
  const [currentUser, setCurrentUser] = useRecoilState(currentUserState);

  const [updateUser] = useUpdateUserMutation();
+  const [updateWorkspaceMember] = useUpdateOneWorkspaceMemberMutation();

-  const colorScheme = !currentUser?.settings?.colorScheme
-    ? ColorScheme.System
-    : currentUser.settings.colorScheme;
+  const colorScheme =
+    !currentUser?.workspaceMember.settings?.colorScheme &&
+    !currentUser?.settings?.colorScheme
+      ? ColorScheme.System
+      : currentUser.workspaceMember.settings?.colorScheme ??
+        currentUser.settings.colorScheme;

  const setColorScheme = useCallback(
    async (value: ColorScheme) => {
      try {
+        // connect settings to workspace member if not already connected
+        await updateWorkspaceMember({
+          variables: {
+            where: { id: currentUser?.workspaceMember.id },
+            data: { settings: { connect: { id: currentUser?.settings.id } } },
+          },
+        });
+
        const result = await updateUser({
          variables: {
            where: {
@ -29,13 +45,14 @@ export function useColorScheme() {
              },
            },
          },
-          optimisticResponse:
-            currentUser && currentUser.settings
-              ? {
-                  __typename: 'Mutation',
-                  updateUser: {
-                    __typename: 'User',
-                    ...currentUser,
+          optimisticResponse: currentUser
+            ? {
+                __typename: 'Mutation',
+                updateUser: {
+                  __typename: 'User',
+                  ...currentUser,
+                  workspaceMember: {
+                    ...currentUser.workspaceMember,
                    settings: {
                      __typename: 'UserSettings',
                      id: currentUser.settings.id,
@ -43,15 +60,34 @@ export function useColorScheme() {
                      locale: currentUser.settings.locale,
                    },
                  },
-                }
-              : undefined,
+                  settings: {
+                    __typename: 'UserSettings',
+                    id: currentUser.settings.id,
+                    colorScheme: value,
+                    locale: currentUser.settings.locale,
+                  },
+                },
+              }
+            : undefined,
          update: (_cache, { data }) => {
-            if (data?.updateUser && currentUser) {
+            if (
+              data?.updateUser.workspaceMember?.settings?.colorScheme &&
+              currentUser
+            ) {
              setCurrentUser({
                ...currentUser,
+                workspaceMember: {
+                  ...currentUser.workspaceMember,
+                  settings: {
+                    ...currentUser.workspaceMember.settings,
+                    colorScheme:
+                      data.updateUser.workspaceMember.settings.colorScheme,
+                  },
+                },
                settings: {
                  ...currentUser.settings,
-                  colorScheme: data?.updateUser.settings.colorScheme,
+                  colorScheme:
+                    data.updateUser.workspaceMember.settings.colorScheme,
                },
              });
            }
@ -63,7 +99,7 @@ export function useColorScheme() {
        }
      } catch (err) {}
    },
-    [currentUser, updateUser, setCurrentUser],
+    [updateWorkspaceMember, currentUser, updateUser, setCurrentUser],
  );

  return {