The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(slack): show one content-shaped skeleton while the settings tab loads (#28493)
Abdul Rahman2fa7ebcb3122
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsxindex b7928badbdb..bb45ead70c3 100644--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx@@ -15,6 +15,7 @@ import { H2Title } from 'twenty-ui/typography';import { SlackUserLinkForm } from 'src/front-components/components/SlackUserLinkForm';import { SlackUserLinksList } from 'src/front-components/components/SlackUserLinksList';+import { SlackUserLinksSettingsSkeleton } from 'src/front-components/components/SlackUserLinksSettingsSkeleton';import { UnlinkedSlackUsersList } from 'src/front-components/components/UnlinkedSlackUsersList';import { useCanManageSlackUserLinks } from 'src/front-components/hooks/use-can-manage-slack-user-links';import { useMatchSlackUserLinks } from 'src/front-components/hooks/use-match-slack-user-links';@@ -77,6 +78,7 @@ const SlackUserLinksSettingsContent = () => {const {slackUserLinks,isSlackUserLinksLoading,+ hasLoadedSlackUserLinks,errorMessage,hasMoreSlackUserLinks,refetchSlackUserLinks,@@ -87,9 +89,10 @@ const SlackUserLinksSettingsContent = () => {unlinkedSlackUsers,hasMoreUnlinkedSlackUsers,isUnlinkedSlackUsersLoading,+ hasLoadedUnlinkedSlackUsers,unlinkedErrorMessage,refetchUnlinkedSlackUsers,- } = useUnlinkedSlackUsers({ isEnabled: canManage && isSlackConnected });+ } = useUnlinkedSlackUsers({ isEnabled: canManage });const { matchSlackUserLinks, isMatching } = useMatchSlackUserLinks();const [matchSummary, setMatchSummary] = useState<string | undefined>(undefined,@@ -174,14 +177,18 @@ const SlackUserLinksSettingsContent = () => {isDefined(connectionHealth) &&connectionHealth !== SLACK_CONNECTION_HEALTH.OK;+ if (isConnectionStatusLoading || isPermissionLoading) {+ return <SlackUserLinksSettingsSkeleton />;+ }+// A broken connection is reported by the app health banner, which stays// visible next to the connection itself; the tools below need a working one.- if (isConnectionStatusLoading || !isSlackConnected || isConnectionBroken) {+ if (!isSlackConnected || isConnectionBroken) {return null;}- if (isPermissionLoading) {- return <StyledCenteredState>Loading Slack user links…</StyledCenteredState>;+ if (!hasLoadedSlackUserLinks || (canManage && !hasLoadedUnlinkedSlackUsers)) {+ return <SlackUserLinksSettingsSkeleton />;}const shouldWarnAboutRosterMatch =diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsxnew file mode 100644index 00000000000..abd206c4176--- /dev/null+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx@@ -0,0 +1,96 @@+import { keyframes } from '@emotion/react';+import styled from '@emotion/styled';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const SKELETON_ROW_COUNT = 5;+const TITLE_BAR_WIDTH_PIXELS = 140;+const TITLE_BAR_HEIGHT_PIXELS = 16;+const DESCRIPTION_LINE_HEIGHT_PIXELS = 13;+const LAST_DESCRIPTION_LINE_WIDTH = '60%';+const ROW_HEIGHT_PIXELS = 32;++const shimmer = keyframes`+ to { transform: translateX(100%); }+`;++const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ width: 100%;+`;++const StyledDescription = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${() => themeCssVariables.spacing[1]};+ margin-bottom: ${() => themeCssVariables.spacing[6]};+ margin-top: ${() => themeCssVariables.spacing[2]};+`;++const StyledRows = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${() => themeCssVariables.spacing[2]};+`;++// TODO(@abdulrahmancodes): use Skeleton from twenty-ui/primitives/feedback once this app is on twenty-ui 2.x+const StyledBar = styled.span`+ background-color: ${() => themeCssVariables.background.tertiary};+ border-radius: ${() => themeCssVariables.border.radius.sm};+ display: block;+ overflow: hidden;+ position: relative;+ width: 100%;++ &::after {+ animation: ${shimmer} 1.5s ease-in-out infinite;+ background-image: linear-gradient(+ 90deg,+ ${() => themeCssVariables.background.tertiary} 0%,+ ${() => themeCssVariables.background.transparent.lighter} 50%,+ ${() => themeCssVariables.background.tertiary} 100%+ );+ content: ' ';+ inset: 0;+ position: absolute;+ transform: translateX(-100%);+ }++ @media (prefers-reduced-motion: reduce) {+ &::after {+ display: none;+ }+ }+`;++const StyledTitleBar = styled(StyledBar)`+ height: ${TITLE_BAR_HEIGHT_PIXELS}px;+ width: ${TITLE_BAR_WIDTH_PIXELS}px;+`;++const StyledDescriptionLine = styled(StyledBar)`+ height: ${DESCRIPTION_LINE_HEIGHT_PIXELS}px;++ &:last-of-type {+ width: ${LAST_DESCRIPTION_LINE_WIDTH};+ }+`;++const StyledRow = styled(StyledBar)`+ height: ${ROW_HEIGHT_PIXELS}px;+`;++export const SlackUserLinksSettingsSkeleton = () => (+ <StyledContainer aria-busy="true" aria-label="Loading Slack user links">+ <StyledTitleBar />+ <StyledDescription>+ <StyledDescriptionLine />+ <StyledDescriptionLine />+ </StyledDescription>+ <StyledRows>+ {Array.from({ length: SKELETON_ROW_COUNT }, (_, index) => (+ <StyledRow key={index} />+ ))}+ </StyledRows>+ </StyledContainer>+);diff --git a/packages/twenty-apps/public/slack/src/front-components/hooks/use-slack-user-links.ts b/packages/twenty-apps/public/slack/src/front-components/hooks/use-slack-user-links.tsindex 5277c2ca005..42b51c9bc71 100644--- a/packages/twenty-apps/public/slack/src/front-components/hooks/use-slack-user-links.ts+++ b/packages/twenty-apps/public/slack/src/front-components/hooks/use-slack-user-links.ts@@ -32,6 +32,7 @@ type SlackUserLinksResponse = {type SlackUserLinksState = {slackUserLinks: SlackUserLinkRecord[];isSlackUserLinksLoading: boolean;+ hasLoadedSlackUserLinks: boolean;errorMessage: string | undefined;hasMoreSlackUserLinks: boolean;refetchSlackUserLinks: () => Promise<void>;@@ -42,6 +43,7 @@ export const useSlackUserLinks = (): SlackUserLinksState => {[],);const [isSlackUserLinksLoading, setIsSlackUserLinksLoading] = useState(true);+ const [hasLoadedSlackUserLinks, setHasLoadedSlackUserLinks] = useState(false);const [errorMessage, setErrorMessage] = useState<string | undefined>(undefined,);@@ -108,6 +110,7 @@ export const useSlackUserLinks = (): SlackUserLinksState => {} finally {if (fetchId === fetchIdRef.current) {setIsSlackUserLinksLoading(false);+ setHasLoadedSlackUserLinks(true);}}}, []);@@ -119,6 +122,7 @@ export const useSlackUserLinks = (): SlackUserLinksState => {return {slackUserLinks,isSlackUserLinksLoading,+ hasLoadedSlackUserLinks,errorMessage,hasMoreSlackUserLinks,refetchSlackUserLinks: fetchSlackUserLinks,diff --git a/packages/twenty-apps/public/slack/src/front-components/hooks/use-unlinked-slack-users.ts b/packages/twenty-apps/public/slack/src/front-components/hooks/use-unlinked-slack-users.tsindex 0d8fda3a971..5c6186494ba 100644--- a/packages/twenty-apps/public/slack/src/front-components/hooks/use-unlinked-slack-users.ts+++ b/packages/twenty-apps/public/slack/src/front-components/hooks/use-unlinked-slack-users.ts@@ -14,6 +14,7 @@ type UnlinkedSlackUsersState = {unlinkedSlackUsers: SlackResolvedUser[];hasMoreUnlinkedSlackUsers: boolean;isUnlinkedSlackUsersLoading: boolean;+ hasLoadedUnlinkedSlackUsers: boolean;unlinkedErrorMessage: string | undefined;refetchUnlinkedSlackUsers: () => Promise<void>;};@@ -30,6 +31,8 @@ export const useUnlinkedSlackUsers = ({useState(false);const [isUnlinkedSlackUsersLoading, setIsUnlinkedSlackUsersLoading] =useState(true);+ const [hasLoadedUnlinkedSlackUsers, setHasLoadedUnlinkedSlackUsers] =+ useState(false);const [unlinkedErrorMessage, setUnlinkedErrorMessage] = useState<string | undefined>(undefined);@@ -71,6 +74,7 @@ export const useUnlinkedSlackUsers = ({} finally {if (fetchId === fetchIdRef.current) {setIsUnlinkedSlackUsersLoading(false);+ setHasLoadedUnlinkedSlackUsers(true);}}}, []);@@ -87,6 +91,7 @@ export const useUnlinkedSlackUsers = ({unlinkedSlackUsers,hasMoreUnlinkedSlackUsers,isUnlinkedSlackUsersLoading,+ hasLoadedUnlinkedSlackUsers,unlinkedErrorMessage,refetchUnlinkedSlackUsers,};diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.tsindex 6c7fbc25aef..07e252409a7 100644--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts@@ -14,7 +14,10 @@ const MAX_UNLINKED_RESULTS = 20;export const slackListUnlinkedUsersHandler =async (): Promise<SlackUnlinkedUsersResult> => {- const isAllowed = await currentUserHasRolesPermission();+ const [isAllowed, slackClientResult] = await Promise.all([+ currentUserHasRolesPermission(),+ getSlackClient(),+ ]);if (!isAllowed) {return {@@ -25,8 +28,6 @@ export const slackListUnlinkedUsersHandler =};}- const slackClientResult = await getSlackClient();-if (!slackClientResult.success) {return {success: false,diff --git a/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentWorkerEffect.tsx b/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentWorkerEffect.tsxindex 5392f1ebfc1..b226f3a0436 100644--- a/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentWorkerEffect.tsx+++ b/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentWorkerEffect.tsx@@ -178,6 +178,10 @@ export const FrontComponentWorkerEffect = ({mediaSessionHost?.getRecorderCapabilities(),},);++ if (!isCancelled) {+ setReceiver(newReceiver);+ }} catch (error) {if (!isCancelled) {setError(error instanceof Error ? error : new Error(String(error)));@@ -187,7 +191,6 @@ export const FrontComponentWorkerEffect = ({resolveComponentSourceAndRender();- setReceiver(newReceiver);isInitializedRef.current = true;return () => {diff --git a/packages/twenty-front-component-renderer/src/host/effect-components/__tests__/FrontComponentWorkerEffect.test.ts b/packages/twenty-front-component-renderer/src/host/effect-components/__tests__/FrontComponentWorkerEffect.test.tsnew file mode 100644index 00000000000..eeb80714014--- /dev/null+++ b/packages/twenty-front-component-renderer/src/host/effect-components/__tests__/FrontComponentWorkerEffect.test.ts@@ -0,0 +1,173 @@+import '@/testing/setupServerRenderingGlobals';++import { RemoteReceiver } from '@remote-dom/core/receivers';+import { act, createElement } from 'react';+import { createRoot, type Root } from 'react-dom/client';++import { fetchComponentSource } from '@/host/component-source/utils/fetchComponentSource';+import { type HostFocusController } from '@/host/focus/types/HostFocusController';+import { type HostScrollController } from '@/host/scroll/types/HostScrollController';+import { createFrontComponentHostThread } from '@/host/thread/utils/createFrontComponentHostThread';+import { createGeometryTrackerStub } from '@/testing/createGeometryTrackerStub';+import { type FrontComponentThread } from '@/types/FrontComponentThread';+import { FrontComponentWorkerEffect } from '../FrontComponentWorkerEffect';++jest.mock('@/remote/sandbox/generated/frontComponentSandboxDocument', () => ({+ FRONT_COMPONENT_SANDBOX_DOCUMENT: '',+}));++jest.mock('@/remote/sandbox/utils/createFrontComponentSandboxIframe', () => ({+ createFrontComponentSandboxIframe: () => document.createElement('iframe'),+}));++jest.mock(+ '@/remote/sandbox/utils/createFrontComponentSandboxMessageHandler',+ () => ({+ createFrontComponentSandboxMessageHandler: () => jest.fn(),+ }),+);++jest.mock('@/host/thread/utils/createFrontComponentHostThread', () => ({+ createFrontComponentHostThread: jest.fn(),+}));++jest.mock('@/host/component-source/utils/fetchComponentSource', () => ({+ fetchComponentSource: jest.fn(),+}));++jest.mock('@/host/file-input/utils/createFileInputHost', () => ({+ createFileInputHost: () => ({ dispose: jest.fn() }),+}));++jest.mock('@/host/image-loading/utils/createImageLoadingHost', () => ({+ createImageLoadingHost: () => ({ dispose: jest.fn() }),+}));++Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });++const createHostFocusControllerStub = (): HostFocusController => ({+ callFocusMethod: jest.fn(),+ retryPendingFocus: jest.fn(),+ reset: jest.fn(),+});++const createHostScrollControllerStub = (): HostScrollController => ({+ enqueueScrollCommands: jest.fn(),+ reset: jest.fn(),+});++const createDeferredRender = () => {+ let resolveRender: () => void = () => {};+ let rejectRender: (error: Error) => void = () => {};++ const render = jest.fn(+ () =>+ new Promise<void>((resolve, reject) => {+ resolveRender = resolve;+ rejectRender = reject;+ }),+ );++ return {+ render,+ resolveRender: () => resolveRender(),+ rejectRender: (error: Error) => rejectRender(error),+ };+};++const flushPendingWork = () =>+ act(() => new Promise<void>((resolve) => setTimeout(resolve, 0)));++describe('FrontComponentWorkerEffect', () => {+ let container: HTMLDivElement;+ let root: Root;++ beforeEach(() => {+ container = document.createElement('div');+ document.body.appendChild(container);+ root = createRoot(container);++ jest+ .mocked(fetchComponentSource)+ .mockResolvedValue('export default () => {};');+ });++ afterEach(() => {+ act(() => {+ root.unmount();+ });+ container.remove();+ });++ const mountEffect = ({+ setReceiver,+ setError,+ }: {+ setReceiver: jest.Mock;+ setError: jest.Mock;+ }) => {+ act(() => {+ root.render(+ createElement(FrontComponentWorkerEffect, {+ componentUrl: 'https://app.twenty.test/component.js',+ initialExecutionContext: {+ frontComponentId: 'front-component-id',+ userId: null,+ recordId: null,+ selectedRecordIds: [],+ timelineActivityId: null,+ colorScheme: 'light',+ },+ geometryTracker: createGeometryTrackerStub(),+ hostFocusController: createHostFocusControllerStub(),+ hostScrollController: createHostScrollControllerStub(),+ setReceiver,+ setThread: jest.fn(),+ setError,+ }),+ );+ });+ };++ it('should hand the receiver to the host only once the worker has rendered', async () => {+ const { render, resolveRender } = createDeferredRender();++ jest.mocked(createFrontComponentHostThread).mockReturnValue({+ imports: { render },+ } as unknown as FrontComponentThread);++ const setReceiver = jest.fn();++ mountEffect({ setReceiver, setError: jest.fn() });+ await flushPendingWork();++ expect(render).toHaveBeenCalledTimes(1);+ expect(setReceiver).not.toHaveBeenCalled();++ resolveRender();+ await flushPendingWork();++ expect(setReceiver).toHaveBeenCalledTimes(1);+ expect(setReceiver).toHaveBeenCalledWith(expect.any(RemoteReceiver));+ });++ it('should report a failed render instead of handing over the receiver', async () => {+ const { render, rejectRender } = createDeferredRender();++ jest.mocked(createFrontComponentHostThread).mockReturnValue({+ imports: { render },+ } as unknown as FrontComponentThread);++ const setReceiver = jest.fn();+ const setError = jest.fn();++ mountEffect({ setReceiver, setError });+ await flushPendingWork();++ rejectRender(new Error('render failed'));+ await flushPendingWork();++ expect(setReceiver).not.toHaveBeenCalled();+ expect(setError).toHaveBeenCalledWith(expect.any(Error));+ });+});diff --git a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/__tests__/renderFrontComponent.test.ts b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/__tests__/renderFrontComponent.test.tsindex 20010f677af..c0e04320752 100644--- a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/__tests__/renderFrontComponent.test.ts+++ b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/__tests__/renderFrontComponent.test.ts@@ -6,12 +6,17 @@ import { FRONT_COMPONENT_CONTEXT_KEY } from 'twenty-sdk/front-component-rendererimport { getFrontComponentExecutionContext } from '@/remote/worker/environment/utils/getFrontComponentExecutionContext';import { setFrontComponentExecutionContext } from '@/remote/worker/environment/utils/setFrontComponentExecutionContext';import { loadFrontComponentModule } from '@/remote/worker/module-loading/utils/loadFrontComponentModule';+import { attachRemoteRenderRootToWorkerDocument } from '@/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument';+import { waitForScheduledReactCommit } from '@/remote/worker/rendering/utils/waitForScheduledReactCommit';import { renderFrontComponent } from '../renderFrontComponent';jest.mock('@/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument',() => ({- attachRemoteRenderRootToWorkerDocument: jest.fn(() => ({})),+ attachRemoteRenderRootToWorkerDocument: jest.fn(() => ({+ renderContainer: {},+ flushPendingMutations: jest.fn(),+ })),}),);@@ -19,6 +24,13 @@ jest.mock('@/remote/worker/fetch-proxy/utils/installHostFetchProxy', () => ({installHostFetchProxy: jest.fn(),}));+jest.mock(+ '@/remote/worker/rendering/utils/waitForScheduledReactCommit',+ () => ({+ waitForScheduledReactCommit: jest.fn(async () => {}),+ }),+);+jest.mock('@/remote/worker/module-loading/utils/loadFrontComponentModule',() => ({@@ -26,6 +38,11 @@ jest.mock(}),);+const createConnection = (): RemoteConnection => ({+ mutate: jest.fn(),+ call: jest.fn(),+});+const COMPONENT_RENDER_CONTEXT = {componentUrl: 'https://api.twenty.test/rest/front-components/id',componentSource: 'export default () => {};',@@ -57,7 +74,7 @@ const readExecutionContextWhenModuleLoads = async (});await renderFrontComponent({- connection: {} as RemoteConnection,+ connection: createConnection(),renderContext: { ...COMPONENT_RENDER_CONTEXT, initialExecutionContext },hostFetch: jest.fn(),});@@ -73,7 +90,7 @@ describe('renderFrontComponent', () => {it('should fail closed when the host fetch bridge is unavailable', async () => {await expect(renderFrontComponent({- connection: {} as RemoteConnection,+ connection: createConnection(),renderContext: COMPONENT_RENDER_CONTEXT,hostFetch: null,}),@@ -92,6 +109,34 @@ describe('renderFrontComponent', () => {).toBe(initialExecutionContext);});+ it('should flush the first committed tree before resolving', async () => {+ const events: string[] = [];+ const flushPendingMutations = jest.fn(() => {+ events.push('flush');+ });++ jest.mocked(attachRemoteRenderRootToWorkerDocument).mockReturnValue({+ renderContainer: document.createElement('div'),+ flushPendingMutations,+ });+ jest.mocked(waitForScheduledReactCommit).mockImplementation(async () => {+ events.push('commit');+ });+ jest.mocked(loadFrontComponentModule).mockResolvedValue({+ default: () => {+ events.push('mount');+ },+ });++ await renderFrontComponent({+ connection: createConnection(),+ renderContext: COMPONENT_RENDER_CONTEXT,+ hostFetch: jest.fn(),+ });++ expect(events).toEqual(['mount', 'commit', 'flush']);+ });+it('should keep a context the host pushed before render when the module loads', async () => {const pushedExecutionContext = createExecutionContext({colorScheme: 'dark',diff --git a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument.ts b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument.tsindex c4503cf3c08..7b15cbb5e46 100644--- a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument.ts+++ b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/attachRemoteRenderRootToWorkerDocument.ts@@ -13,9 +13,14 @@ import { workerFocusTransport } from '@/polyfills/dom/states/workerFocusTransporimport { workerScrollStore } from '@/polyfills/scroll/states/workerScrollStore';import { installStyleBridge } from '@/polyfills/style/utils/installStyleBridge';+type RemoteRenderRoot = {+ renderContainer: Element;+ flushPendingMutations: () => void;+};+export const attachRemoteRenderRootToWorkerDocument = (connection: RemoteConnection,-): Element => {+): RemoteRenderRoot => {const batchedConnection = new BatchingRemoteConnection({call: connection.call,mutate: (records) =>@@ -42,5 +47,8 @@ export const attachRemoteRenderRootToWorkerDocument = (workerScrollStore.setRootElement(remoteRoot);installStyleBridge(styleContainer);- return renderContainer;+ return {+ renderContainer,+ flushPendingMutations: () => batchedConnection.flush(),+ };};diff --git a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/renderFrontComponent.ts b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/renderFrontComponent.tsindex 5f7f8e7f0e3..f8ff65552d8 100644--- a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/renderFrontComponent.ts+++ b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/renderFrontComponent.ts@@ -9,6 +9,7 @@ import { installHostFetchProxy } from '@/remote/worker/fetch-proxy/utils/installimport { loadFrontComponentModule } from '@/remote/worker/module-loading/utils/loadFrontComponentModule';import { seedFrontComponentExecutionContext } from '@/remote/worker/environment/utils/seedFrontComponentExecutionContext';import { setWorkerEnvironmentVariablesFromRenderContext } from '@/remote/worker/environment/utils/setWorkerEnvironmentVariablesFromRenderContext';+import { waitForScheduledReactCommit } from '@/remote/worker/rendering/utils/waitForScheduledReactCommit';import { type HostFetchFunction } from '@/types/HostFetchFunction';import { type HostToWorkerRenderContext } from '@/types/HostToWorkerRenderContext';@@ -32,7 +33,8 @@ export const renderFrontComponent = async ({installHostFetchProxy(hostFetch, renderContext.hostFetchOrigins ?? []);- const renderContainer = attachRemoteRenderRootToWorkerDocument(connection);+ const { renderContainer, flushPendingMutations } =+ attachRemoteRenderRootToWorkerDocument(connection);setWorkerEnvironmentVariablesFromRenderContext(renderContext);@@ -70,4 +72,7 @@ export const renderFrontComponent = async ({});componentModule.default(renderContainer);++ await waitForScheduledReactCommit();+ flushPendingMutations();};diff --git a/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/waitForScheduledReactCommit.ts b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/waitForScheduledReactCommit.tsnew file mode 100644index 00000000000..a094cb5b70d--- /dev/null+++ b/packages/twenty-front-component-renderer/src/remote/worker/rendering/utils/waitForScheduledReactCommit.ts@@ -0,0 +1,10 @@+export const waitForScheduledReactCommit = (): Promise<void> =>+ new Promise((resolve) => {+ const channel = new MessageChannel();++ channel.port1.onmessage = () => {+ channel.port1.close();+ resolve();+ };+ channel.port2.postMessage(null);+ });diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationCustomSettingsSection.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationCustomSettingsSection.tsxindex 26be1d87473..35b32489019 100644--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationCustomSettingsSection.tsx+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationCustomSettingsSection.tsx@@ -1,7 +1,7 @@import { styled } from '@linaria/react';import { Suspense, lazy } from 'react';-import { FrontComponentSkeletonLoader } from '@/front-components/components/FrontComponentSkeletonLoader';+import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { Section } from 'twenty-ui/components/layout';const FrontComponentRenderer = lazy(() =>@@ -10,6 +10,8 @@ const FrontComponentRenderer = lazy(() =>),);+const SKELETON_ROW_COUNT = 5;+const StyledRendererContainer = styled.div`display: flex;min-height: 400px;@@ -23,13 +25,17 @@ type SettingsApplicationCustomSettingsSectionProps = {export const SettingsApplicationCustomSettingsSection = ({frontComponentId,}: SettingsApplicationCustomSettingsSectionProps) => {+ const loadingFallback = (+ <SettingsSectionSkeletonLoader hasHeader rowCount={SKELETON_ROW_COUNT} />+ );+return (<Section.Root><StyledRendererContainer>- <Suspense fallback={<FrontComponentSkeletonLoader />}>+ <Suspense fallback={loadingFallback}><FrontComponentRendererfrontComponentId={frontComponentId}- loadingFallback={<FrontComponentSkeletonLoader />}+ loadingFallback={loadingFallback}/></Suspense></StyledRendererContainer>diff --git a/packages/twenty-front/src/modules/settings/components/SettingsSectionSkeletonLoader.tsx b/packages/twenty-front/src/modules/settings/components/SettingsSectionSkeletonLoader.tsxindex f1287faf58b..b071e26513e 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsSectionSkeletonLoader.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsSectionSkeletonLoader.tsx@@ -1,19 +1,57 @@import { SkeletonLine } from '@/ui/feedback/skeleton/components/SkeletonLine';+import { styled } from '@linaria/react';import { SKELETON_HEIGHT_SIZES } from 'twenty-ui/primitives/feedback';import { themeCssVariables } from 'twenty-ui/theme';+const TITLE_WIDTH = 140;+const LAST_DESCRIPTION_LINE_WIDTH = '60%';++const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ width: 100%;+`;++const StyledDescription = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[1]};+ margin-bottom: ${themeCssVariables.spacing[6]};+ margin-top: ${themeCssVariables.spacing[2]};+`;+type SettingsSectionSkeletonLoaderProps = {rowCount?: number;+ hasHeader?: boolean;};export const SettingsSectionSkeletonLoader = ({rowCount = 4,+ hasHeader = false,}: SettingsSectionSkeletonLoaderProps) => {- return (+ const rows = (<SkeletonLinecount={rowCount}height={SKELETON_HEIGHT_SIZES.l}gap={themeCssVariables.spacing[2]}/>);++ if (!hasHeader) {+ return rows;+ }++ return (+ <StyledContainer>+ <SkeletonLine width={TITLE_WIDTH} height={SKELETON_HEIGHT_SIZES.s} />+ <StyledDescription>+ <SkeletonLine height={SKELETON_HEIGHT_SIZES.xs} />+ <SkeletonLine+ width={LAST_DESCRIPTION_LINE_WIDTH}+ height={SKELETON_HEIGHT_SIZES.xs}+ />+ </StyledDescription>+ {rows}+ </StyledContainer>+ );};diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsSectionSkeletonLoader.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsSectionSkeletonLoader.stories.tsxnew file mode 100644index 00000000000..6dc352e41ff--- /dev/null+++ b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsSectionSkeletonLoader.stories.tsx@@ -0,0 +1,19 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';++import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';+import { ComponentDecorator } from 'twenty-ui/testing';++const meta: Meta<typeof SettingsSectionSkeletonLoader> = {+ title: 'Modules/Settings/SettingsSectionSkeletonLoader',+ component: SettingsSectionSkeletonLoader,+ decorators: [ComponentDecorator],+};++export default meta;+type Story = StoryObj<typeof SettingsSectionSkeletonLoader>;++export const Default: Story = {};++export const WithHeader: Story = {+ args: { hasHeader: true, rowCount: 5 },+};