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

Feature 7552 patch (#8574)

Browse Source 
Related to #7552

<img width="556" alt="Screenshot 2024-11-18 at 17 57 30"
src="https://github.com/user-attachments/assets/e89e575b-9adb-4910-ab0d-b60079727f70">

---------

Co-authored-by: guillim <guillaume@twenty.com>
This commit is contained in:
Guillim
2024-11-19 12:47:33 +01:00
committed by GitHub
parent 9073bdf21a
commit 4a8234d18c
2 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm.tsx
View File

@ -1,18 +1,10 @@
import { Controller, useFormContext } from 'react-hook-form'; import { Controller, useFormContext } from 'react-hook-form';
import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { Select } from '@/ui/input/components/Select'; import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';
import styled from '@emotion/styled'; import { IconTextWrap } from 'twenty-ui';
import { CardContent } from 'twenty-ui';
import { z } from 'zod'; import { z } from 'zod';
const StyledFormCardTitle = styled.div`
color: ${({ theme }) => theme.font.color.light};
font-size: ${({ theme }) => theme.font.size.xs};
font-weight: ${({ theme }) => theme.font.weight.semiBold};
margin-bottom: ${({ theme }) => theme.spacing(1)};
`;
type SettingsDataModelFieldTextFormProps = { type SettingsDataModelFieldTextFormProps = {
disabled?: boolean; disabled?: boolean;
fieldMetadataItem: Pick< fieldMetadataItem: Pick<
@ -39,7 +31,6 @@ export const SettingsDataModelFieldTextForm = ({
}: SettingsDataModelFieldTextFormProps) => { }: SettingsDataModelFieldTextFormProps) => {
const { control } = useFormContext<SettingsDataModelFieldTextFormValues>(); const { control } = useFormContext<SettingsDataModelFieldTextFormValues>();
return ( return (
<CardContent>
<Controller <Controller
name="settings" name="settings"
defaultValue={{ defaultValue={{
@ -51,10 +42,14 @@ export const SettingsDataModelFieldTextForm = ({
return ( return (
<> <>
<StyledFormCardTitle>Wrap on record pages</StyledFormCardTitle> <SettingsOptionCardContentSelect
<Select Icon={IconTextWrap}
dropdownId="text-wrap"
title="Wrap on record pages"
description="Display text on multiple lines"
value={displayedMaxRows}
onChange={(value) => onChange({ displayedMaxRows: value })}
disabled={disabled} disabled={disabled}
dropdownId="selectTextWrap"
options={[ options={[
{ {
label: 'Deactivated', label: 'Deactivated',
@ -77,15 +72,10 @@ export const SettingsDataModelFieldTextForm = ({
value: 99, value: 99,
}, },
]} ]}
value={displayedMaxRows}
onChange={(value) => onChange({ displayedMaxRows: value })}
withSearchInput={false}
dropdownWidthAuto={true}
/> />
</> </>
); );
}} }}
/> />
</CardContent>
); );
}; };

1
packages/twenty-ui/src/display/icon/components/TablerIcons.ts
View File

@ -229,6 +229,7 @@ export {
IconTargetArrow, IconTargetArrow,
IconTestPipe, IconTestPipe,
IconTextSize, IconTextSize,
IconTextWrap,
IconTimelineEvent, IconTimelineEvent,
IconTool, IconTool,
IconTrash, IconTrash,