twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-27 06:13:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent setting addition from being broken

Browse Source
This commit is contained in:
Charles Bochet 2023-12-03 12:01:37 +01:00
parent fd9467c54d
commit 7e7bd6b9e7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/settings/data-model/hooks/useRelationFieldPreviewValue.ts
View File

@ -16,7 +16,7 @@ export const useRelationFieldPreviewValue = ({
: undefined;
const { records: relationObjects } = useFindManyRecords({
objectNameSingular: relationObjectMetadataItem?.nameSingular ?? '',
objectNameSingular: relationObjectMetadataItem?.nameSingular ?? 'company', // TODO fix this hack
skip: skip || !relationObjectMetadataItem,
});

9
front/src/modules/ui/input/components/IconPicker.tsx
View File

@ -60,14 +60,15 @@ export const IconPicker = ({
const { icons, isLoadingIcons: isLoading } = useLazyLoadIcons();
const iconKeys = useMemo(() => {
const filteredIconKeys = Object.keys(icons).filter(
(iconKey) =>
const filteredIconKeys = Object.keys(icons).filter((iconKey) => {
return (
iconKey !== selectedIconKey &&
(!searchString ||
[iconKey, convertIconKeyToLabel(iconKey)].some((label) =>
label.toLowerCase().includes(searchString.toLowerCase()),
)),
);
))
);
});
return (
selectedIconKey