admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: improve Relation field type tag (#2606)

Browse Source 
* feat: improve Relation field type tag

Closes #2359

* refactor: code review - rename dataTypes to settingsFieldMetadataTypes

* refactor: code review - style Icon with styled
This commit is contained in:
Thaïs
2023-11-21 16:23:35 +01:00
committed by GitHub
parent f97d25d986
commit 0f4796bd1a
9 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
View File

@ -10,7 +10,7 @@ import { Field } from '~/generated/graphql';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { SettingsObjectFieldPreviewValueEffect } from '../components/SettingsObjectFieldPreviewValueEffect';
import { dataTypes } from '../constants/dataTypes';
import { settingsFieldMetadataTypes } from '../constants/settingsFieldMetadataTypes';
import { useFieldPreview } from '../hooks/useFieldPreview';
import { useRelationFieldPreview } from '../hooks/useRelationFieldPreview';
@ -99,7 +99,7 @@ export const SettingsObjectFieldPreview = ({
const defaultValue =
fieldMetadata.type === FieldMetadataType.Relation
? relationDefaultValue
: dataTypes[fieldMetadata.type].defaultValue;
: settingsFieldMetadataTypes[fieldMetadata.type].defaultValue;
return (
<StyledContainer className={className}>

8
front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx
View File

@ -5,8 +5,8 @@ import { Select } from '@/ui/input/components/Select';
import { Section } from '@/ui/layout/section/components/Section';
import { Field, FieldMetadataType } from '~/generated-metadata/graphql';
import { dataTypes } from '../constants/dataTypes';
import { relationTypes } from '../constants/relationTypes';
import { settingsFieldMetadataTypes } from '../constants/settingsFieldMetadataTypes';
import {
SettingsObjectFieldPreview,
@ -55,11 +55,11 @@ export const SettingsObjectFieldTypeSelectSection = ({
}: SettingsObjectFieldTypeSelectSectionProps) => {
const relationFormConfig = values?.relation;
const fieldTypeOptions = Object.entries(dataTypes)
const fieldTypeOptions = Object.entries(settingsFieldMetadataTypes)
.filter(([key]) => !excludedFieldTypes?.includes(key as FieldMetadataType))
.map(([key, dataType]) => ({
.map(([key, dataTypeConfig]) => ({
value: key as FieldMetadataType,
...dataType,
...dataTypeConfig,
}));
return (