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
110 lines
2.9 KiB
TypeScript
110 lines
2.9 KiB
TypeScript
import { styled } from '@linaria/react';
|
|
import { useContext } from 'react';
|
|
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
|
|
const StyledSkeletonContainer = styled.div`
|
|
align-content: flex-start;
|
|
align-items: center;
|
|
display: flex;
|
|
flex-direction: column;
|
|
flex-wrap: wrap;
|
|
gap: ${themeCssVariables.spacing[4]};
|
|
padding: ${themeCssVariables.spacing[8]};
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledSkeletonSubSection = styled.div`
|
|
display: flex;
|
|
gap: ${themeCssVariables.spacing[4]};
|
|
`;
|
|
|
|
const StyledSkeletonSubSectionContent = styled.div`
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: ${themeCssVariables.spacing[3]};
|
|
justify-content: center;
|
|
`;
|
|
|
|
export const SKELETON_LOADER_HEIGHT_SIZES = {
|
|
standard: {
|
|
xs: 13,
|
|
s: 16,
|
|
m: 24,
|
|
l: 32,
|
|
xl: 40,
|
|
},
|
|
columns: {
|
|
s: 84,
|
|
m: 120,
|
|
xxl: 542,
|
|
},
|
|
};
|
|
|
|
const SkeletonColumnLoader = ({ height }: { height: number }) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
return (
|
|
<SkeletonTheme
|
|
baseColor={theme.background.tertiary}
|
|
highlightColor={theme.background.transparent.lighter}
|
|
borderRadius={80}
|
|
>
|
|
<Skeleton width={24} height={height} />
|
|
</SkeletonTheme>
|
|
);
|
|
};
|
|
|
|
export const SkeletonLoader = ({
|
|
withSubSections = false,
|
|
}: {
|
|
withSubSections?: boolean;
|
|
}) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
const skeletonItems = Array.from({ length: 3 }).map((_, index) => ({
|
|
id: `skeleton-item-${index}`,
|
|
}));
|
|
|
|
return (
|
|
<SkeletonTheme
|
|
baseColor={theme.background.tertiary}
|
|
highlightColor={theme.background.transparent.lighter}
|
|
borderRadius={4}
|
|
>
|
|
<StyledSkeletonContainer>
|
|
<Skeleton
|
|
width={440}
|
|
height={SKELETON_LOADER_HEIGHT_SIZES.standard.s}
|
|
/>
|
|
{withSubSections &&
|
|
skeletonItems.map(({ id }, index) => (
|
|
<StyledSkeletonSubSection key={id}>
|
|
<SkeletonColumnLoader
|
|
height={
|
|
index === 1
|
|
? SKELETON_LOADER_HEIGHT_SIZES.columns.m
|
|
: SKELETON_LOADER_HEIGHT_SIZES.columns.s
|
|
}
|
|
/>
|
|
<StyledSkeletonSubSectionContent>
|
|
<Skeleton
|
|
width={400}
|
|
height={SKELETON_LOADER_HEIGHT_SIZES.standard.m}
|
|
/>
|
|
<Skeleton
|
|
width={400}
|
|
height={SKELETON_LOADER_HEIGHT_SIZES.standard.m}
|
|
/>
|
|
{index === 1 && (
|
|
<Skeleton
|
|
width={400}
|
|
height={SKELETON_LOADER_HEIGHT_SIZES.standard.m}
|
|
/>
|
|
)}
|
|
</StyledSkeletonSubSectionContent>
|
|
</StyledSkeletonSubSection>
|
|
))}
|
|
</StyledSkeletonContainer>
|
|
</SkeletonTheme>
|
|
);
|
|
};
|