Various cosmetic fixes for 0.4.0 (#4844)

In this PR:
- fix empty list placeholder positionning
- prevent user from erasing custom address field as composite types
removal is not supported yet @ijreilly FYI
- fix show page relation error
- Implement address filter
This commit is contained in:
Charles Bochet
2024-04-05 17:32:14 +02:00
committed by GitHub
parent f8da8f9805
commit f4017119ab
8 changed files with 93 additions and 12 deletions

View File

@ -6,10 +6,11 @@ import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
import { FieldMetadataType } from '~/generated-metadata/graphql';
type SettingsObjectFieldInactiveActionDropdownProps = {
isCustomField?: boolean;
isRelationType?: boolean;
fieldType?: FieldMetadataType;
onActivate: () => void;
onErase: () => void;
scopeKey: string;
@ -20,7 +21,7 @@ export const SettingsObjectFieldInactiveActionDropdown = ({
scopeKey,
onErase,
isCustomField,
isRelationType,
fieldType,
}: SettingsObjectFieldInactiveActionDropdownProps) => {
const dropdownId = `${scopeKey}-settings-field-disabled-action-dropdown`;
@ -36,7 +37,10 @@ export const SettingsObjectFieldInactiveActionDropdown = ({
closeDropdown();
};
const isErasable = isCustomField && !isRelationType;
const isErasable =
isCustomField &&
fieldType !== FieldMetadataType.Relation &&
fieldType !== FieldMetadataType.Address;
return (
<Dropdown