Re-enable disabled lint rules and right-size CI runners (#18461)
## 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
This commit is contained in:
+1
-1
@@ -5,10 +5,10 @@ const StyledSelectStepTitle = styled.span`
|
||||
color: ${themeCssVariables.font.color.tertiary};
|
||||
font-size: ${themeCssVariables.font.size.sm};
|
||||
font-weight: ${themeCssVariables.font.weight.medium};
|
||||
padding-top: ${themeCssVariables.spacing[2]};
|
||||
padding-bottom: ${themeCssVariables.spacing[1]};
|
||||
padding-left: ${themeCssVariables.spacing[1]};
|
||||
padding-right: ${themeCssVariables.spacing[1]};
|
||||
padding-top: ${themeCssVariables.spacing[2]};
|
||||
`;
|
||||
|
||||
export { StyledSelectStepTitle as SidePanelWorkflowSelectStepTitle };
|
||||
|
||||
+1
-1
@@ -16,6 +16,7 @@ const StyledWorkflowStepBody = styled.div<{
|
||||
display: ${({ display }) => display ?? 'flex'};
|
||||
flex: 1 1 auto;
|
||||
flex-direction: column;
|
||||
grid-template-rows: ${({ gridTemplateRows }) => gridTemplateRows ?? 'none'};
|
||||
height: 100%;
|
||||
overflow: ${({ overflow }) => overflow ?? 'hidden scroll'};
|
||||
padding-block: ${({ paddingBlock }) =>
|
||||
@@ -23,7 +24,6 @@ const StyledWorkflowStepBody = styled.div<{
|
||||
padding-inline: ${({ paddingInline }) =>
|
||||
paddingInline ?? themeCssVariables.spacing[3]};
|
||||
row-gap: ${({ rowGap }) => rowGap ?? themeCssVariables.spacing[4]};
|
||||
grid-template-rows: ${({ gridTemplateRows }) => gridTemplateRows ?? 'none'};
|
||||
`;
|
||||
|
||||
export const WorkflowStepBody = ({
|
||||
|
||||
+1
-1
@@ -22,8 +22,8 @@ type WorkflowStepFilterColumnProps = {
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
gap: ${themeCssVariables.spacing[1]};
|
||||
justify-content: space-between;
|
||||
`;
|
||||
|
||||
export const WorkflowStepFilterColumn = ({
|
||||
|
||||
+1
-1
@@ -17,8 +17,8 @@ type WorkflowStepFilterGroupColumnProps = {
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
gap: ${themeCssVariables.spacing[1]};
|
||||
justify-content: space-between;
|
||||
`;
|
||||
|
||||
export const WorkflowStepFilterGroupColumn = ({
|
||||
|
||||
+1
-1
@@ -25,9 +25,9 @@ const StyledNumber = styled.span`
|
||||
|
||||
const StyledContainer = styled.div`
|
||||
align-items: start;
|
||||
color: ${themeCssVariables.font.color.tertiary};
|
||||
display: flex;
|
||||
min-width: ${themeCssVariables.spacing[20]};
|
||||
color: ${themeCssVariables.font.color.tertiary};
|
||||
`;
|
||||
|
||||
type WorkflowStepFilterLogicalOperatorCellProps = {
|
||||
|
||||
+8
-8
@@ -20,15 +20,15 @@ export const StyledLabel = ({ children }: { children: React.ReactNode }) => (
|
||||
|
||||
export const StyledRow = styled.div<{ isDisabled?: boolean }>`
|
||||
align-items: center;
|
||||
border-radius: ${themeCssVariables.spacing[1]};
|
||||
box-sizing: border-box;
|
||||
cursor: ${({ isDisabled }) => (isDisabled ? 'not-allowed' : 'pointer')};
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
padding: ${themeCssVariables.spacing[1]};
|
||||
box-sizing: border-box;
|
||||
border-radius: ${themeCssVariables.spacing[1]};
|
||||
cursor: ${({ isDisabled }) => (isDisabled ? 'not-allowed' : 'pointer')};
|
||||
opacity: ${({ isDisabled }) => (isDisabled ? 0.5 : 1)};
|
||||
padding: ${themeCssVariables.spacing[1]};
|
||||
pointer-events: ${({ isDisabled }) => (isDisabled ? 'none' : 'auto')};
|
||||
width: 100%;
|
||||
|
||||
:hover {
|
||||
background-color: ${({ isDisabled }) =>
|
||||
@@ -59,13 +59,13 @@ export const StyledList = styled.div`
|
||||
`;
|
||||
|
||||
export const StyledIconContainer = styled.div`
|
||||
align-items: center;
|
||||
background-color: ${themeCssVariables.background.tertiary};
|
||||
padding: ${themeCssVariables.spacing[1]};
|
||||
border-radius: ${themeCssVariables.spacing[1]};
|
||||
color: ${themeCssVariables.font.color.tertiary};
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
color: ${themeCssVariables.font.color.tertiary};
|
||||
padding: ${themeCssVariables.spacing[1]};
|
||||
`;
|
||||
|
||||
const StyledIconChevronRightWrapper = styled.div`
|
||||
|
||||
+5
-5
@@ -27,14 +27,14 @@ import { WorkflowAiAgentPermissionsObjectsList } from './WorkflowAiAgentPermissi
|
||||
import { getFilteredPermissions } from './workflowAiAgentPermissions.utils';
|
||||
import { themeCssVariables } from 'twenty-ui/theme-constants';
|
||||
const StyledSearchInputContainer = styled.div`
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
border-block: 1px solid ${themeCssVariables.border.color.medium};
|
||||
height: 40px;
|
||||
width: 100%;
|
||||
& input {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
width: 100%;
|
||||
}
|
||||
`;
|
||||
@@ -44,7 +44,6 @@ const StyledBackButtonText = styled.span`
|
||||
`;
|
||||
|
||||
const StyledBackButton = styled.button`
|
||||
width: 100%;
|
||||
align-items: center;
|
||||
background: none;
|
||||
border: none;
|
||||
@@ -54,6 +53,7 @@ const StyledBackButton = styled.button`
|
||||
gap: ${themeCssVariables.spacing[1]};
|
||||
padding: ${themeCssVariables.spacing[3]};
|
||||
text-align: left;
|
||||
width: 100%;
|
||||
|
||||
&:hover {
|
||||
color: ${themeCssVariables.font.color.primary};
|
||||
|
||||
+5
-5
@@ -48,10 +48,10 @@ const StyledSettingsHeader = styled.div`
|
||||
border-bottom: 1px solid ${themeCssVariables.border.color.light};
|
||||
display: grid;
|
||||
gap: ${themeCssVariables.spacing[1]};
|
||||
padding-right: ${themeCssVariables.spacing[2]};
|
||||
padding-left: ${themeCssVariables.spacing[3]};
|
||||
grid-template-columns: 1fr 24px;
|
||||
padding-bottom: ${themeCssVariables.spacing[2]};
|
||||
padding-left: ${themeCssVariables.spacing[3]};
|
||||
padding-right: ${themeCssVariables.spacing[2]};
|
||||
`;
|
||||
|
||||
const StyledTitleContainer = styled.div`
|
||||
@@ -68,6 +68,7 @@ const StyledCloseButtonContainer = styled.div`
|
||||
|
||||
const StyledAddFieldButton = styled.button`
|
||||
align-items: center;
|
||||
background-color: ${themeCssVariables.background.transparent.lighter};
|
||||
border: 1px solid ${themeCssVariables.border.color.light};
|
||||
border-radius: ${themeCssVariables.border.radius.sm};
|
||||
color: ${themeCssVariables.font.color.secondary};
|
||||
@@ -80,7 +81,6 @@ const StyledAddFieldButton = styled.button`
|
||||
margin-top: ${themeCssVariables.spacing[2]};
|
||||
padding: ${themeCssVariables.spacing[2]};
|
||||
width: 100%;
|
||||
background-color: ${themeCssVariables.background.transparent.lighter};
|
||||
|
||||
&:hover {
|
||||
background-color: ${themeCssVariables.background.transparent.light};
|
||||
@@ -88,12 +88,12 @@ const StyledAddFieldButton = styled.button`
|
||||
`;
|
||||
|
||||
const StyledMessageContentContainer = styled.div`
|
||||
flex-direction: column;
|
||||
color: ${themeCssVariables.font.color.secondary};
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: ${themeCssVariables.spacing[4]};
|
||||
padding: ${themeCssVariables.spacing[4]};
|
||||
line-height: normal;
|
||||
padding: ${themeCssVariables.spacing[4]};
|
||||
`;
|
||||
|
||||
const StyledMessageDescription = styled.div`
|
||||
|
||||
+3
-3
@@ -11,17 +11,17 @@ const CODE_EDITOR_MIN_HEIGHT = 343;
|
||||
|
||||
const StyledCodeEditorContainer = styled.div`
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
min-height: ${CODE_EDITOR_MIN_HEIGHT}px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
`;
|
||||
|
||||
const StyledFullScreenButtonContainer = styled.div`
|
||||
position: absolute;
|
||||
top: ${themeCssVariables.spacing[2]};
|
||||
right: ${themeCssVariables.spacing[2]};
|
||||
top: ${themeCssVariables.spacing[2]};
|
||||
z-index: 1;
|
||||
`;
|
||||
|
||||
|
||||
+1
-1
@@ -10,8 +10,8 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
|
||||
|
||||
const StyledContainer = styled.div<{ fullWidth?: boolean }>`
|
||||
display: flex;
|
||||
gap: ${themeCssVariables.spacing[3]};
|
||||
flex-wrap: wrap;
|
||||
gap: ${themeCssVariables.spacing[3]};
|
||||
|
||||
> * {
|
||||
flex: 1;
|
||||
|
||||
+5
-5
@@ -61,10 +61,10 @@ const StyledFormFieldContainer = styled.div`
|
||||
`;
|
||||
|
||||
const StyledDraggingIndicator = styled.div`
|
||||
position: absolute;
|
||||
inset: -8px;
|
||||
top: -4px;
|
||||
background-color: ${themeCssVariables.background.transparent.light};
|
||||
inset: -8px;
|
||||
position: absolute;
|
||||
top: -4px;
|
||||
`;
|
||||
|
||||
const StyledGripButtonContainer = styled.div`
|
||||
@@ -95,13 +95,13 @@ const StyledFieldContainer = styled.div<{
|
||||
align-items: center;
|
||||
background: transparent;
|
||||
border: none;
|
||||
cursor: ${({ readonly }) => (readonly ? 'default' : 'pointer')};
|
||||
display: flex;
|
||||
font-family: inherit;
|
||||
padding-left: ${themeCssVariables.spacing[2]};
|
||||
padding-right: ${themeCssVariables.spacing[2]};
|
||||
width: 100%;
|
||||
|
||||
cursor: ${({ readonly }) => (readonly ? 'default' : 'pointer')};
|
||||
width: 100%;
|
||||
|
||||
&:hover,
|
||||
&[data-open='true'] {
|
||||
|
||||
+2
-2
@@ -39,10 +39,10 @@ const StyledSettingsHeader = styled.div`
|
||||
border-bottom: 1px solid ${themeCssVariables.border.color.light};
|
||||
display: grid;
|
||||
gap: ${themeCssVariables.spacing[1]};
|
||||
padding-right: ${themeCssVariables.spacing[2]};
|
||||
padding-left: ${themeCssVariables.spacing[3]};
|
||||
grid-template-columns: 1fr 24px;
|
||||
padding-bottom: ${themeCssVariables.spacing[2]};
|
||||
padding-left: ${themeCssVariables.spacing[3]};
|
||||
padding-right: ${themeCssVariables.spacing[2]};
|
||||
`;
|
||||
|
||||
const StyledTitleContainer = styled.div`
|
||||
|
||||
+5
-5
@@ -46,8 +46,8 @@ const StyledTabListContainer = styled.div`
|
||||
|
||||
const StyledTestTabContent = styled.div`
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
gap: ${themeCssVariables.spacing[4]};
|
||||
height: 100%;
|
||||
min-height: 400px;
|
||||
@@ -55,26 +55,26 @@ const StyledTestTabContent = styled.div`
|
||||
|
||||
const StyledConfigurationTabContent = styled.div`
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
gap: ${themeCssVariables.spacing[4]};
|
||||
height: 100%;
|
||||
flex: 1;
|
||||
`;
|
||||
|
||||
const StyledFullHeightFormRawJsonFieldInputContainer = styled.div`
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
|
||||
& > div:last-child {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
|
||||
& > div {
|
||||
flex: 1;
|
||||
max-height: none !important;
|
||||
height: 100%;
|
||||
max-height: none !important;
|
||||
|
||||
& > div {
|
||||
height: 100%;
|
||||
|
||||
+1
-1
@@ -14,8 +14,8 @@ import { IconButton } from 'twenty-ui/input';
|
||||
import { themeCssVariables } from 'twenty-ui/theme-constants';
|
||||
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding-block: ${themeCssVariables.spacing[2]};
|
||||
padding-inline: ${themeCssVariables.spacing[3]};
|
||||
|
||||
Reference in New Issue
Block a user