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>
76 lines
3.0 KiB
TypeScript
76 lines
3.0 KiB
TypeScript
import { ActionMenuContextProvider } from '@/action-menu/contexts/ActionMenuContextProvider';
|
|
import { CommandMenuContainer } from '@/command-menu/components/CommandMenuContainer';
|
|
import { CommandMenuContextChipRecordSetterEffect } from '@/command-menu/components/CommandMenuContextChipRecordSetterEffect';
|
|
import { CommandMenuTopBar } from '@/command-menu/components/CommandMenuTopBar';
|
|
import { COMMAND_MENU_PAGES_CONFIG } from '@/command-menu/constants/CommandMenuPagesConfig';
|
|
import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageInfoState';
|
|
import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
|
|
import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext';
|
|
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
|
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
|
import { useTheme } from '@emotion/react';
|
|
import styled from '@emotion/styled';
|
|
import { motion } from 'framer-motion';
|
|
import { useLocation } from 'react-router-dom';
|
|
import { useRecoilValue } from 'recoil';
|
|
import { SettingsPath } from 'twenty-shared/types';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
|
|
const StyledCommandMenuContent = styled.div`
|
|
flex: 1;
|
|
overflow-y: auto;
|
|
`;
|
|
|
|
export const CommandMenuRouter = () => {
|
|
const commandMenuPage = useRecoilValue(commandMenuPageState);
|
|
const commandMenuPageInfo = useRecoilValue(commandMenuPageInfoState);
|
|
const location = useLocation();
|
|
const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
|
|
|
|
const commandMenuPageComponent = isDefined(commandMenuPage) ? (
|
|
COMMAND_MENU_PAGES_CONFIG.get(commandMenuPage)
|
|
) : (
|
|
<></>
|
|
);
|
|
|
|
const theme = useTheme();
|
|
|
|
const isSettingsPage = location.pathname.includes(SettingsPath.PageLayout);
|
|
const objectMetadataItemOverride = isSettingsPage
|
|
? objectMetadataItems.find(
|
|
(item) => item.nameSingular === CoreObjectNameSingular.Dashboard,
|
|
)
|
|
: undefined;
|
|
|
|
return (
|
|
<CommandMenuContainer>
|
|
<CommandMenuContextChipRecordSetterEffect />
|
|
<CommandMenuPageComponentInstanceContext.Provider
|
|
value={{ instanceId: commandMenuPageInfo.instanceId }}
|
|
>
|
|
<motion.div
|
|
initial={{ opacity: 0 }}
|
|
animate={{ opacity: 1 }}
|
|
exit={{ opacity: 0 }}
|
|
transition={{
|
|
duration: theme.animation.duration.instant,
|
|
delay: 0.1,
|
|
}}
|
|
>
|
|
<CommandMenuTopBar />
|
|
</motion.div>
|
|
<StyledCommandMenuContent>
|
|
<ActionMenuContextProvider
|
|
isInRightDrawer={true}
|
|
displayType="listItem"
|
|
actionMenuType="command-menu"
|
|
objectMetadataItemOverride={objectMetadataItemOverride}
|
|
>
|
|
{commandMenuPageComponent}
|
|
</ActionMenuContextProvider>
|
|
</StyledCommandMenuContent>
|
|
</CommandMenuPageComponentInstanceContext.Provider>
|
|
</CommandMenuContainer>
|
|
);
|
|
};
|