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
121 lines
2.9 KiB
TypeScript
121 lines
2.9 KiB
TypeScript
import { styled } from '@linaria/react';
|
|
import { type ReactNode, useContext } from 'react';
|
|
import { Link } from 'react-router-dom';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
import { IconChevronRight, type IconComponent } from 'twenty-ui/display';
|
|
import { CardContent } from 'twenty-ui/layout';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
|
|
const StyledRowContainer = styled.div`
|
|
> * {
|
|
align-items: center;
|
|
display: flex;
|
|
font-size: ${themeCssVariables.font.size.sm};
|
|
font-weight: ${themeCssVariables.font.weight.medium};
|
|
gap: ${themeCssVariables.spacing[2]};
|
|
min-height: ${themeCssVariables.spacing[6]};
|
|
padding: ${themeCssVariables.spacing[2]};
|
|
padding-left: ${themeCssVariables.spacing[3]};
|
|
}
|
|
`;
|
|
|
|
const StyledRightContainer = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
gap: ${themeCssVariables.spacing[1]};
|
|
`;
|
|
|
|
const StyledContent = styled.div`
|
|
display: flex;
|
|
flex: 1 1 0;
|
|
gap: ${themeCssVariables.spacing[1]};
|
|
min-width: 0;
|
|
overflow: hidden;
|
|
`;
|
|
|
|
const StyledLabel = styled.span`
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
white-space: nowrap;
|
|
`;
|
|
|
|
const StyledDescription = styled.span`
|
|
color: ${themeCssVariables.font.color.light};
|
|
font-weight: ${themeCssVariables.font.weight.regular};
|
|
padding-left: ${themeCssVariables.spacing[1]};
|
|
`;
|
|
|
|
const StyledLinkContainer = styled.div`
|
|
> a {
|
|
color: ${themeCssVariables.font.color.secondary};
|
|
text-decoration: none;
|
|
}
|
|
`;
|
|
|
|
type SettingsListItemCardContentProps = {
|
|
label: string;
|
|
description?: string;
|
|
divider?: boolean;
|
|
LeftIcon?: IconComponent;
|
|
LeftIconColor?: string;
|
|
onClick?: () => void;
|
|
rightComponent: ReactNode;
|
|
to?: string;
|
|
};
|
|
|
|
export const SettingsListItemCardContent = ({
|
|
label,
|
|
description,
|
|
divider,
|
|
LeftIcon,
|
|
LeftIconColor,
|
|
onClick,
|
|
rightComponent,
|
|
to,
|
|
}: SettingsListItemCardContentProps) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
|
|
const content = (
|
|
<StyledRowContainer>
|
|
<CardContent
|
|
onClick={onClick}
|
|
divider={divider}
|
|
isClickable={!!onClick || !!to}
|
|
hasHoverHighlight={!!to}
|
|
>
|
|
{!!LeftIcon && (
|
|
<LeftIcon
|
|
size={theme.icon.size.md}
|
|
color={LeftIconColor ?? 'currentColor'}
|
|
/>
|
|
)}
|
|
<StyledContent>
|
|
<StyledLabel>{label}</StyledLabel>
|
|
{!!description && (
|
|
<StyledDescription>{description}</StyledDescription>
|
|
)}
|
|
</StyledContent>
|
|
<StyledRightContainer>
|
|
{rightComponent}
|
|
{!!to && (
|
|
<IconChevronRight
|
|
size={theme.icon.size.md}
|
|
color={theme.font.color.tertiary}
|
|
/>
|
|
)}
|
|
</StyledRightContainer>
|
|
</CardContent>
|
|
</StyledRowContainer>
|
|
);
|
|
|
|
if (isDefined(to)) {
|
|
return (
|
|
<StyledLinkContainer>
|
|
<Link to={to}>{content}</Link>
|
|
</StyledLinkContainer>
|
|
);
|
|
}
|
|
|
|
return content;
|
|
};
|