use render callbacks for loading notification

Author: rjwats

interface/src/components/LoadingNotification.js

@@ -22,7 +22,7 @@ const useStyles = makeStyles(theme => ({
 
 export default function LoadingNotification(props) {
   const classes = useStyles();
-  const { fetched, errorMessage, onReset, children } = props;
+  const { fetched, errorMessage, onReset, render } = props;
   return (
     <div>
       {
@@ -37,7 +37,7 @@ export default function LoadingNotification(props) {
               </Button>
             </div>
             :
-            children
+            render()
           :
           <div className={classes.loadingSettings}>
             <LinearProgress className={classes.loadingSettingsDetails} />
@@ -53,5 +53,6 @@ export default function LoadingNotification(props) {
 LoadingNotification.propTypes = {
   fetched: PropTypes.bool.isRequired,
   onReset: PropTypes.func.isRequired,
-  errorMessage: PropTypes.string
+  errorMessage: PropTypes.string,
+  render: PropTypes.func.isRequired
 };

interface/src/containers/APSettings.js

@@ -19,14 +19,16 @@ class APSettings extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <APSettingsForm
-            apSettings={data}
-            onSubmit={saveData}
-            onReset={loadData}
-            handleValueChange={handleValueChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <APSettingsForm
+              apSettings={data}
+              onSubmit={saveData}
+              onReset={loadData}
+              handleValueChange={handleValueChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/APStatus.js

@@ -107,9 +107,11 @@ class APStatus extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          {this.renderAPStatus(data, classes)}
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={
+            () => this.renderAPStatus(data, classes)
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/ManageUsers.js

@@ -19,15 +19,17 @@ class ManageUsers extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <ManageUsersForm
-            userData={data}
-            onSubmit={saveData}
-            onReset={loadData}
-            setData={setData}
-            handleValueChange={handleValueChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <ManageUsersForm
+              userData={data}
+              onSubmit={saveData}
+              onReset={loadData}
+              setData={setData}
+              handleValueChange={handleValueChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/NTPSettings.js

@@ -19,14 +19,16 @@ class NTPSettings extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <NTPSettingsForm
-            ntpSettings={data}
-            onSubmit={saveData}
-            onReset={loadData}
-            handleValueChange={handleValueChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <NTPSettingsForm
+              ntpSettings={data}
+              onSubmit={saveData}
+              onReset={loadData}
+              handleValueChange={handleValueChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/NTPStatus.js

@@ -132,9 +132,11 @@ class NTPStatus extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          {this.renderNTPStatus(data, classes)}
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={
+            () => this.renderNTPStatus(data, classes)
+          }
+        />
       </SectionContent>
     );
   }

interface/src/containers/OTASettings.js

@@ -19,15 +19,17 @@ class OTASettings extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <OTASettingsForm
-            otaSettings={data}
-            onSubmit={saveData}
-            onReset={loadData}
-            handleValueChange={handleValueChange}
-            handleCheckboxChange={handleCheckboxChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <OTASettingsForm
+              otaSettings={data}
+              onSubmit={saveData}
+              onReset={loadData}
+              handleValueChange={handleValueChange}
+              handleCheckboxChange={handleCheckboxChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/SecuritySettings.js

@@ -19,14 +19,16 @@ class SecuritySettings extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <SecuritySettingsForm
-            securitySettings={data}
-            onSubmit={saveData}
-            onReset={loadData}
-            handleValueChange={handleValueChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <SecuritySettingsForm
+              securitySettings={data}
+              onSubmit={saveData}
+              onReset={loadData}
+              handleValueChange={handleValueChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/SystemStatus.js

@@ -84,7 +84,7 @@ class SystemStatus extends Component {
     );
   }
 
-  renderNTPStatus(data, classes) {
+  renderSystemStatus(data, classes) {
     return (
       <div>
         <List>
@@ -104,9 +104,11 @@ class SystemStatus extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          {this.renderNTPStatus(data, classes)}
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={
+            () => this.renderSystemStatus(data, classes)
+          }
+        />
       </SectionContent>
     )
   }

interface/src/containers/WiFiSettings.js

@@ -42,17 +42,19 @@ class WiFiSettings extends Component {
         <LoadingNotification
           onReset={loadData}
           fetched={fetched}
-          errorMessage={errorMessage}>
-          <WiFiSettingsForm
-            wifiSettings={data}
-            selectedNetwork={selectedNetwork}
-            deselectNetwork={deselectNetwork}
-            onSubmit={saveData}
-            onReset={this.deselectNetworkAndLoadData}
-            handleValueChange={handleValueChange}
-            handleCheckboxChange={handleCheckboxChange}
-          />
-        </LoadingNotification>
+          errorMessage={errorMessage}
+          render={() =>
+            <WiFiSettingsForm
+              wifiSettings={data}
+              selectedNetwork={selectedNetwork}
+              deselectNetwork={deselectNetwork}
+              onSubmit={saveData}
+              onReset={this.deselectNetworkAndLoadData}
+              handleValueChange={handleValueChange}
+              handleCheckboxChange={handleCheckboxChange}
+            />
+          }
+        />
       </SectionContent>
     )
   }