Skip to content

The open alternative to Salesforce, designed for AI.

Fix onboarding flow: workspace creation modal and invite team skip (#18577)

Charles Bochet660536d6bb66
diff --git a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
index f85e21497cd..2fefd9ca75b 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
@@ -9,7 +9,10 @@ import { Logo } from '@/auth/components/Logo';
import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { useFetchAndLoadIndexViews } from '@/metadata-store/hooks/useFetchAndLoadIndexViews';
+import { useMetadataStore } from '@/metadata-store/hooks/useMetadataStore';
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItems';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -19,6 +22,7 @@ import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';
import { ApolloError } from '@apollo/client';
import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
+import { useStore } from 'jotai';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
import { H2Title } from 'twenty-ui/display';
@@ -68,6 +72,9 @@ export const CreateWorkspace = () => {
const { enqueueErrorSnackBar } = useSnackBar();
const setNextOnboardingStatus = useSetNextOnboardingStatus();
const { refreshObjectMetadataItems } = useRefreshObjectMetadataItems();
+ const { updateDraft, applyChanges } = useMetadataStore();
+ const { fetchAndLoadIndexViews } = useFetchAndLoadIndexViews();
+ const store = useStore();
const { loadCurrentUser } = useLoadCurrentUser();
const [activateWorkspace] = useActivateWorkspaceMutation();
@@ -117,12 +124,18 @@ export const CreateWorkspace = () => {
},
},
});
-
if (isDefined(result.errors)) {
throw result.errors ?? new Error(t`Unknown error`);
}
await refreshObjectMetadataItems();
+
+ const loadedObjects = store.get(objectMetadataItemsState.atom);
+ updateDraft('objectMetadataItems', loadedObjects);
+ applyChanges();
+
+ await fetchAndLoadIndexViews();
+
await loadCurrentUser();
setNextOnboardingStatus();
} catch (error: any) {
@@ -138,6 +151,10 @@ export const CreateWorkspace = () => {
enqueueErrorSnackBar,
loadCurrentUser,
refreshObjectMetadataItems,
+ updateDraft,
+ applyChanges,
+ store,
+ fetchAndLoadIndexViews,
setNextOnboardingStatus,
t,
],
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index f3fa2cdd433..45d074df22d 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -131,16 +131,12 @@ export const InviteTeam = () => {
),
);
- if (emails.length === 0) {
- setNextOnboardingStatus();
- return;
- }
-
const result = await sendInvitation({ emails });
if (isDefined(result.errors)) {
throw result.errors;
}
+
if (emails.length > 0) {
enqueueSuccessSnackBar({
message: t`Invite link sent to email addresses`,