diff --git a/front/src/modules/settings/components/SettingsPageContainer.tsx b/front/src/modules/settings/components/SettingsPageContainer.tsx index 354ca930e..4e019f7bf 100644 --- a/front/src/modules/settings/components/SettingsPageContainer.tsx +++ b/front/src/modules/settings/components/SettingsPageContainer.tsx @@ -6,6 +6,7 @@ const StyledSettingsPageContainer = styled.div<{ width?: number }>` display: flex; flex-direction: column; gap: ${({ theme }) => theme.spacing(8)}; + overflow: auto; padding: ${({ theme }) => theme.spacing(8)}; width: ${({ width }) => (width ? width + 'px' : objectSettingsWidth)}; `; diff --git a/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx b/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx index b416a3fd3..819e4de40 100644 --- a/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx +++ b/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx @@ -64,7 +64,7 @@ export const SettingsObjectFieldTypeSelectSection = ({ }), )} /> - {fieldType === 'TEXT' && ( + {['NUMBER', 'TEXT'].includes(fieldType) && ( = { fieldIconKey: 'IconNotes', fieldLabel: 'Description', fieldType: 'TEXT', - objectIconKey: 'IconUser', - objectLabelPlural: 'People', - objectNamePlural: 'people', + isObjectCustom: false, + objectIconKey: 'IconBuildingSkyscraper', + objectLabelPlural: 'Companies', + objectNamePlural: 'companies', }, }; export default meta; type Story = StoryObj; -export const StandardObject: Story = { args: { isObjectCustom: false } }; +export const Text: Story = {}; -export const CustomObject: Story = { args: { isObjectCustom: true } }; +export const Number: Story = { + args: { + fieldIconKey: 'IconUsers', + fieldLabel: 'Employees', + fieldType: 'NUMBER', + }, +}; + +export const CustomObject: Story = { + args: { + isObjectCustom: true, + objectIconKey: 'IconApps', + objectLabelPlural: 'Workspaces', + objectNamePlural: 'workspaces', + }, +}; diff --git a/front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldTypeSelectSection.stories.tsx b/front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldTypeSelectSection.stories.tsx index 4122856a2..37a665f3c 100644 --- a/front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldTypeSelectSection.stories.tsx +++ b/front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldTypeSelectSection.stories.tsx @@ -9,7 +9,16 @@ const meta: Meta = { title: 'Modules/Settings/DataModel/SettingsObjectFieldTypeSelectSection', component: SettingsObjectFieldTypeSelectSection, decorators: [ComponentDecorator], - args: { fieldType: 'NUMBER' }, + args: { + fieldType: 'NUMBER', + fieldIconKey: 'IconUsers', + fieldLabel: 'Employees', + fieldName: 'employees', + isObjectCustom: false, + objectIconKey: 'IconUser', + objectLabelPlural: 'People', + objectNamePlural: 'people', + }, }; export default meta; @@ -17,6 +26,10 @@ type Story = StoryObj; export const Default: Story = {}; +export const Disabled: Story = { + args: { disabled: true }, +}; + export const WithOpenSelect: Story = { play: async ({ canvasElement }) => { const canvas = within(canvasElement); diff --git a/front/src/modules/settings/data-model/constants/dataTypes.ts b/front/src/modules/settings/data-model/constants/dataTypes.ts index 5fa7dc64e..f52eebd57 100644 --- a/front/src/modules/settings/data-model/constants/dataTypes.ts +++ b/front/src/modules/settings/data-model/constants/dataTypes.ts @@ -13,7 +13,7 @@ export const dataTypes: Record< MetadataFieldDataType, { label: string; Icon: IconComponent; defaultValue?: unknown } > = { - NUMBER: { label: 'Number', Icon: IconNumbers }, + NUMBER: { label: 'Number', Icon: IconNumbers, defaultValue: 2000 }, TEXT: { label: 'Text', Icon: IconTextSize,