The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Give every field a default icon (#28349)
Thomas des Francs51beffc82213
diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.tsindex 3c443266831..7703036ce06 100644--- a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts+++ b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts@@ -6,6 +6,8 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enricheimport { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';+import { isNonEmptyString } from '@sniptt/guards';+import { FIELD_TYPE_DEFAULT_ICONS } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';export const objectMetadataItemsWithFieldsSelector = createAtomSelector<@@ -51,7 +53,11 @@ export const objectMetadataItemsWithFieldsSelector = createAtomSelector<}return flatObjects.map((flatObject) => {- const fields = fieldsByObjectId.get(flatObject.id) ?? [];+ const fields = (fieldsByObjectId.get(flatObject.id) ?? []).map((field) =>+ isNonEmptyString(field.icon?.trim())+ ? field+ : { ...field, icon: FIELD_TYPE_DEFAULT_ICONS[field.type] },+ );const indexMetadatas = indexesByObjectId.get(flatObject.id) ?? [];return {diff --git a/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts b/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.tsdeleted file mode 100644index f60766482f2..00000000000--- a/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts+++ /dev/null@@ -1,29 +0,0 @@-import { FieldMetadataType } from '~/generated-metadata/graphql';--export const DEFAULT_ICONS_BY_FIELD_TYPE: Record<FieldMetadataType, string> = {- [FieldMetadataType.ADDRESS]: 'IconMap',- [FieldMetadataType.BOOLEAN]: 'IconToggleLeft',- [FieldMetadataType.CURRENCY]: 'IconMoneybag',- [FieldMetadataType.DATE]: 'IconCalendarEvent',- [FieldMetadataType.DATE_TIME]: 'IconCalendarClock',- [FieldMetadataType.FILES]: 'IconFile',- [FieldMetadataType.FULL_NAME]: 'IconUserCircle',- [FieldMetadataType.MULTI_SELECT]: 'IconTags',- [FieldMetadataType.NUMBER]: 'IconNumber9',- [FieldMetadataType.RATING]: 'IconStar',- [FieldMetadataType.RAW_JSON]: 'IconBraces',- [FieldMetadataType.RELATION]: 'IconRelationOneToMany',- [FieldMetadataType.MORPH_RELATION]: 'IconRelationOneToMany',- [FieldMetadataType.SELECT]: 'IconTag',- [FieldMetadataType.TEXT]: 'IconTypography',- [FieldMetadataType.UUID]: 'IconId',- [FieldMetadataType.ARRAY]: 'IconBracketsContain',- [FieldMetadataType.EMAILS]: 'IconMail',- [FieldMetadataType.LINKS]: 'IconWorld',- [FieldMetadataType.PHONES]: 'IconPhone',- [FieldMetadataType.ACTOR]: 'IconUsers',- [FieldMetadataType.NUMERIC]: 'IconUsers',- [FieldMetadataType.POSITION]: 'IconUsers',- [FieldMetadataType.RICH_TEXT]: 'IconUsers',- [FieldMetadataType.TS_VECTOR]: 'IconUsers',-};diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsxindex 7846dae3794..701b00e4d45 100644--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx@@ -17,6 +17,7 @@ import { useLingui } from '@lingui/react/macro';import { useEffect, useState } from 'react';import { FormProvider, useForm } from 'react-hook-form';import { useParams, useSearchParams } from 'react-router-dom';+import { FIELD_TYPE_DEFAULT_ICONS } from 'twenty-shared/constants';import {AppPath,type RelationCreationPayload,@@ -31,7 +32,6 @@ import { type z } from 'zod';import { FieldMetadataType } from '~/generated-metadata/graphql';import { useNavigateApp } from '~/hooks/useNavigateApp';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { DEFAULT_ICONS_BY_FIELD_TYPE } from '~/pages/settings/data-model/constants/DefaultIconsByFieldType';type SettingsDataModelNewFieldFormValues = z.infer<ReturnType<typeof settingsFieldFormSchema>@@ -72,8 +72,7 @@ export const SettingsObjectNewFieldConfigure = () => {),defaultValues: {type: fieldType,- icon:- DEFAULT_ICONS_BY_FIELD_TYPE[fieldType] ?? DEFAULT_ICON_FOR_NEW_FIELD,+ icon: FIELD_TYPE_DEFAULT_ICONS[fieldType] ?? DEFAULT_ICON_FOR_NEW_FIELD,label: '',name: '',},@@ -82,7 +81,7 @@ export const SettingsObjectNewFieldConfigure = () => {useEffect(() => {formConfig.setValue('icon',- DEFAULT_ICONS_BY_FIELD_TYPE[fieldType] ?? DEFAULT_ICON_FOR_NEW_FIELD,+ FIELD_TYPE_DEFAULT_ICONS[fieldType] ?? DEFAULT_ICON_FOR_NEW_FIELD,);}, [fieldType, formConfig]);