diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index e4ba3d876..4e0a5457a 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -500,7 +500,8 @@ tooltip.bundle-name=A user friendly name to identify the bundle action.attribute-bundles=Attribute bundles label.new-attribute-bundle=New attribute bundle label.edit-attribute-bundle=Edit attribute bundle -label.bundled-attributes=Bundles Attributes +label.bundled-attributes=Bundled Attributes +label.attribute-bundles=Attribute Bundles message.user-role-admin-group=Cannot change group for ROLE_ADMIN users. label.roles-management=Role Management diff --git a/ui/src/app/metadata/hoc/attribute/AttributeBundleApi.js b/ui/src/app/metadata/hoc/attribute/AttributeBundleApi.js index 37e0dd1bf..a32ebd271 100644 --- a/ui/src/app/metadata/hoc/attribute/AttributeBundleApi.js +++ b/ui/src/app/metadata/hoc/attribute/AttributeBundleApi.js @@ -53,14 +53,14 @@ export function AttributeBundleApi({ id, children }) { dispatch(createNotificationAction( `Bundle has been deleted.` )); - cb(); + cb && cb(); } } return ( {(block) => -
{children(load, find, create, update, (id) => block(() => remove(id)), loading)}
+
{children(load, find, create, update, (id, cb) => block(() => remove(id, cb)), loading)}
}
); diff --git a/ui/src/app/metadata/hoc/attribute/AttributeBundleList.js b/ui/src/app/metadata/hoc/attribute/AttributeBundleList.js index 447ca0d1f..06ca17b2a 100644 --- a/ui/src/app/metadata/hoc/attribute/AttributeBundleList.js +++ b/ui/src/app/metadata/hoc/attribute/AttributeBundleList.js @@ -6,10 +6,14 @@ export function AttributeBundleList({ load, children }) { /*eslint-disable react-hooks/exhaustive-deps*/ React.useEffect(() => { - load((list) => setBundles(list)); + reload(); }, []); + const reload = () => { + load((list) => setBundles(list)); + }; + return ( - {children(bundles)} + {children(bundles, reload)} ); } \ No newline at end of file diff --git a/ui/src/app/metadata/view/MetadataAttributeBundles.js b/ui/src/app/metadata/view/MetadataAttributeBundles.js index 5d62d8a2d..dea74aa19 100644 --- a/ui/src/app/metadata/view/MetadataAttributeBundles.js +++ b/ui/src/app/metadata/view/MetadataAttributeBundles.js @@ -12,19 +12,19 @@ import { AttributeBundleApi } from '../hoc/attribute/AttributeBundleApi'; import { AttributeBundleList } from '../hoc/attribute/AttributeBundleList'; import { TruncateText } from '../../core/components/TruncateText'; -export function MetadataAttributeBundles({ entities, onDelete }) { +export function MetadataAttributeBundles({}) { return ( {(load, find, create, update, remove, loading) => - {(bundles) => + {(bundles, reload) =>
- Attribute Bundles + Attribute Bundles
@@ -57,7 +57,7 @@ export function MetadataAttributeBundles({ entities, onDelete }) { Edit -