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
108 lines
3.0 KiB
TypeScript
108 lines
3.0 KiB
TypeScript
import { styled } from '@linaria/react';
|
|
import { type ComponentType, useContext } from 'react';
|
|
|
|
import { SettingsListSkeletonCard } from '@/settings/components/SettingsListSkeletonCard';
|
|
|
|
import { type IconComponent, IconPlus } from 'twenty-ui/display';
|
|
import { Card, CardFooter } from 'twenty-ui/layout';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
import { SettingsListItemCardContent } from './SettingsListItemCardContent';
|
|
|
|
const StyledFooterContainer = styled.div`
|
|
> * {
|
|
align-items: center;
|
|
display: flex;
|
|
padding: ${themeCssVariables.spacing[1]};
|
|
}
|
|
`;
|
|
|
|
const StyledButton = styled.button`
|
|
align-items: center;
|
|
background: ${themeCssVariables.background.primary};
|
|
border: none;
|
|
border-radius: ${themeCssVariables.border.radius.sm};
|
|
color: ${themeCssVariables.font.color.secondary};
|
|
cursor: pointer;
|
|
display: flex;
|
|
flex: 1 0 0;
|
|
gap: ${themeCssVariables.spacing[2]};
|
|
height: ${themeCssVariables.spacing[8]};
|
|
padding: 0 ${themeCssVariables.spacing[1]};
|
|
padding-left: ${themeCssVariables.spacing[2]};
|
|
width: 100%;
|
|
|
|
&:hover {
|
|
background: ${themeCssVariables.background.transparent.light};
|
|
}
|
|
`;
|
|
|
|
type SettingsListCardProps<ListItem extends { id: string }> = {
|
|
items: ListItem[];
|
|
getItemLabel: (item: ListItem) => string;
|
|
getItemDescription?: (item: ListItem) => string;
|
|
hasFooter?: boolean;
|
|
isLoading?: boolean;
|
|
onRowClick?: (item: ListItem) => void;
|
|
RowIcon?: IconComponent;
|
|
RowIconFn?: (item: ListItem) => IconComponent;
|
|
RowIconColor?: string;
|
|
RowRightComponent: ComponentType<{ item: ListItem }>;
|
|
footerButtonLabel?: string;
|
|
onFooterButtonClick?: () => void;
|
|
to?: (item: ListItem) => string;
|
|
rounded?: boolean;
|
|
};
|
|
|
|
export const SettingsListCard = <
|
|
ListItem extends { id: string } = {
|
|
id: string;
|
|
},
|
|
>({
|
|
items,
|
|
getItemLabel,
|
|
getItemDescription,
|
|
hasFooter,
|
|
isLoading,
|
|
onRowClick,
|
|
RowIcon,
|
|
RowIconFn,
|
|
RowIconColor,
|
|
RowRightComponent,
|
|
onFooterButtonClick,
|
|
footerButtonLabel,
|
|
to,
|
|
rounded,
|
|
}: SettingsListCardProps<ListItem>) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
|
|
if (isLoading === true) return <SettingsListSkeletonCard />;
|
|
|
|
return (
|
|
<Card rounded={rounded}>
|
|
{items.map((item, index) => (
|
|
<SettingsListItemCardContent
|
|
key={item.id}
|
|
LeftIcon={RowIconFn ? RowIconFn(item) : RowIcon}
|
|
LeftIconColor={RowIconColor}
|
|
label={getItemLabel(item)}
|
|
description={getItemDescription?.(item)}
|
|
rightComponent={<RowRightComponent item={item} />}
|
|
divider={index < items.length - 1}
|
|
onClick={onRowClick ? () => onRowClick?.(item) : undefined}
|
|
to={to?.(item)}
|
|
/>
|
|
))}
|
|
{hasFooter && (
|
|
<StyledFooterContainer>
|
|
<CardFooter divider={!!items.length}>
|
|
<StyledButton onClick={onFooterButtonClick}>
|
|
<IconPlus size={theme.icon.size.md} />
|
|
{footerButtonLabel}
|
|
</StyledButton>
|
|
</CardFooter>
|
|
</StyledFooterContainer>
|
|
)}
|
|
</Card>
|
|
);
|
|
};
|