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
139 lines
3.5 KiB
TypeScript
139 lines
3.5 KiB
TypeScript
import { type AppErrorDisplayProps } from '@/error-handler/types/AppErrorDisplayProps';
|
|
import { styled } from '@linaria/react';
|
|
import { t } from '@lingui/core/macro';
|
|
import { useContext } from 'react';
|
|
import { IconReload } from 'twenty-ui/display';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
|
|
type AppRootErrorFallbackProps = AppErrorDisplayProps;
|
|
|
|
const StyledContainer = styled.div`
|
|
background: ${themeCssVariables.background.noisy};
|
|
box-sizing: border-box;
|
|
display: flex;
|
|
height: 100vh;
|
|
padding: 12px;
|
|
width: 100vw;
|
|
`;
|
|
|
|
const StyledPanel = styled.div`
|
|
background: ${themeCssVariables.grayScale.gray1};
|
|
border: 1px solid ${themeCssVariables.grayScale.gray5};
|
|
border-radius: 8px;
|
|
height: 100%;
|
|
overflow-x: auto;
|
|
overflow-y: hidden;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledEmptyContainer = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: 24px;
|
|
height: 100%;
|
|
justify-content: center;
|
|
text-align: center;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledImageContainer = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
justify-content: center;
|
|
position: relative;
|
|
`;
|
|
|
|
const StyledBackgroundImage = styled.img`
|
|
max-height: 160px;
|
|
max-width: 160px;
|
|
`;
|
|
|
|
const StyledInnerImage = styled.img`
|
|
max-height: 130px;
|
|
max-width: 130px;
|
|
position: absolute;
|
|
`;
|
|
|
|
const StyledEmptyTextContainer = styled.div`
|
|
align-items: center;
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: 8px;
|
|
justify-content: center;
|
|
text-align: center;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledEmptyTitle = styled.div`
|
|
color: ${themeCssVariables.grayScale.gray12};
|
|
font-size: 1.23rem;
|
|
font-weight: 600;
|
|
`;
|
|
|
|
const StyledEmptySubTitle = styled.div`
|
|
color: ${themeCssVariables.grayScale.gray11};
|
|
font-size: 0.92rem;
|
|
font-weight: 400;
|
|
line-height: 1.5;
|
|
max-height: 2.8em;
|
|
overflow: hidden;
|
|
width: 50%;
|
|
`;
|
|
|
|
const StyledButton = styled.button`
|
|
align-items: center;
|
|
background: ${themeCssVariables.grayScale.gray1};
|
|
border: 1px solid ${themeCssVariables.grayScale.gray5};
|
|
border-radius: 8px;
|
|
color: ${themeCssVariables.grayScale.gray12};
|
|
cursor: pointer;
|
|
display: flex;
|
|
padding: 8px;
|
|
padding: 8px 16px;
|
|
`;
|
|
|
|
const StyledIconContainer = styled.span`
|
|
color: ${themeCssVariables.grayScale.gray12};
|
|
display: inline-flex;
|
|
margin-right: 8px;
|
|
`;
|
|
|
|
export const AppRootErrorFallback = ({
|
|
resetErrorBoundary,
|
|
title = t`Sorry, something went wrong`,
|
|
}: AppRootErrorFallbackProps) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
|
|
return (
|
|
<StyledContainer>
|
|
<StyledPanel>
|
|
<StyledEmptyContainer>
|
|
<StyledImageContainer>
|
|
<StyledBackgroundImage
|
|
src="/images/placeholders/background/error_index_bg.png"
|
|
alt={t`Background`}
|
|
/>
|
|
<StyledInnerImage
|
|
src="/images/placeholders/moving-image/error_index.png"
|
|
alt={t`Error illustration`}
|
|
/>
|
|
</StyledImageContainer>
|
|
<StyledEmptyTextContainer>
|
|
<StyledEmptyTitle>{title}</StyledEmptyTitle>
|
|
<StyledEmptySubTitle>
|
|
{t`Please refresh the page.`}
|
|
</StyledEmptySubTitle>
|
|
</StyledEmptyTextContainer>
|
|
<StyledButton onClick={resetErrorBoundary}>
|
|
<StyledIconContainer>
|
|
<IconReload size={theme.icon.size.md} />
|
|
</StyledIconContainer>
|
|
{t`Reload`}
|
|
</StyledButton>
|
|
</StyledEmptyContainer>
|
|
</StyledPanel>
|
|
</StyledContainer>
|
|
);
|
|
};
|