diff --git a/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js b/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js index e3294ef167..1f06de952f 100644 --- a/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js +++ b/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js @@ -189,62 +189,60 @@ const CustomDropdownMenu = ({ column, modifiers, onSelect }) => { }, [onSelect]); return ( - - -
- -
- {displayColumns.length > 0 && predefinedColumns.length > 0 && ( - <> - {predefinedColumns.map(item => ( - setCustomPropertiesOpen(false)} - onClick={() => handleSelect(item)} + +
+ +
+ {displayColumns.length > 0 && predefinedColumns.length > 0 && ( + <> + {predefinedColumns.map(item => ( + setCustomPropertiesOpen(false)} + onClick={() => handleSelect(item)} + > + + {item.name} + + ))} + {basicsColumns.length > 0 && ( + <> + + setCustomPropertiesOpen(true)} + onMouseMove={(e) => {e.stopPropagation();}} > - - {item.name} - - ))} - {basicsColumns.length > 0 && ( - <> - - setCustomPropertiesOpen(true)} - onMouseMove={(e) => {e.stopPropagation();}} + - - - {gettext('Custom properties')} - - - - {basicsColumns.map((item, index) => ( - handleSelect(item)} - > - - {item.name} - - ))} - - - - )} - - )} -
-
+ + {gettext('Custom properties')} + + + + {basicsColumns.map((item, index) => ( + handleSelect(item)} + > + + {item.name} + + ))} + + + + )} + + )} + ); }; diff --git a/frontend/src/metadata/components/popover/column-popover/type/index.js b/frontend/src/metadata/components/popover/column-popover/type/index.js index 6acfc5ce42..bf3c64785b 100644 --- a/frontend/src/metadata/components/popover/column-popover/type/index.js +++ b/frontend/src/metadata/components/popover/column-popover/type/index.js @@ -5,6 +5,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import { gettext } from '../../../../../utils/constants'; import CustomDropdownMenu from '../dropdown-menu'; +import ModalPortal from '../../../../../components/modal-portal'; import './index.css'; @@ -54,16 +55,18 @@ const Type = forwardRef(({ column, onChange }, ref) => { {column.name} - + + + {error && ({error})}