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>
176 lines
5.8 KiB
TypeScript
176 lines
5.8 KiB
TypeScript
import { useTheme } from '@emotion/react';
|
|
import styled from '@emotion/styled';
|
|
import { type Node, type NodeProps } from '@xyflow/react';
|
|
import { Link } from 'react-router-dom';
|
|
|
|
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
|
|
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
|
|
import { ObjectFieldRow } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewField';
|
|
import { SettingsDataModelObjectTypeTag } from '@/settings/data-model/objects/components/SettingsDataModelObjectTypeTag';
|
|
import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
|
|
import { FieldMetadataType } from '~/generated-metadata/graphql';
|
|
|
|
import { ObjectFieldRowWithoutRelation } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation';
|
|
import '@xyflow/react/dist/style.css';
|
|
import { useState } from 'react';
|
|
import { SettingsPath } from 'twenty-shared/types';
|
|
import { getSettingsPath } from 'twenty-shared/utils';
|
|
import { IconChevronDown, IconChevronUp, useIcons } from 'twenty-ui/display';
|
|
|
|
type SettingsDataModelOverviewObjectNode = Node<ObjectMetadataItem, 'object'>;
|
|
type SettingsDataModelOverviewObjectProps =
|
|
NodeProps<SettingsDataModelOverviewObjectNode>;
|
|
|
|
const StyledNode = styled.div`
|
|
background-color: ${({ theme }) => theme.background.secondary};
|
|
border-radius: ${({ theme }) => theme.border.radius.md};
|
|
display: flex;
|
|
flex-direction: column;
|
|
width: 220px;
|
|
padding: ${({ theme }) => theme.spacing(2)};
|
|
gap: ${({ theme }) => theme.spacing(2)};
|
|
border: 1px solid ${({ theme }) => theme.border.color.medium};
|
|
box-shadow: ${({ theme }) => theme.boxShadow.light};
|
|
`;
|
|
|
|
const StyledHeader = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
`;
|
|
|
|
const StyledObjectName = styled.div`
|
|
border: 0;
|
|
border-radius: 4px 4px 0 0;
|
|
display: flex;
|
|
font-weight: ${({ theme }) => theme.font.weight.medium};
|
|
gap: ${({ theme }) => theme.spacing(1)};
|
|
position: relative;
|
|
text-align: center;
|
|
`;
|
|
|
|
const StyledInnerCard = styled.div`
|
|
border: 1px solid ${({ theme }) => theme.border.color.light};
|
|
background-color: ${({ theme }) => theme.background.primary};
|
|
border-radius: ${({ theme }) => theme.border.radius.sm};
|
|
padding: ${({ theme }) => theme.spacing(2)} 0
|
|
${({ theme }) => theme.spacing(2)} 0;
|
|
display: flex;
|
|
flex-flow: column nowrap;
|
|
gap: ${({ theme }) => theme.spacing(0.5)};
|
|
color: ${({ theme }) => theme.font.color.tertiary};
|
|
`;
|
|
|
|
const StyledCardRow = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
height: 24px;
|
|
gap: ${({ theme }) => theme.spacing(1)};
|
|
`;
|
|
|
|
const StyledCardRowOther = styled.div`
|
|
align-items: center;
|
|
cursor: pointer;
|
|
display: flex;
|
|
height: 24px;
|
|
padding: 0 ${({ theme }) => theme.spacing(2)};
|
|
gap: ${({ theme }) => theme.spacing(2)};
|
|
|
|
&:hover {
|
|
background-color: ${({ theme }) => theme.background.tertiary};
|
|
}
|
|
`;
|
|
|
|
const StyledCardRowText = styled.div``;
|
|
|
|
const StyledObjectInstanceCount = styled.div`
|
|
color: ${({ theme }) => theme.font.color.tertiary};
|
|
`;
|
|
|
|
const StyledObjectLink = styled(Link)`
|
|
align-items: center;
|
|
display: flex;
|
|
gap: ${({ theme }) => theme.spacing(1)};
|
|
text-decoration: none;
|
|
color: ${({ theme }) => theme.font.color.primary};
|
|
|
|
&:hover {
|
|
color: ${({ theme }) => theme.font.color.secondary};
|
|
}
|
|
`;
|
|
|
|
export const SettingsDataModelOverviewObject = ({
|
|
data: objectMetadataItem,
|
|
}: SettingsDataModelOverviewObjectProps) => {
|
|
const theme = useTheme();
|
|
const { getIcon } = useIcons();
|
|
const [otherFieldsExpanded, setOtherFieldsExpanded] = useState(false);
|
|
|
|
const { totalCount } = useFindManyRecords({
|
|
objectNameSingular: objectMetadataItem.nameSingular,
|
|
});
|
|
|
|
const fields = objectMetadataItem.fields.filter(
|
|
(x) => !x.isSystem && x.isActive,
|
|
);
|
|
|
|
const countNonRelation = fields.filter(
|
|
(x) => x.type !== FieldMetadataType.RELATION,
|
|
).length;
|
|
|
|
const Icon = getIcon(objectMetadataItem.icon);
|
|
|
|
return (
|
|
<StyledNode>
|
|
<StyledHeader>
|
|
<StyledObjectName onMouseEnter={() => {}} onMouseLeave={() => {}}>
|
|
<StyledObjectLink
|
|
to={getSettingsPath(SettingsPath.Objects, {
|
|
objectNamePlural: objectMetadataItem.namePlural,
|
|
})}
|
|
>
|
|
{Icon && <Icon size={theme.icon.size.md} />}
|
|
{objectMetadataItem.labelPlural}
|
|
</StyledObjectLink>
|
|
<StyledObjectInstanceCount> · {totalCount}</StyledObjectInstanceCount>
|
|
</StyledObjectName>
|
|
<SettingsDataModelObjectTypeTag
|
|
objectTypeLabel={getObjectTypeLabel(objectMetadataItem)}
|
|
></SettingsDataModelObjectTypeTag>
|
|
</StyledHeader>
|
|
|
|
<StyledInnerCard>
|
|
{fields
|
|
.filter((x) => x.type === FieldMetadataType.RELATION)
|
|
.map((field) => (
|
|
<StyledCardRow key={field.id}>
|
|
<ObjectFieldRow field={field} />
|
|
</StyledCardRow>
|
|
))}
|
|
{countNonRelation > 0 && (
|
|
<>
|
|
<StyledCardRowOther
|
|
onClick={() => setOtherFieldsExpanded(!otherFieldsExpanded)}
|
|
>
|
|
{otherFieldsExpanded ? (
|
|
<IconChevronUp size={theme.icon.size.md} />
|
|
) : (
|
|
<IconChevronDown size={theme.icon.size.md} />
|
|
)}
|
|
<StyledCardRowText>{countNonRelation} fields</StyledCardRowText>
|
|
</StyledCardRowOther>
|
|
{otherFieldsExpanded &&
|
|
fields
|
|
.filter((x) => x.type !== FieldMetadataType.RELATION)
|
|
.map((field) => (
|
|
<StyledCardRow key={field.id}>
|
|
<ObjectFieldRowWithoutRelation field={field} />
|
|
</StyledCardRow>
|
|
))}
|
|
</>
|
|
)}
|
|
</StyledInnerCard>
|
|
</StyledNode>
|
|
);
|
|
};
|