Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/app/demo/DemoShell.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ import userEvent from '@testing-library/user-event';
import { DemoShell } from './DemoShell';
import { requestDemoSession } from './requests';

const { persistSession, clearCache, cancelQueries } = vi.hoisted(() => ({
const { persistSession, clearCache, cancelQueries, changeUserLanguage } = vi.hoisted(() => ({
persistSession: vi.fn(),
changeUserLanguage: vi.fn(),
clearCache: vi.fn(),
cancelQueries: vi.fn().mockResolvedValue(undefined),
}));
vi.mock('./requests', () => ({ requestDemoSession: vi.fn() }));
vi.mock('@/modules/auth/AuthProvider', () => ({
useAuth: () => ({
persistSession,
changeUserLanguage: vi.fn(),
changeUserLanguage,
loggedInUser: { id: 'guest' },
}),
}));
Expand Down Expand Up @@ -46,6 +47,7 @@ it('keeps the application unmounted until a visitor opens a guest workspace', as
await user.click(screen.getByRole('button', { name: 'Open demo' }));
expect(await screen.findByText('Real EPOCA application')).toBeInTheDocument();
expect(persistSession).toHaveBeenCalledWith('token', 'demo-guest');
expect(changeUserLanguage).not.toHaveBeenCalled();
});

it.each(['/projects/old-id/project-details?clientId=old-client', '/clients/old-id/client-details'])(
Expand All @@ -70,6 +72,7 @@ it.each(['/projects/old-id/project-details?clientId=old-client', '/clients/old-i
expect(window.location.pathname).toBe('/working-time');
expect(window.location.search).toBe('');
expect(window.history.state).toBeNull();
expect(changeUserLanguage).not.toHaveBeenCalled();
},
);

Expand Down
3 changes: 1 addition & 2 deletions src/app/demo/DemoShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import styles from './DemoShell.module.scss';
import { requestDemoSession, type DemoSession } from './requests';

export function DemoShell({ children }: PropsWithChildren): JSX.Element {
const { persistSession, changeUserLanguage, loggedInUser } = useAuth();
const { persistSession, loggedInUser } = useAuth();
const [session, setSession] = useState<DemoSession | null>(null);
const [busy, setBusy] = useState(true);
const [error, setError] = useState('');
Expand Down Expand Up @@ -100,7 +100,6 @@ export function DemoShell({ children }: PropsWithChildren): JSX.Element {
await queryClient.cancelQueries();
const next = await requestDemoSession(reset ? 'reset' : 'start');
queryClient.clear();
if (!reset) changeUserLanguage('en');
window.history.replaceState(null, '', paths.index);
acceptSession(next);
} catch (cause) {
Expand Down
1 change: 1 addition & 0 deletions src/core/config/localStorageKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ export const LOCAL_STORAGE_AUTH_NAME = {
REFRESH_TOKEN: `${LOCAL_STORAGE_APP_NAME}__auth__ref_tok_${window.location.hostname}`,
CONTEXT_ORG_SLUG: `${LOCAL_STORAGE_APP_NAME}__org__slug_${window.location.hostname}`,
CONTEXT_ORG_ID: `${LOCAL_STORAGE_APP_NAME}__org__id_${window.location.hostname}`,
DEMO_USER_LANGUAGE: `${LOCAL_STORAGE_APP_NAME}__demo__user__lang_${window.location.hostname}`,
USER_LANGUAGE: `${LOCAL_STORAGE_APP_NAME}__user__lang_${window.location.hostname}`,
};
53 changes: 53 additions & 0 deletions src/modules/auth/utils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { LOCAL_STORAGE_AUTH_NAME } from '@/core/config/localStorageKeys';
import { getUserLanguageFromLS, removeUserLanguageFromLS, saveUserLanguageInLS } from './utils';

const mode = vi.hoisted(() => ({ isDemo: false }));
vi.mock('@/core/config/demo', () => ({
get isDemo() {
return mode.isDemo;
},
}));

beforeEach(() => {
localStorage.clear();
mode.isDemo = false;
});

afterEach(() => localStorage.clear());

it('keeps the regular application language preference unchanged', () => {
saveUserLanguageInLS('pl');
expect(getUserLanguageFromLS()).toBe('pl');
expect(localStorage.getItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE)).toBe('pl');
removeUserLanguageFromLS();
expect(getUserLanguageFromLS()).toBeNull();
});

it('defaults a demo to English despite an older application preference', () => {
localStorage.setItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE, 'pl');
mode.isDemo = true;
expect(getUserLanguageFromLS()).toBe('en');
expect(localStorage.getItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE)).toBe('pl');
});

it('remembers explicit demo language changes without changing the regular application preference', () => {
saveUserLanguageInLS('en');
mode.isDemo = true;
saveUserLanguageInLS('pl');
expect(getUserLanguageFromLS()).toBe('pl');
mode.isDemo = false;
expect(getUserLanguageFromLS()).toBe('en');
mode.isDemo = true;
expect(getUserLanguageFromLS()).toBe('pl');
saveUserLanguageInLS('en');
expect(getUserLanguageFromLS()).toBe('en');
});

it('falls back to English when the demo preference is removed', () => {
localStorage.setItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE, 'pl');
mode.isDemo = true;
saveUserLanguageInLS('pl');
removeUserLanguageFromLS();
expect(getUserLanguageFromLS()).toBe('en');
expect(localStorage.getItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE)).toBe('pl');
});
10 changes: 7 additions & 3 deletions src/modules/auth/utils.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { isDemo } from '@/core/config/demo';
import { LOCAL_STORAGE_AUTH_NAME } from '@/core/config/localStorageKeys';

const getLanguageStorageKey = (): string =>
isDemo ? LOCAL_STORAGE_AUTH_NAME.DEMO_USER_LANGUAGE : LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE;

export const saveUserLanguageInLS = (lang: string): void => {
localStorage.setItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE, lang);
localStorage.setItem(getLanguageStorageKey(), lang);
};

export const removeUserLanguageFromLS = (): void => {
localStorage.removeItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE);
localStorage.removeItem(getLanguageStorageKey());
};

export const getUserLanguageFromLS = (): string | null => {
return localStorage.getItem(LOCAL_STORAGE_AUTH_NAME.USER_LANGUAGE);
return localStorage.getItem(getLanguageStorageKey()) || (isDemo ? 'en' : null);
};
Loading