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

feat: add Url field preview in settings (#2402)

Browse Source 
* feat: add Url field preview in settings

Closes #2326

* feat: add Date field type in settings (#2414)

Closes #2331
This commit is contained in:
Thaïs
2023-11-09 18:51:21 +01:00
committed by GitHub
parent 588091d3dd
commit b28ff9c97e
10 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplayV2.tsx
View File

@ -50,7 +50,7 @@ export const URLV2Display = ({ value }: URLV2DisplayProps) => {
: 'https://' + value.link
: '';
const displayedValue = value?.text ?? '';
const displayedValue = value?.text || value?.link || '';
const type = checkUrlType(absoluteUrl);

6
front/src/modules/ui/object/field/meta-types/hooks/useURLField.ts
View File

@ -9,6 +9,7 @@ import { usePersistField } from '../../hooks/usePersistField';
import { entityFieldsFamilySelector } from '../../states/selectors/entityFieldsFamilySelector';
import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
import { isFieldURL } from '../../types/guards/isFieldURL';
import { isFieldURLValue } from '../../types/guards/isFieldURLValue';
export const useURLField = () => {
const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
@ -23,12 +24,13 @@ export const useURLField = () => {
fieldName: fieldName,
}),
);
const fieldUrlValue = isFieldURLValue(fieldValue) ? fieldValue : '';
const fieldInitialValue = useFieldInitialValue();
const initialValue = fieldInitialValue?.isEmpty
? ''
: fieldInitialValue?.value ?? fieldValue;
: fieldInitialValue?.value ?? fieldUrlValue;
const persistField = usePersistField();
@ -42,7 +44,7 @@ export const useURLField = () => {
return {
fieldDefinition,
fieldValue,
fieldValue: fieldUrlValue,
initialValue,
setFieldValue,
hotkeyScope,

4
front/src/modules/ui/object/field/meta-types/hooks/useURLV2Field.ts
View File

@ -28,7 +28,9 @@ export const useURLV2Field = () => {
const initialValue: FieldURLV2Value = fieldInitialValue?.isEmpty
? { link: '', text: '' }
: { link: fieldInitialValue?.value ?? '', text: '' } ?? fieldValue;
: fieldInitialValue?.value
? { link: fieldInitialValue.value, text: '' }
: fieldValue;
const persistField = usePersistField();

9
front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
View File

@ -19,6 +19,8 @@ import { isFieldRelation } from '../../types/guards/isFieldRelation';
import { isFieldRelationValue } from '../../types/guards/isFieldRelationValue';
import { isFieldText } from '../../types/guards/isFieldText';
import { isFieldURL } from '../../types/guards/isFieldURL';
import { isFieldURLV2 } from '../../types/guards/isFieldURLV2';
import { isFieldURLV2Value } from '../../types/guards/isFieldURLV2Value';
import { entityFieldsFamilyState } from '../entityFieldsFamilyState';
const isValueEmpty = (value: unknown) => !assertNotNull(value) || value === '';
@ -104,6 +106,13 @@ export const isEntityFieldEmptyFamilySelector = selectorFamily({
);
}
if (isFieldURLV2(fieldDefinition)) {
const fieldName = fieldDefinition.metadata.fieldName;
const fieldValue = get(entityFieldsFamilyState(entityId))?.[fieldName];
return !isFieldURLV2Value(fieldValue) || isValueEmpty(fieldValue?.link);
}
throw new Error(
`Entity field type not supported in isEntityFieldEmptyFamilySelector : ${fieldDefinition.type}}`,
);