From 9d56260c8ff27b2d2e8f3d2c97f7f29edb02d2be Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 28 Sep 2021 10:28:15 -0700
Subject: [PATCH] Fixed issue after merge conflict

---
 .../definition/FileBackedHttpMetadataProviderDefinition.js   | 2 +-
 ui/src/app/metadata/wizard/MetadataProviderWizard.js         | 5 -----
 ui/src/app/metadata/wizard/MetadataSourceWizard.js           | 5 +----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
index f366646b3..5001895ce 100644
--- a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
+++ b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
@@ -8,7 +8,7 @@ export const FileBackedHttpMetadataProviderWizard = {
     ...BaseProviderDefinition,
     label: 'FileBackedHttpMetadataProvider',
     type: 'FileBackedHttpMetadataResolver',
-    schema: '${BASE_PATH}assets/schema/provider/filebacked-http.schema.json',
+    schema: `${BASE_PATH}assets/schema/provider/filebacked-http.schema.json`,
     validator: (data = [], current = { resourceId: null }, group, translator) => {
         const base = BaseProviderDefinition.validator(data, current, group);
 
diff --git a/ui/src/app/metadata/wizard/MetadataProviderWizard.js b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
index 4d0cd2075..d2cbc0864 100644
--- a/ui/src/app/metadata/wizard/MetadataProviderWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
@@ -11,7 +11,6 @@ import { useMetadataProviders } from '../hooks/api';
 
 import { removeNull } from '../../core/utility/remove_null';
 
-import { useNotificationDispatcher, createNotificationAction, NotificationTypes } from '../../notifications/hoc/Notifications';
 import { useUserGroup } from '../../core/user/UserContext';
 
 export function MetadataProviderWizard({onSave, loading, block}) {
@@ -44,10 +43,6 @@ export function MetadataProviderWizard({onSave, loading, block}) {
         wizardDispatch(setWizardIndexAction(idx));
     };
 
-    const onBlur = (form) => {
-        // console.log(form);
-    }
-
     const validator = useMetadataDefinitionValidator(data, null, group);
 
     const save = () => onSave(removeNull(definition.parser(metadata), true))
diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
index 6973f1e9c..364d74421 100644
--- a/ui/src/app/metadata/wizard/MetadataSourceWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
@@ -13,8 +13,6 @@ import { useMetadataFormDispatcher, setFormDataAction, setFormErrorAction, useMe
 import { MetadataConfiguration } from '../component/MetadataConfiguration';
 import { Configuration } from '../hoc/Configuration';
 import { useMetadataEntity, useMetadataSources } from '../hooks/api';
-import { Prompt, useHistory } from 'react-router';
-import { removeNull } from '../../core/utility/remove_null';
 
 import Translate from '../../i18n/components/translate';
 import { checkChanges } from '../hooks/utility';
@@ -23,8 +21,7 @@ import { useUserGroup } from '../../core/user/UserContext';
 
 export function MetadataSourceWizard ({ onShowNav, onSave, block }) {
 
-    const { post, loading, response } = useMetadataEntity('source');
-    const history = useHistory();
+    const { loading } = useMetadataEntity('source');
     const group = useUserGroup();
 
     const { data } = useMetadataSources({