mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

190 display ctrl instead of for windows users (#9617)

Browse Source 
Closes https://github.com/twentyhq/core-team-issues/issues/190

<img width="226" alt="Capture d’écran 2025-01-15 à 12 07 12"
src="https://github.com/user-attachments/assets/b9a13746-2629-477a-9795-cda03c63f8f6"
/>

To test, update the user agent in your browser dev tools:
<img width="459" alt="Capture d’écran 2025-01-15 à 12 14 29"
src="https://github.com/user-attachments/assets/4371d5fc-fd3c-403d-beaa-7ba58019d3c9"
/>
This commit is contained in:
Raphaël Bosi
2025-01-15 13:53:18 +01:00
committed by GitHub
parent 9ba510eb3f
commit ff93fd3c74
17 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/twenty-ui/src/utilities/device/__tests__/getOsControlSymbol.test.ts Normal file
View File

@ -0,0 +1,27 @@
import { getOsControlSymbol } from '../getOsControlSymbol';
describe('getOsControlSymbol', () => {
let userAgentSpy: jest.SpyInstance;
beforeEach(() => {
userAgentSpy = jest.spyOn(window.navigator, 'userAgent', 'get');
});
afterEach(() => {
userAgentSpy.mockRestore();
});
it('should return Ctrl for Windows', () => {
userAgentSpy.mockReturnValue(
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:124.0) Gecko/20100101 Firefox/124.0',
);
expect(getOsControlSymbol()).toBe('Ctrl');
});
it('should return ⌘ for Mac', () => {
userAgentSpy.mockReturnValue(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
);
expect(getOsControlSymbol()).toBe('⌘');
});
});

27
packages/twenty-ui/src/utilities/device/__tests__/getOsShortcutSeparator.test.ts Normal file
View File

@ -0,0 +1,27 @@
import { getOsShortcutSeparator } from '../getOsShortcutSeparator';
describe('getOsShortcutSeparator', () => {
let userAgentSpy: jest.SpyInstance;
beforeEach(() => {
userAgentSpy = jest.spyOn(window.navigator, 'userAgent', 'get');
});
afterEach(() => {
userAgentSpy.mockRestore();
});
it('should return space for Windows', () => {
userAgentSpy.mockReturnValue(
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:124.0) Gecko/20100101 Firefox/124.0',
);
expect(getOsShortcutSeparator()).toBe(' ');
});
it('should return empty string for Mac', () => {
userAgentSpy.mockReturnValue(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
);
expect(getOsShortcutSeparator()).toBe('');
});
});