Merged in bugfix/SHIBUI-2190 (pull request #558)

Removed filter list button from restoration editing Approved-by: Bill Smith Approved-by: Jonathan Johnson
TIER · Nov 1, 2021 · 032a5bc · 032a5bc
2 parents 1c1070a + c05f8df
commit 032a5bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ui/src/app/metadata/editor/MetadataEditor.js b/ui/src/app/metadata/editor/MetadataEditor.js
@@ -21,7 +21,7 @@ import { checkChanges } from '../hooks/utility';
 import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 import { useUserGroup } from '../../core/user/UserContext';
 
-export function MetadataEditor ({ current, reload }) {
+export function MetadataEditor ({ restore, current, reload }) {
 
     const translator = useTranslator();
     const group = useUserGroup();
@@ -70,7 +70,7 @@ export function MetadataEditor ({ current, reload }) {
         const resetBlock = blocking;
         setBlocking(false);
         setTimeout(() => {
-            history.push(path);
+            history.push(restore ? `../${path}/edit` : path);
             setBlocking(resetBlock);
         });
     };
@@ -81,7 +81,7 @@ export function MetadataEditor ({ current, reload }) {
 
     const warnings = definition.warnings && definition.warnings(metadata);
 
-    const canFilter = FilterableProviders.indexOf(definition.type) > -1;
+    const canFilter = restore ? false : FilterableProviders.indexOf(definition.type) > -1;
 
     React.useEffect(() => {
         dispatch(setFormDataAction(current));

diff --git a/ui/src/app/metadata/view/MetadataRestore.js b/ui/src/app/metadata/view/MetadataRestore.js
@@ -16,7 +16,7 @@ export function MetadataRestore() {
                     ...metadata,
                     version: latest.version
                 }}>
-                    <MetadataEditor current={{
+                    <MetadataEditor restore={true} current={{
                         ...metadata,
                         version: latest.version
                     }} />