Merge pull request #70 from at88mph/refresh-fix

Replace componentWillReceiveProps unsafe function.
opencadc · Jul 10, 2024 · 7cbc477 · 7cbc477
2 parents 42e48a5 + e6e0d3d
commit 7cbc477
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 17 deletions.
diff --git a/VERSION b/VERSION
@@ -5,6 +5,6 @@
 # tags with and without build number so operators use the versioned
 # tag but we always keep a timestamped tag in case a semantic tag gets
 # replaced accidentally
-VER=0.2.5
+VER=0.2.6
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/src/react/SciencePortalConfirm.js b/src/react/SciencePortalConfirm.js
@@ -12,8 +12,16 @@ class SciencePortalConfirm extends React.Component {
     this.onConfirm = this.onConfirm.bind(this);
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState(nextProps)
+  static getDerivedStateFromProps(nextProps, _prevState) {
+    return nextProps;
+  }
+
+  componentDidUpdate(nextProps) {
+    if (this.props !== nextProps) {
+      this.setState({
+        nextProps
+      });
+    }
   }
 
   onClose(event) {

diff --git a/src/react/SciencePortalForm.js b/src/react/SciencePortalForm.js
@@ -60,13 +60,19 @@ class SciencePortalForm extends React.Component {
       selectedRAM : this.state.fData.contextData.defaultRAM
     });
     this.state.fData.resetHandler();
-
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState({ fData: nextProps.fData });
+  static getDerivedStateFromProps(nextProps, _prevState) {
+    return { fData: nextProps.fData };
   }
 
+  componentDidUpdate(nextProps) {
+    if (this.props.fData !== nextProps.fData) {
+      this.setState({
+        fData: nextProps.fData
+      });
+    }
+  }
 
   renderPopover(headerText, bodyText) {
     return <OverlayTrigger

diff --git a/src/react/SciencePortalModal.js b/src/react/SciencePortalModal.js
@@ -16,8 +16,16 @@ class SciencePortalModal extends React.Component {
     this.setState({isOpen: false});
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState({modalData: nextProps.modalData});
+  static getDerivedStateFromProps(nextProps, _prevState) {
+    return { modalData: nextProps.modalData };
+  }
+
+  componentDidUpdate(nextProps) {
+    if (this.props.modalData !== nextProps.modalData) {
+      this.setState({
+        modalData: nextProps.modalData
+      });
+    }
   }
 
   handleReload = () => {

diff --git a/src/react/canfar/CanfarLoginModal.js b/src/react/canfar/CanfarLoginModal.js
@@ -19,8 +19,16 @@ class CanfarLoginModal extends React.Component {
     this.setState({ isOpen: false });
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState(nextProps);
+  static getDerivedStateFromProps(nextProps, _prevState) {
+    return nextProps;
+  }
+
+  componentDidUpdate(nextProps) {
+    if (this.props !== nextProps) {
+      this.setState({
+        nextProps
+      });
+    }
   }
 
   closeModal = () => this.setState({ isOpen: false });

diff --git a/src/react/canfar/CanfarNavbar.js b/src/react/canfar/CanfarNavbar.js
@@ -26,10 +26,17 @@ class CanfarNavbar extends React.Component {
 
     // This function allows data to move through and re-render
     // children using this data
-    componentWillReceiveProps(nextProps) {
-      this.setState(nextProps);
+    static getDerivedStateFromProps(nextProps, _prevState) {
+      return nextProps;
+    }
+
+    componentDidUpdate(nextProps) {
+      if (this.props !== nextProps) {
+        this.setState({
+          nextProps
+        });
+      }
     }
-
     renderButton() {
       return (
         <Button size="sm" variant="outline-primary">{this.state.authenticatedUser}<span className="sp-buffer-span-left"><FontAwesomeIcon icon={faCaretDown} /></span></Button>

diff --git a/src/react/src/SRCLoginModal.js b/src/react/src/SRCLoginModal.js
@@ -15,8 +15,16 @@ class SRCLoginModal extends React.Component {
     this.setState({ isOpen: false });
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState(nextProps);
+  static getDerivedStateFromProps(nextProps, _prevState) {
+    return nextProps;
+  }
+
+  componentDidUpdate(nextProps) {
+    if (this.props !== nextProps) {
+      this.setState({
+        nextProps
+      });
+    }
   }
 
   closeModal = () => this.setState({ isOpen: false });

diff --git a/src/react/src/SRCNavbar.js b/src/react/src/SRCNavbar.js
@@ -17,8 +17,16 @@ class SRCNavbar extends React.Component {
 
     // This function allows data to move through and re-render
     // children using this data
-    componentWillReceiveProps(nextProps) {
-      this.setState(nextProps);
+    static getDerivedStateFromProps(nextProps, _prevState) {
+      return nextProps;
+    }
+
+    componentDidUpdate(nextProps) {
+      if (this.props !== nextProps) {
+        this.setState({
+          nextProps
+        });
+      }
     }
 
     render() {