ENH Do not show loading spinner when there was a loading error

silverstripe · Sep 5, 2023 · 4dd1269 · 4dd1269
1 parent 714c773
commit 4dd1269
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/containers/FormBuilderLoader/FormBuilderLoader.js b/client/src/containers/FormBuilderLoader/FormBuilderLoader.js
@@ -352,6 +352,7 @@ class FormBuilderLoader extends Component {
         return formSchema;
       })
       .catch((error) => {
+        this.setState({ didError: true });
         this.props.actions.schema.setSchemaLoading(this.props.schemaUrl, false);
         if (typeof this.props.onLoadingError === 'function') {
           return this.props.onLoadingError(this.normaliseError(error));
@@ -413,10 +414,13 @@ class FormBuilderLoader extends Component {
   }
 
   render() {
-    const Loading = this.props.loadingComponent;
+    if (this.state && this.state.didError) {
+      return null;
+    }
     // If the response from fetching the initial data
     // hasn't come back yet, don't render anything.
     if (!this.props.schema || !this.props.schema.schema || this.props.loading) {
+      const Loading = this.props.loadingComponent;
       return <Loading containerClass="loading--form flexbox-area-grow" />;
     }