Fixed issue with contention and reloading data

TIER · Nov 2, 2021 · 31b3f72 · 31b3f72
1 parent d6e9d3e
commit 31b3f72
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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 (
         <div className="container-fluid p-3">
             <Prompt

diff --git a/ui/src/app/metadata/hooks/api.js b/ui/src/app/metadata/hooks/api.js
@@ -1,7 +1,6 @@
 import useFetch from 'use-http';
 
 import API_BASE_PATH from '../../App.constant';
-import { createNotificationAction, NotificationTypes } from '../../notifications/hoc/Notifications';
 import { useContentionDispatcher, openContentionModalAction } from '../contention/ContentionContext';
 
 import {MetadataFilterTypes} from '../domain/filter';
@@ -114,7 +113,7 @@ export function useMetadataUpdater (path, current, cancel) {
                     resolve(await update(p, resolution));
                 }, (err) => {
                     cancel && cancel();
-                    reject(err, createNotificationAction(`Updated data with latest changes`, NotificationTypes.INFO));
+                    reject({ errorCode: 1, errorMessage: 'Updated data with latest changes - Reloading' });
                 }));
             });
         }