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>
114 lines
3.4 KiB
TypeScript
114 lines
3.4 KiB
TypeScript
import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
|
|
import { useEffect, useState } from 'react';
|
|
import { useRecoilCallback, useRecoilValue } from 'recoil';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
|
|
import {
|
|
pageLayoutCurrentLayoutsState,
|
|
type TabLayouts,
|
|
} from '../states/pageLayoutCurrentLayoutsState';
|
|
import { pageLayoutDraftState } from '../states/pageLayoutDraftState';
|
|
import { pageLayoutPersistedState } from '../states/pageLayoutPersistedState';
|
|
import {
|
|
PageLayoutType,
|
|
savedPageLayoutsState,
|
|
type SavedPageLayout,
|
|
} from '../states/savedPageLayoutsState';
|
|
|
|
type PageLayoutInitializationEffectProps = {
|
|
layoutId: string | undefined;
|
|
isEditMode: boolean;
|
|
};
|
|
|
|
export const PageLayoutInitializationEffect = ({
|
|
layoutId,
|
|
isEditMode,
|
|
}: PageLayoutInitializationEffectProps) => {
|
|
const [isInitialized, setIsInitialized] = useState(false);
|
|
const savedPageLayouts = useRecoilValue(savedPageLayoutsState);
|
|
|
|
const initializePageLayout = useRecoilCallback(
|
|
({ set, snapshot }) =>
|
|
(layout: SavedPageLayout | undefined) => {
|
|
const currentPersisted = getSnapshotValue(
|
|
snapshot,
|
|
pageLayoutPersistedState,
|
|
);
|
|
|
|
if (isDefined(layout)) {
|
|
if (!isDeeplyEqual(layout, currentPersisted)) {
|
|
set(pageLayoutPersistedState, layout);
|
|
set(pageLayoutDraftState, {
|
|
name: layout.name,
|
|
type: layout.type,
|
|
objectMetadataId: layout.objectMetadataId,
|
|
tabs: layout.tabs,
|
|
});
|
|
|
|
if (layout.tabs.length > 0) {
|
|
const tabLayouts: TabLayouts = {};
|
|
layout.tabs.forEach((tab) => {
|
|
const layouts = tab.widgets.map((w) => ({
|
|
i: w.id,
|
|
x: w.gridPosition.column,
|
|
y: w.gridPosition.row,
|
|
w: w.gridPosition.columnSpan,
|
|
h: w.gridPosition.rowSpan,
|
|
}));
|
|
tabLayouts[tab.id] = {
|
|
desktop: layouts,
|
|
mobile: layouts.map((l) => ({ ...l, w: 1, x: 0 })),
|
|
};
|
|
});
|
|
set(pageLayoutCurrentLayoutsState, tabLayouts);
|
|
} else {
|
|
set(pageLayoutCurrentLayoutsState, {});
|
|
}
|
|
}
|
|
} else {
|
|
const defaultTab = {
|
|
id: `tab-${uuidv4()}`,
|
|
title: 'Main',
|
|
position: 0,
|
|
pageLayoutId: '',
|
|
widgets: [],
|
|
createdAt: new Date().toISOString(),
|
|
updatedAt: new Date().toISOString(),
|
|
deletedAt: null,
|
|
};
|
|
|
|
set(pageLayoutDraftState, {
|
|
name: '',
|
|
type: PageLayoutType.DASHBOARD,
|
|
objectMetadataId: null,
|
|
tabs: [defaultTab],
|
|
});
|
|
set(pageLayoutPersistedState, undefined);
|
|
set(pageLayoutCurrentLayoutsState, {
|
|
[defaultTab.id]: { desktop: [], mobile: [] },
|
|
});
|
|
}
|
|
},
|
|
[],
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (!isInitialized) {
|
|
const existingLayout = isEditMode
|
|
? savedPageLayouts.find((l) => l.id === layoutId)
|
|
: undefined;
|
|
initializePageLayout(existingLayout);
|
|
setIsInitialized(true);
|
|
}
|
|
}, [
|
|
layoutId,
|
|
savedPageLayouts,
|
|
initializePageLayout,
|
|
isInitialized,
|
|
isEditMode,
|
|
]);
|
|
|
|
return null;
|
|
};
|