From d9817d6b9c6312f61972485df665f5cb8ee950dd Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 11 Mar 2025 18:01:28 +0100 Subject: [PATCH] Fix tabler icons load (#10782) As per https://github.com/tabler/tabler-icons/issues/1233#issuecomment-2428245119 --- .../constants/CronTriggerIntervalOptions.ts | 8 +-- .../generated/mock-metadata-query-result.ts | 2 +- packages/twenty-front/vite.config.ts | 3 ++ .../calendar-event.workspace-entity.ts | 2 +- .../display/icon/components/TablerIcons.ts | 12 ++--- .../icon/providers/internal/AllIcons.ts | 54 +++++-------------- 6 files changed, 28 insertions(+), 53 deletions(-) diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts index 1d69ca30c..44830eb55 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts @@ -1,8 +1,8 @@ import { - IconComponent, - Icon24Hours, - IconTimeDuration60, IconClockPlay, + IconComponent, + IconHours24, + IconTimeDuration60, } from 'twenty-ui'; export type CronTriggerInterval = 'HOURS' | 'MINUTES' | 'CUSTOM'; @@ -15,7 +15,7 @@ export const CRON_TRIGGER_INTERVAL_OPTIONS: Array<{ { label: 'Hours', value: 'HOURS', - Icon: Icon24Hours, + Icon: IconHours24, }, { label: 'Minutes', diff --git a/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts b/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts index 43a2ba0b9..00a9abbac 100644 --- a/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts +++ b/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts @@ -93,7 +93,7 @@ export const mockedStandardObjectMetadataQueryResult: ObjectMetadataItemsQuery = id: "8047b613-2dc9-4d77-bccc-8a3f54ba3fd4", type: "BOOLEAN", name: "isFullDay", - icon: "Icon24Hours", + icon: "IconHours24", isCustom: false, isActive: true, isSystem: false, diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts index 07460d98d..011202055 100644 --- a/packages/twenty-front/vite.config.ts +++ b/packages/twenty-front/vite.config.ts @@ -168,6 +168,9 @@ export default defineConfig(({ command, mode }) => { resolve: { alias: { path: 'rollup-plugin-node-polyfills/polyfills/path', + // https://github.com/twentyhq/twenty/pull/10782/files + // This will likely be migrated to twenty-ui package when built separately + '@tabler/icons-react': '@tabler/icons-react/dist/esm/icons/index.mjs', }, }, }; diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts index 37088053f..b642bc825 100644 --- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts +++ b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts @@ -57,7 +57,7 @@ export class CalendarEventWorkspaceEntity extends BaseWorkspaceEntity { type: FieldMetadataType.BOOLEAN, label: msg`Is Full Day`, description: msg`Is Full Day`, - icon: 'Icon24Hours', + icon: 'IconHours24', defaultValue: false, }) isFullDay: boolean; diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts index 174d63db9..82b9fc64d 100644 --- a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts +++ b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts @@ -1,22 +1,21 @@ /* eslint-disable no-restricted-imports */ export { - Icon123, - Icon24Hours, + IconNumber123 as Icon123, IconAlertCircle, IconAlertTriangle, IconApi, - IconApps, IconAppWindow, + IconApps, IconArchive, IconArchiveOff, IconArrowBackUp, IconArrowDown, IconArrowLeft, IconArrowRight, - IconArrowsDiagonal, - IconArrowsVertical, IconArrowUp, IconArrowUpRight, + IconArrowsDiagonal, + IconArrowsVertical, IconAt, IconBaselineDensitySmall, IconBell, @@ -47,8 +46,8 @@ export { IconChevronDown, IconChevronLeft, IconChevronRight, - IconChevronsRight, IconChevronUp, + IconChevronsRight, IconCircleDot, IconCircleOff, IconCirclePlus, @@ -166,6 +165,7 @@ export { IconHistory, IconHistoryToggle, IconHome, + IconHours24, IconInbox, IconInfoCircle, IconJson, diff --git a/packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts b/packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts index 9b73f5093..0f3682572 100644 --- a/packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts +++ b/packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts @@ -1,13 +1,6 @@ /* eslint-disable no-restricted-imports */ import { - Icon123, - Icon24Hours, - Icon2fa, - Icon360, - Icon360View, - Icon3dCubeSphere, - Icon3dCubeSphereOff, - Icon3dRotate, + IconNumber123 as Icon123, IconAB, IconAB2, IconABOff, @@ -310,6 +303,7 @@ import { IconAugmentedReality, IconAugmentedReality2, IconAugmentedRealityOff, + IconAuth2fa, IconAward, IconAwardOff, IconAxe, @@ -528,7 +522,6 @@ import { IconBoxMultiple9, IconBoxOff, IconBoxPadding, - IconBoxSeam, IconBraces, IconBracesOff, IconBrackets, @@ -1304,7 +1297,6 @@ import { IconClover2, IconClubs, IconCode, - IconCodeAsterix, IconCodeCircle, IconCodeCircle2, IconCodeDots, @@ -1409,6 +1401,8 @@ import { IconCrystalBall, IconCsv, IconCube, + IconCube3dSphere, + IconCube3dSphereOff, IconCubeOff, IconCubePlus, IconCubeSend, @@ -1757,9 +1751,6 @@ import { IconDiscGolf, IconDiscOff, IconDiscount, - IconDiscount2, - IconDiscount2Off, - IconDiscountCheck, IconDiscountOff, IconDivide, IconDna, @@ -2205,7 +2196,6 @@ import { IconHandMove, IconHandOff, IconHandRingFinger, - IconHandRock, IconHandSanitizer, IconHandStop, IconHandThreeFingers, @@ -2360,6 +2350,7 @@ import { IconHourglassHigh, IconHourglassLow, IconHourglassOff, + IconHours24, IconHtml, IconHttpConnect, IconHttpDelete, @@ -2423,7 +2414,6 @@ import { IconJumpRope, IconKarate, IconKayak, - IconKering, IconKey, IconKeyOff, IconKeyboard, @@ -2784,7 +2774,6 @@ import { IconMessageChatbot, IconMessageCheck, IconMessageCircle, - IconMessageCircle2, IconMessageCircleBolt, IconMessageCircleCancel, IconMessageCircleCheck, @@ -2891,7 +2880,6 @@ import { IconMoodSmile, IconMoodSmileBeam, IconMoodSmileDizzy, - IconMoodSuprised, IconMoodTongue, IconMoodTongueWink, IconMoodTongueWink2, @@ -3360,6 +3348,7 @@ import { IconRotate, IconRotate2, IconRotate360, + IconRotate3d, IconRotateClockwise, IconRotateClockwise2, IconRotateDot, @@ -3426,8 +3415,6 @@ import { IconSearchOff, IconSection, IconSectionSign, - IconSeeding, - IconSeedingOff, IconSelect, IconSelectAll, IconSelector, @@ -3476,7 +3463,6 @@ import { IconShare2, IconShare3, IconShareOff, - IconShiJumping, IconShield, IconShieldBolt, IconShieldCancel, @@ -4199,14 +4185,14 @@ import { } from '@tabler/icons-react'; export const ALL_ICONS = { - Icon2fa, - Icon3dCubeSphere, - Icon3dCubeSphereOff, - Icon3dRotate, - Icon24Hours, + IconAuth2fa, + IconCube3dSphere, + IconCube3dSphereOff, + IconRotate3d, + IconHours24, Icon123, - Icon360, - Icon360View, + IconRotate360, + IconView360, IconAB, IconAB2, IconAbacus, @@ -4727,7 +4713,6 @@ export const ALL_ICONS = { IconBoxMultiple9, IconBoxOff, IconBoxPadding, - IconBoxSeam, IconBraces, IconBracesOff, IconBrackets, @@ -5502,7 +5487,6 @@ export const ALL_ICONS = { IconClover2, IconClubs, IconCode, - IconCodeAsterix, IconCodeCircle, IconCodeCircle2, IconCodeDots, @@ -5955,9 +5939,6 @@ export const ALL_ICONS = { IconDiscGolf, IconDiscOff, IconDiscount, - IconDiscount2, - IconDiscount2Off, - IconDiscountCheck, IconDiscountOff, IconDivide, IconDna, @@ -6403,7 +6384,6 @@ export const ALL_ICONS = { IconHandMove, IconHandOff, IconHandRingFinger, - IconHandRock, IconHandSanitizer, IconHandStop, IconHandThreeFingers, @@ -6621,7 +6601,6 @@ export const ALL_ICONS = { IconJumpRope, IconKarate, IconKayak, - IconKering, IconKey, IconKeyboard, IconKeyboardHide, @@ -6982,7 +6961,6 @@ export const ALL_ICONS = { IconMessageChatbot, IconMessageCheck, IconMessageCircle, - IconMessageCircle2, IconMessageCircleBolt, IconMessageCircleCancel, IconMessageCircleCheck, @@ -7089,7 +7067,6 @@ export const ALL_ICONS = { IconMoodSmile, IconMoodSmileBeam, IconMoodSmileDizzy, - IconMoodSuprised, IconMoodTongue, IconMoodTongueWink, IconMoodTongueWink2, @@ -7557,7 +7534,6 @@ export const ALL_ICONS = { IconRosetteNumber9, IconRotate, IconRotate2, - IconRotate360, IconRotateClockwise, IconRotateClockwise2, IconRotateDot, @@ -7620,8 +7596,6 @@ export const ALL_ICONS = { IconSearchOff, IconSection, IconSectionSign, - IconSeeding, - IconSeedingOff, IconSelect, IconSelectAll, IconSelector, @@ -7695,7 +7669,6 @@ export const ALL_ICONS = { IconShieldStar, IconShieldUp, IconShieldX, - IconShiJumping, IconShip, IconShipOff, IconShirt, @@ -8238,7 +8211,6 @@ export const ALL_ICONS = { IconVideoMinus, IconVideoOff, IconVideoPlus, - IconView360, IconView360Off, IconViewfinder, IconViewfinderOff,