@@ -51,7 +48,7 @@ export function DynamicRegistrationCreate () {
- {(schema) =>
+ {(schema, loadingSchema) =>
{(data, errors) =>
<>
@@ -61,7 +58,8 @@ export function DynamicRegistrationCreate () {
schema={schema}
loading={loading}
onSave={(data) => save(data)}
- onCancel={() => cancel()} />
+ onCancel={() => gotoDetail()} />
+ { loadingSchema &&
}
}
}
diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
index 82c4091b1..ec6c17b90 100644
--- a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
+++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
@@ -22,8 +22,6 @@ export function DynamicRegistrationDetail () {
const history = useHistory();
const { data: detail } = useSelectDynamicRegistrationQuery({id});
-
- const redirectOnDelete = () => history.push('/dashboard/dynamic-registration');
const edit = (section) => {
history.push(`/dynamic-registration/${id}/edit`);
diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
index 8f7034d86..87705c2a7 100644
--- a/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
+++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
@@ -7,6 +7,7 @@ import { FormManager } from '../../form/FormManager';
import { DynamicRegistrationForm } from '../component/DynamicRegistrationForm';
import DynamicConfigurationDefinition from '../hoc/DynamicConfigurationDefinition';
import { useSelectDynamicRegistrationQuery, useUpdateDynamicRegistrationMutation } from '../../store/dynamic-registration/DynamicRegistrationSlice';
+import Spinner from '../../core/components/Spinner';
export function DynamicRegistrationEdit () {
@@ -53,7 +54,7 @@ export function DynamicRegistrationEdit () {
- {(schema) =>
+ {(schema, loadingSchema) =>
{(data, errors) =>
<>
@@ -64,6 +65,7 @@ export function DynamicRegistrationEdit () {
loading={loading}
onSave={(registration) => update({ id: registration.resourceId, registration })}
onCancel={() => cancel()} />
+ { loadingSchema &&
}
}
}
diff --git a/ui/src/app/form/Schema.js b/ui/src/app/form/Schema.js
index 92aefe325..13321349a 100644
--- a/ui/src/app/form/Schema.js
+++ b/ui/src/app/form/Schema.js
@@ -6,7 +6,7 @@ export function Schema({ path, children }) {
const [schema, setSchema] = React.useState({});
- const { get, response } = useFetch(path, {
+ const { get, response, loading } = useFetch(path, {
cachePolicy: 'no-cache'
});
@@ -20,5 +20,5 @@ export function Schema({ path, children }) {
/*eslint-disable react-hooks/exhaustive-deps*/
React.useEffect(() => { loadSchema() }, []);
- return (<>{children(schema)});
+ return (<>{children(schema, loading)});
}
\ No newline at end of file
diff --git a/ui/src/app/metadata/domain/provider/component/ProviderList.js b/ui/src/app/metadata/domain/provider/component/ProviderList.js
index 08188dba0..10f034c5e 100644
--- a/ui/src/app/metadata/domain/provider/component/ProviderList.js
+++ b/ui/src/app/metadata/domain/provider/component/ProviderList.js
@@ -92,6 +92,13 @@ export function ProviderList({ children, entities, reorder = true, first, last,
)}
+ { !limited?.length && !children &&
+
+
+
No Metadata Providers found.
+
+
+ }
}