The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remember the log console source across reloads (#27975)
martmullf0880607b2dc
diff --git a/packages/twenty-front/src/modules/log-console/components/LogConsole.tsx b/packages/twenty-front/src/modules/log-console/components/LogConsole.tsxindex 249b34e9d39..11b1b3fbc54 100644--- a/packages/twenty-front/src/modules/log-console/components/LogConsole.tsx+++ b/packages/twenty-front/src/modules/log-console/components/LogConsole.tsx@@ -30,6 +30,7 @@ import { LOG_CONSOLE_SOURCES } from '@/log-console/constants/LogConsoleSources';import { LOG_CONSOLE_TAB_LIST_INSTANCE_ID } from '@/log-console/constants/LogConsoleTabListInstanceId';import { useIsLogConsoleAllowed } from '@/log-console/hooks/useIsLogConsoleAllowed';import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFullScreenState';+import { logConsoleActiveSourceIdState } from '@/log-console/states/logConsoleActiveSourceIdState';import { logConsoleDisplayModeState } from '@/log-console/states/logConsoleDisplayModeState';import { logConsoleFiltersState } from '@/log-console/states/logConsoleFiltersState';import { logConsoleHeightState } from '@/log-console/states/logConsoleHeightState';@@ -275,6 +276,9 @@ export const LogConsole = () => {activeTabIdComponentState,LOG_CONSOLE_TAB_LIST_INSTANCE_ID,);+ const [logConsoleActiveSourceId, setLogConsoleActiveSourceId] = useAtomState(+ logConsoleActiveSourceIdState,+ );const [logConsoleHeight, setLogConsoleHeight] = useAtomState(logConsoleHeightState,);@@ -399,7 +403,9 @@ export const LogConsole = () => {];const activeSource =- sources.find((source) => source.id === activeTabId) ?? sources[0];+ sources.find(+ (source) => source.id === (activeTabId ?? logConsoleActiveSourceId),+ ) ?? sources[0];const tabs = sources.map((source) => ({id: source.id,@@ -519,10 +525,11 @@ export const LogConsole = () => {};const changeSource = (sourceId: string) => {- const filterFields =- sources.find((source) => source.id === sourceId)?.filterFields ?? [];+ const selectedSource = sources.find((source) => source.id === sourceId);+ const filterFields = selectedSource?.filterFields ?? [];closeSelectedLog();+ setLogConsoleActiveSourceId(selectedSource?.id ?? null);setLogConsoleFilters((filters) =>filters.filter((filter) =>filterFields.some(@@ -613,6 +620,7 @@ export const LogConsole = () => {tabs={tabs}behaveAsLinks={false}componentInstanceId={LOG_CONSOLE_TAB_LIST_INSTANCE_ID}+ defaultActiveTabId={activeSource.id}onClickTab={openLogConsole}onChangeTab={changeSource}rightComponent={diff --git a/packages/twenty-front/src/modules/log-console/components/__stories__/LogConsole.stories.tsx b/packages/twenty-front/src/modules/log-console/components/__stories__/LogConsole.stories.tsxindex ae918857505..7b38cdb3de1 100644--- a/packages/twenty-front/src/modules/log-console/components/__stories__/LogConsole.stories.tsx+++ b/packages/twenty-front/src/modules/log-console/components/__stories__/LogConsole.stories.tsx@@ -14,6 +14,7 @@ import { workspaceMemberFormatPreferencesState } from '@/localization/states/worimport { LogConsole } from '@/log-console/components/LogConsole';import { LOG_CONSOLE_TAB_LIST_INSTANCE_ID } from '@/log-console/constants/LogConsoleTabListInstanceId';import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFullScreenState';+import { logConsoleActiveSourceIdState } from '@/log-console/states/logConsoleActiveSourceIdState';import { logConsoleDisplayModeState } from '@/log-console/states/logConsoleDisplayModeState';import { logConsoleFiltersState } from '@/log-console/states/logConsoleFiltersState';import { logConsoleHeightState } from '@/log-console/states/logConsoleHeightState';@@ -172,6 +173,7 @@ const meta: Meta<PageDecoratorArgs> = {jotaiStore.set(logConsoleDisplayModeState.atom, 'collapsed');jotaiStore.set(logConsoleHeightState.atom, null);jotaiStore.set(isLogConsoleFullScreenState.atom, false);+ jotaiStore.set(logConsoleActiveSourceIdState.atom, null);},parameters: {layout: 'fullscreen',diff --git a/packages/twenty-front/src/modules/log-console/components/__tests__/LogConsole.test.tsx b/packages/twenty-front/src/modules/log-console/components/__tests__/LogConsole.test.tsxindex 95c5f53e43e..67c623b00af 100644--- a/packages/twenty-front/src/modules/log-console/components/__tests__/LogConsole.test.tsx+++ b/packages/twenty-front/src/modules/log-console/components/__tests__/LogConsole.test.tsx@@ -15,6 +15,7 @@ import { isClickHouseConfiguredState } from '@/client-config/states/isClickHouseimport { LogConsole } from '@/log-console/components/LogConsole';import { LOG_CONSOLE_HEIGHT_CONSTRAINTS } from '@/log-console/constants/LogConsoleHeightConstraints';import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFullScreenState';+import { logConsoleActiveSourceIdState } from '@/log-console/states/logConsoleActiveSourceIdState';import { logConsoleDisplayModeState } from '@/log-console/states/logConsoleDisplayModeState';import { logConsoleHeightState } from '@/log-console/states/logConsoleHeightState';import { useSetAdvancedMode } from '@/navigation/hooks/useSetAdvancedMode';@@ -83,6 +84,7 @@ const renderWithLogsFeatureFlag = (isLogsFeatureFlagEnabled: boolean) => {jotaiStore.set(isClickHouseConfiguredState.atom, true);jotaiStore.set(isAdvancedModeEnabledState.atom, false);jotaiStore.set(logConsoleDisplayModeState.atom, 'closed');+ jotaiStore.set(logConsoleActiveSourceIdState.atom, null);render(<I18nProvider i18n={i18n}>@@ -256,6 +258,32 @@ describe('LogConsole', () => {expect(screen.getByText('Log results')).toBeInTheDocument();});+ it('reopens on the last selected log source', () => {+ renderWithLogsFeatureFlag(true);+ act(() => {+ jotaiStore.set(isAdvancedModeEnabledState.atom, true);+ jotaiStore.set(logConsoleActiveSourceIdState.atom, 'app-logs');+ jotaiStore.set(logConsoleDisplayModeState.atom, 'open');+ });++ expect(screen.getByRole('tab', { name: 'App logs' })).toHaveAttribute(+ 'aria-selected',+ 'true',+ );+ });++ it('remembers the log source selected by the user', async () => {+ renderWithLogsFeatureFlag(true);+ act(() => {+ jotaiStore.set(isAdvancedModeEnabledState.atom, true);+ jotaiStore.set(logConsoleDisplayModeState.atom, 'open');+ });++ await userEvent.click(screen.getByRole('tab', { name: 'App logs' }));++ expect(jotaiStore.get(logConsoleActiveSourceIdState.atom)).toBe('app-logs');+ });+it('stays hidden when the logs feature flag is off', async () => {renderWithLogsFeatureFlag(false);diff --git a/packages/twenty-front/src/modules/log-console/states/__tests__/logConsoleActiveSourceIdState.test.ts b/packages/twenty-front/src/modules/log-console/states/__tests__/logConsoleActiveSourceIdState.test.tsnew file mode 100644index 00000000000..40691066738--- /dev/null+++ b/packages/twenty-front/src/modules/log-console/states/__tests__/logConsoleActiveSourceIdState.test.ts@@ -0,0 +1,33 @@+const loadLogConsoleActiveSourceId = async () => {+ jest.resetModules();++ const { logConsoleActiveSourceIdState } =+ await import('@/log-console/states/logConsoleActiveSourceIdState');+ const { createStore } = await import('jotai');++ return createStore().get(logConsoleActiveSourceIdState.atom);+};++describe('logConsoleActiveSourceIdState localStorage hydration', () => {+ afterEach(() => {+ localStorage.clear();+ });++ it('restores the saved log source', async () => {+ localStorage.setItem(+ 'logConsoleActiveSourceIdState',+ JSON.stringify('app-logs'),+ );++ await expect(loadLogConsoleActiveSourceId()).resolves.toBe('app-logs');+ });++ it('falls back to null for an unknown saved log source', async () => {+ localStorage.setItem(+ 'logConsoleActiveSourceIdState',+ JSON.stringify('unknown-source'),+ );++ await expect(loadLogConsoleActiveSourceId()).resolves.toBeNull();+ });+});diff --git a/packages/twenty-front/src/modules/log-console/states/logConsoleActiveSourceIdState.ts b/packages/twenty-front/src/modules/log-console/states/logConsoleActiveSourceIdState.tsnew file mode 100644index 00000000000..51cc41813a0--- /dev/null+++ b/packages/twenty-front/src/modules/log-console/states/logConsoleActiveSourceIdState.ts@@ -0,0 +1,13 @@+import { LOG_CONSOLE_SOURCES } from '@/log-console/constants/LogConsoleSources';+import { type LogConsoleSourceId } from '@/log-console/types/LogConsoleSourceId';+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const logConsoleActiveSourceIdState =+ createAtomState<LogConsoleSourceId | null>({+ key: 'logConsoleActiveSourceIdState',+ defaultValue: null,+ useLocalStorage: true,+ localStorageOptions: { getOnInit: true },+ validateInitFn: (sourceId) =>+ LOG_CONSOLE_SOURCES.some((source) => source.id === sourceId),+ });diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsxindex acc23925bdb..7930d9082b0 100644--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx@@ -70,6 +70,7 @@ export const TabList = ({behaveAsLinks = true,className,componentInstanceId,+ defaultActiveTabId,onChangeTab,onClickTab,rightComponent,@@ -92,11 +93,15 @@ export const TabList = ({behaveAsLinks &&workspaceSurface.ownsRouteLocation &&visibleTabs.some((tab) => tab.id === routeTabId);+ const defaultTabId =+ visibleTabs.find((tab) => tab.id === defaultActiveTabId)?.id ??+ visibleTabs[0]?.id ??+ null;const nextActiveTabId = shouldSelectRouteTab? routeTabId: activeTabExists? activeTabId- : (visibleTabs[0]?.id ?? null);+ : defaultTabId;const {visibleTabCount,diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/types/TabListProps.ts b/packages/twenty-front/src/modules/ui/layout/tab-list/types/TabListProps.tsindex afd13e290ad..5136eec95e4 100644--- a/packages/twenty-front/src/modules/ui/layout/tab-list/types/TabListProps.ts+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/types/TabListProps.ts@@ -9,6 +9,7 @@ export type TabListProps = {behaveAsLinks?: boolean;className?: string;componentInstanceId: string;+ defaultActiveTabId?: string;onChangeTab?: (tabId: string) => void;onClickTab?: (tabId: string) => void;rightComponent?: ReactNode;