diff --git a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js index 55a2f671c..a411f5e89 100644 --- a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js @@ -30,7 +30,6 @@ export const BaseProviderDefinition = { ...changes, metadataFilters: [ ...changes.metadataFilters.filter((filter, filterName) => { - if (filter['@type'] === 'RequiredValidUntil') { if (!filter.maxValidityInterval || filter.maxValidityInterval === "") { return false; diff --git a/ui/src/app/metadata/editor/MetadataEditor.js b/ui/src/app/metadata/editor/MetadataEditor.js index 2adc5b273..2a06e2502 100644 --- a/ui/src/app/metadata/editor/MetadataEditor.js +++ b/ui/src/app/metadata/editor/MetadataEditor.js @@ -51,8 +51,15 @@ export function MetadataEditor ({ restore, current, reload }) { .then(() => { gotoDetail({ refresh: true }); }) - .catch((err, notification) => { - notificationDispatch(notification || createNotificationAction(`${err.errorCode} - ${translator(err.errorMessage)}`, NotificationTypes.ERROR)); + .catch((err) => { + notificationDispatch( + createNotificationAction(`${err.errorCode > 1 ? `${err.errorCode} - ` : ''} ${translator(err.errorMessage)}`, err.errorCode === 1 ? NotificationTypes.INFO : NotificationTypes.ERROR) + ); + if (err.errorCode === 1) { + setTimeout(() => { + window.location.reload(); + }, 500); + } }); }; @@ -83,10 +90,6 @@ export function MetadataEditor ({ restore, current, reload }) { const canFilter = restore ? false : FilterableProviders.indexOf(definition.type) > -1; - React.useEffect(() => { - dispatch(setFormDataAction(current)); - }, [current, dispatch]) - return (
{ cancel && cancel(); - reject(err, createNotificationAction(`Updated data with latest changes`, NotificationTypes.INFO)); + reject({ errorCode: 1, errorMessage: 'Updated data with latest changes - Reloading' }); })); }); }