admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix sign up (#5231)

Browse Source 
Sign up was broken by #5199
This commit is contained in:
Charles Bochet
2024-04-30 18:48:07 +02:00
committed by GitHub
parent 3fc48feefb
commit b7c2f83abf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
View File

@ -2,6 +2,7 @@ import { useEffect } from 'react';
import { useRecoilState, useRecoilValue } from 'recoil'; import { useRecoilState, useRecoilValue } from 'recoil';
import { currentUserState } from '@/auth/states/currentUserState'; import { currentUserState } from '@/auth/states/currentUserState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems'; import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState'; import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock'; import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
@ -10,6 +11,8 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
export const ObjectMetadataItemsLoadEffect = () => { export const ObjectMetadataItemsLoadEffect = () => {
const currentUser = useRecoilValue(currentUserState); const currentUser = useRecoilValue(currentUserState);
const currentWorkspace = useRecoilValue(currentWorkspaceState);
const { objectMetadataItems: newObjectMetadataItems } = const { objectMetadataItems: newObjectMetadataItems } =
useFindManyObjectMetadataItems({ useFindManyObjectMetadataItems({
skip: isUndefinedOrNull(currentUser), skip: isUndefinedOrNull(currentUser),
@ -20,14 +23,17 @@ export const ObjectMetadataItemsLoadEffect = () => {
); );
useEffect(() => { useEffect(() => {
const toSetObjectMetadataItems = isUndefinedOrNull(currentUser) const toSetObjectMetadataItems =
? getObjectMetadataItemsMock() isUndefinedOrNull(currentUser) ||
: newObjectMetadataItems; currentWorkspace?.activationStatus !== 'active'
? getObjectMetadataItemsMock()
: newObjectMetadataItems;
if (!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)) { if (!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)) {
setObjectMetadataItems(toSetObjectMetadataItems); setObjectMetadataItems(toSetObjectMetadataItems);
} }
}, [ }, [
currentUser, currentUser,
currentWorkspace?.activationStatus,
newObjectMetadataItems, newObjectMetadataItems,
objectMetadataItems, objectMetadataItems,
setObjectMetadataItems, setObjectMetadataItems,