[IGNORE] Tom timer refresh

package.json

@@ -155,7 +155,7 @@
   },
   "proxy": {
     "/bootstrap/": {
-      "target": "https://nxt3.staging.lizard.net/",
+      "target": "https://demo.lizard.net/",
       "changeOrigin": true,
       "ssl": false,
       "secure": false,
@@ -165,7 +165,7 @@
       }
     },
     "/api/v3/": {
-      "target": "https://nxt3.staging.lizard.net/",
+      "target": "https://demo.lizard.net/",
       "changeOrigin": true,
       "ssl": false,
       "secure": false,

src/App.js

@@ -3,17 +3,56 @@ import GridLayout from "./components/GridLayout";
 import FullLayout from "./components/FullLayout";
 import { connect } from "react-redux";
 import { Route, withRouter } from "react-router-dom";
+import { getConfiguredNow } from "./reducers";
 
-import { fetchAlarms } from "./actions";
+import { fetchAlarms, setDateTimeAction } from "./actions";
 import styles from "./App.css";
 
 class App extends Component {
+  componentWillMount() {
+    this.setDateTimeActionWithNow();
+    const that = this;
+    // update redux time every minute (60000 miliseconds) because redux only saves time on the minute accurate
+    setInterval(function() {
+      that.setDateTimeActionWithNow();
+    }, 60000);
+  }
+
   componentDidMount() {
     if (!this.props.iframeModeActive) {
       this.props.fetchAlarms();
     }
   }
 
+  setDateTimeActionWithNow() {
+    const jsDateObject = new Date();
+    const utcMinutes = jsDateObject.getUTCMinutes();
+    const utcMinutesZeroPrefixed =
+      utcMinutes < 10 ? "0" + utcMinutes : utcMinutes;
+
+    const dateStr =
+      jsDateObject.getUTCFullYear() +
+      "-" +
+      (jsDateObject.getUTCMonth() + 1) +
+      "-" +
+      jsDateObject.getUTCDate();
+    const timeStr = jsDateObject.getUTCHours() + ":" + utcMinutesZeroPrefixed;
+
+    this.props.setDateTimeAction(dateStr, timeStr);
+  }
+
+  componentDidUpdate(prevProps) {
+    if (
+      !prevProps.configuredNow ||
+      (prevProps.configuredNow && !this.props.configuredNow) ||
+      this.props.configuredNow.getTime() != prevProps.configuredNow.getTime()
+    ) {
+      if (!this.props.iframeModeActive) {
+        this.props.fetchAlarms();
+      }
+    }
+  }
+
   render() {
     return (
       <div className={styles.App}>
@@ -26,13 +65,15 @@ class App extends Component {
 
 function mapStateToProps(state) {
   return {
-    iframeModeActive: state.iframeMode.active
+    iframeModeActive: state.iframeMode.active,
+    configuredNow: getConfiguredNow(state)
   };
 }
 
 function mapDispatchToProps(dispatch) {
   return {
-    fetchAlarms: () => fetchAlarms(dispatch)
+    fetchAlarms: () => fetchAlarms(dispatch),
+    setDateTimeAction: (date, time) => setDateTimeAction(dispatch)(date, time)
   };
 }
 

src/actions.js

@@ -23,6 +23,7 @@ export const RECEIVE_BOOTSTRAP_SUCCESS = "RECEIVE_BOOTSTRAP_SUCCESS";
 export const RECEIVE_BOOTSTRAP_ERROR = "RECEIVE_BOOTSTRAP_ERROR";
 
 // SettingsActions
+export const SET_DATE_TIME = "SET_DATE_TIME";
 export const SET_DATE = "SET_DATE";
 export const SET_TIME = "SET_TIME";
 export const RESET_DATETIME = "RESET_DATETIME";
@@ -71,7 +72,6 @@ export function fetchAlarms(dispatch) {
 
   getRasterAlarms({ active: true, page_size: 1000 }).then(
     alarms => {
-      console.log("[P] Received alarms:", alarms);
       dispatch(receiveAlarmsAction(alarms, false));
     },
     error => {
@@ -142,7 +142,7 @@ export function fetchBootstrap(dispatch, sessionState) {
 
   dispatch(fetchBootstrapAction());
 
-  getBootstrap("parramatta-dashboard").then(
+  getBootstrap("tdb_parra_vnrdsxt574").then(
     bootstrap => {
       dispatch(receiveBootstrapSuccessAction(bootstrap));
     },
@@ -202,6 +202,18 @@ const receiveRasterEventsAction = (uuid, geomKey, start, end, events) => {
   };
 };
 
+export const setDateTimeAction = function(dispatch) {
+  return (date, time) => {
+    dispatch({
+      type: SET_DATE_TIME,
+      data: {
+        date: date,
+        time: time
+      }
+    });
+  };
+};
+
 export const setDateAction = function(dispatch) {
   return date =>
     dispatch({

src/components/FullStatistics.js

@@ -3,6 +3,7 @@ import { connect } from "react-redux";
 import { Scrollbars } from "react-custom-scrollbars";
 import { fetchAlarms } from "../actions";
 import { IconActiveAlarmSVG, IconInactiveAlarmSVG } from "./Icons";
+import { getConfiguredNow } from "../reducers";
 
 import styles from "./FullStatistics.css";
 
@@ -12,6 +13,16 @@ class FullStatistics extends Component {
       this.props.fetchAlarms();
     }
   }
+  componentDidUpdate(prevProps) {
+    if (
+      !prevProps.configuredNow ||
+      this.props.configuredNow.getTime() != prevProps.configuredNow.getTime()
+    ) {
+      if (!this.props.iframeModeActive) {
+        this.props.fetchAlarms();
+      }
+    }
+  }
   getDatetimeString(utcRep) {
     if (utcRep === null) {
       return null;
@@ -98,7 +109,8 @@ class FullStatistics extends Component {
 const mapStateToProps = (state, ownProps) => {
   return {
     alarms: state.alarms,
-    iframeModeActive: state.iframeMode.active
+    iframeModeActive: state.iframeMode.active,
+    configuredNow: getConfiguredNow(state)
   };
 };
 

src/components/GridLayout.js

@@ -149,7 +149,7 @@ class GridLayout extends Component {
 
             <main style={{ height: height - 100 }}>
               {settingsMenuId === 0 ? (
-                <div style={{padding: 20}}>
+                <div style={{ padding: 20 }}>
                   <h4 style={{ padding: 0, margin: 0 }}>
                     Date/time settings &nbsp;
                     <button onClick={this.props.resetDateTime}>Reset</button>
@@ -162,8 +162,9 @@ class GridLayout extends Component {
                         type="date"
                         name="date"
                         value={this.props.date}
-                        onChange={event =>
-                          this.props.changeDate(event.target.value)}
+                        onChange={event => {
+                          this.props.changeDate(event.target.value);
+                        }}
                       />
                     </div>
                     <div>
@@ -172,17 +173,23 @@ class GridLayout extends Component {
                         type="time"
                         name="time"
                         value={this.props.time}
-                        onChange={event =>
-                          this.props.changeTime(event.target.value)}
+                        onChange={event => {
+                          this.props.changeTime(event.target.value);
+                        }}
                       />
                     </div>
                   </div>
-                  <br/>
-                  <button className={styles.OKButton} onClick={() => this.setState({ settingsMenu: false })}>OK</button>
+                  <br />
+                  <button
+                    className={styles.OKButton}
+                    onClick={() => this.setState({ settingsMenu: false })}
+                  >
+                    OK
+                  </button>
                 </div>
               ) : null}
               {settingsMenuId === 1 ? (
-                <div style={{padding: 20}}>
+                <div style={{ padding: 20 }}>
                   <h4 style={{ padding: 0, margin: 0 }}>Map settings</h4>
                   <hr />
                   <div className={styles.MapSettings}>
@@ -204,13 +211,18 @@ class GridLayout extends Component {
                       Switch
                     </button>
                   </div>
-                  <br/>
-                  <button className={styles.OKButton} onClick={() => this.setState({ settingsMenu: false })}>OK</button>                  
+                  <br />
+                  <button
+                    className={styles.OKButton}
+                    onClick={() => this.setState({ settingsMenu: false })}
+                  >
+                    OK
+                  </button>
                 </div>
               ) : null}
 
               {settingsMenuId === 2 ? (
-                <div style={{padding: 20}}>
+                <div style={{ padding: 20 }}>
                   <h4 style={{ padding: 0, margin: 0 }}>Contact info</h4>
                   <hr />
                   <p>