Charles Bochet
ef499b6d47
## Summary - Re-enable one lint rule that was temporarily disabled during the ESLint-to-Oxlint migration: - **`twenty/sort-css-properties-alphabetically`** in twenty-front — 578 violations auto-fixed across 390 files - Document why **`typescript/consistent-type-imports`** cannot be auto-fixed in twenty-server: NestJS relies on `emitDecoratorMetadata` for DI, so converting constructor parameter imports to `import type` erases them at compile time and breaks dependency injection at runtime - Right-size CI runners, reducing 8-core usage from 18 jobs to 3: | Change | Jobs | Rationale | |--------|------|-----------| | **Keep 8-core** | `ci-merge-queue/e2e-test`, `ci-front/front-sb-build`, `ci-front/front-build` | Heavy builds needing max CPU + memory (10GB NODE_OPTIONS, full Storybook webpack bundling) | | **8-core → 4-core** | `ci-server` (build, lint-typecheck, validation, test, integration-test), `ci-front/front-sb-test`, `ci-zapier/server-setup`, `ci-sdk/sdk-e2e-test` | Already sharded into 10-12 parallel instances, I/O-bound (DB/Redis), or moderate single builds | | **8-core → 2-core** | `ci-emails/emails-test` | Trivially lightweight (build + curl health check) | | **Removed** | `ci-front/front-chromatic-deployment` | Dead code — permanently disabled with `if: false` | - Fix merge queue CI issues: - **Concurrency**: Use `merge_group.base_ref` instead of unique merge group ref so new queue entries cancel previous runs - **Required status checks**: Add `merge_group` trigger to all 6 required CI workflows (front, server, shared, website, docker-compose, sdk) with `changed-files-check` auto-skipped for merge_group events — status check jobs auto-pass without re-running full CI - **Build caching**: Add Nx build cache restore/save to E2E test job with fallback to `main` branch cache for faster frontend and server builds ## Test plan - [ ] CI passes on this PR (verifies lint rule auto-fix works) - [ ] Verify 4-core runner jobs complete within their 30-minute timeouts - [ ] Verify merge queue status checks auto-pass (ci-front-status-check, ci-server-status-check, etc.) - [ ] Verify merge queue E2E concurrency cancels previous runs when a new PR enters the queue
77 lines
2.3 KiB
TypeScript
77 lines
2.3 KiB
TypeScript
import { isDefined } from 'twenty-shared/utils';
|
|
import { styled } from '@linaria/react';
|
|
import { Handle, Position } from '@xyflow/react';
|
|
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
|
|
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
|
|
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
|
|
import { useIcons } from 'twenty-ui/display';
|
|
import { useContext } from 'react';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
import { RelationType } from '~/generated-metadata/graphql';
|
|
|
|
type ObjectFieldRowProps = {
|
|
field: FieldMetadataItem;
|
|
};
|
|
|
|
const StyledRow = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
gap: ${themeCssVariables.spacing[2]};
|
|
padding: 0 ${themeCssVariables.spacing[2]};
|
|
position: relative;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledFieldName = styled.div`
|
|
color: ${themeCssVariables.font.color.primary};
|
|
`;
|
|
|
|
export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);
|
|
const { getIcon } = useIcons();
|
|
|
|
const relatedObjectId = field.relation?.targetObjectMetadata.id;
|
|
|
|
const relatedObject = objectMetadataItems.find(
|
|
(x) => x.id === relatedObjectId,
|
|
);
|
|
|
|
const Icon = getIcon(relatedObject?.icon);
|
|
|
|
return (
|
|
<StyledRow>
|
|
{isDefined(Icon) && <Icon size={theme.icon.size.md} />}
|
|
<StyledFieldName>{relatedObject?.labelPlural ?? ''}</StyledFieldName>
|
|
<Handle
|
|
type={
|
|
field.relation?.type === RelationType.ONE_TO_MANY
|
|
? 'source'
|
|
: 'target'
|
|
}
|
|
position={Position.Right}
|
|
id={`${field.id}-right`}
|
|
className={
|
|
field.relation?.type === RelationType.ONE_TO_MANY
|
|
? 'right-handle source-handle'
|
|
: 'right-handle target-handle'
|
|
}
|
|
/>
|
|
<Handle
|
|
type={
|
|
field.relation?.type === RelationType.ONE_TO_MANY
|
|
? 'source'
|
|
: 'target'
|
|
}
|
|
position={Position.Left}
|
|
id={`${field.id}-left`}
|
|
className={
|
|
field.relation?.type === RelationType.ONE_TO_MANY
|
|
? 'left-handle source-handle'
|
|
: 'left-handle target-handle'
|
|
}
|
|
/>
|
|
</StyledRow>
|
|
);
|
|
};
|