f7cde28dd6
## Problem **CRITICAL:** Two PRs were accidentally reverted when PR #14347 "Prevent csv export injections" was merged: 1. **PR #14348** "[Page Layout] - Review Refactor" - ✅ **RESTORED** 2. **PR #14352** "Fix wrong path used by backend" - ✅ **RESTORED** ## Root Cause Analysis During the merge of PR #14347, there was a complex merge conflict with PR #14352 "Fix wrong path used by backend". The merge commit `324d7204bb` in the PR #14347 branch brought in changes from PR #14352, but during the conflict resolution, **BOTH PR #14348 and PR #14352's changes were accidentally overwritten**. ## What This PR Restores This PR restores **BOTH** PRs by cherry-picking their commits: ### ✅ PR #14348 Changes Restored: - `GraphWidgetRenderer.tsx` - was deleted, now restored - `WidgetRenderer.tsx` - was missing, now restored - `SettingsPageLayoutTabsInstanceId.ts` - was deleted, now restored - `useUpdatePageLayoutWidget.ts` - was renamed back, now restored with correct name - Multiple test files that were deleted - Several hook files that were renamed/reverted - File renames: `usePageLayoutWidgetUpdate.ts` → `useUpdatePageLayoutWidget.ts` - Hook refactoring and test file organization - Page layout component improvements ### ✅ PR #14352 Changes Restored: - **Types moved to twenty-shared:** - `packages/twenty-shared/src/types/AppBasePath.ts` ✅ RESTORED - `packages/twenty-shared/src/types/AppPath.ts` ✅ RESTORED - `packages/twenty-shared/src/types/SettingsPath.ts` ✅ RESTORED - **Navigation utilities moved to twenty-shared:** - `packages/twenty-shared/src/utils/navigation/getAppPath.ts` ✅ RESTORED - `packages/twenty-shared/src/utils/navigation/getSettingsPath.ts` ✅ RESTORED - **200+ import statements updated** across the codebase to use twenty-shared - **Old type files deleted** from twenty-front/src/modules/types/ ## Evidence of Complete Restoration **Before (reverted state):** - ❌ Types were in `packages/twenty-front/src/modules/types/` - ❌ Page layout files missing - ❌ Hook files incorrectly named **After (this PR):** - ✅ Types correctly in `packages/twenty-shared/src/types/` - ✅ All page layout files restored - ✅ Hook files correctly named - ✅ All import statements updated ## Verification **Total changes:** - PR #14348: 36 files changed, 863 insertions(+), 442 deletions(-) - PR #14352: 243 files changed, 492 insertions(+), 461 deletions(-) - **Combined: 279 files changed, 1355 insertions(+), 903 deletions(-)** ## Impact This completely restores both PRs that were accidentally lost, ensuring: 1. Page layout refactoring work is back 2. Type organization and path utilities are correctly in twenty-shared 3. Backend email paths work correctly again 4. No functionality is lost Fixes the reversion caused by the merge conflict in PR #14347. --------- Co-authored-by: nitin <142569587+ehconitin@users.noreply.github.com>
75 lines
2.1 KiB
TypeScript
75 lines
2.1 KiB
TypeScript
import { renderHook } from '@testing-library/react';
|
|
import { MemoryRouter, useNavigate } from 'react-router-dom';
|
|
|
|
import { SettingsPath } from 'twenty-shared/types';
|
|
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
|
|
|
|
jest.mock('react-router-dom', () => ({
|
|
...jest.requireActual('react-router-dom'),
|
|
useNavigate: jest.fn(),
|
|
}));
|
|
|
|
const Wrapper = ({ children }: { children: React.ReactNode }) => (
|
|
<MemoryRouter>{children}</MemoryRouter>
|
|
);
|
|
|
|
describe('useNavigateSettings', () => {
|
|
const mockNavigate = jest.fn();
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
(useNavigate as jest.Mock).mockReturnValue(mockNavigate);
|
|
});
|
|
|
|
it('should navigate to the correct settings path without params', () => {
|
|
const { result } = renderHook(() => useNavigateSettings(), {
|
|
wrapper: Wrapper,
|
|
});
|
|
|
|
result.current(SettingsPath.Accounts);
|
|
|
|
expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts', undefined);
|
|
});
|
|
|
|
it('should navigate to the correct settings path with params', () => {
|
|
const { result } = renderHook(() => useNavigateSettings(), {
|
|
wrapper: Wrapper,
|
|
});
|
|
|
|
result.current(SettingsPath.ObjectFieldEdit, {
|
|
objectNamePlural: 'companies',
|
|
fieldName: 'name',
|
|
});
|
|
|
|
expect(mockNavigate).toHaveBeenCalledWith(
|
|
'/settings/objects/companies/name',
|
|
undefined,
|
|
);
|
|
});
|
|
|
|
it('should navigate with query params', () => {
|
|
const { result } = renderHook(() => useNavigateSettings(), {
|
|
wrapper: Wrapper,
|
|
});
|
|
|
|
const queryParams = { viewId: '123', filter: 'test' };
|
|
result.current(SettingsPath.Accounts, undefined, queryParams);
|
|
|
|
expect(mockNavigate).toHaveBeenCalledWith(
|
|
'/settings/accounts?viewId=123&filter=test',
|
|
undefined,
|
|
);
|
|
});
|
|
|
|
it('should navigate with options', () => {
|
|
const { result } = renderHook(() => useNavigateSettings(), {
|
|
wrapper: Wrapper,
|
|
});
|
|
|
|
const options = { replace: true, state: { test: true } };
|
|
result.current(SettingsPath.Accounts, undefined, undefined, options);
|
|
|
|
expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts', options);
|
|
});
|
|
});
|