diff --git a/imports/ui/components/Loading/LoadingBar.js b/imports/ui/components/Loading/LoadingBar.js index 943e9a5..93bba69 100644 --- a/imports/ui/components/Loading/LoadingBar.js +++ b/imports/ui/components/Loading/LoadingBar.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Meteor } from 'meteor/meteor'; import { Line } from 'react-progressbar.js'; import './LoadingBar.scss'; @@ -10,7 +11,7 @@ import './LoadingBar.scss'; const LoadingBar = ({ progress }) => (
diff --git a/imports/ui/components/Reconnect/Reconnect.js b/imports/ui/components/Reconnect/Reconnect.js index 406d049..6c12778 100644 --- a/imports/ui/components/Reconnect/Reconnect.js +++ b/imports/ui/components/Reconnect/Reconnect.js @@ -10,7 +10,7 @@ import Blaze from 'meteor/gadicc:blaze-react-component'; const Reconnect = ({ t, authenticated }) => (
- { !authenticated && + { true && /* !authenticated && */ = MAXZOOMREACTIVE}`); + const loading = this.props.loading || !this.props.subsready; + console.log(`Rendering ${loading ? 'loading' : 'LOADED'}, zoom ${this.state.viewport.zoom}, map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); const title = `${t('AppName')}: ${t('Fuegos activos')}`; if (Meteor.isDevelopment && this.props.activefires.length === 1) console.log(`Active fire: ${JSON.stringify(this.props.activefires[0])}`); @@ -263,7 +264,7 @@ class FiresMap extends React.Component {

- {this.props.loading || !this.props.subsready ? + {loading ? : ''} {/* https://github.com/CliffCloud/Leaflet.Sleep */} @@ -453,7 +454,7 @@ export default translate([], { wait: true })(withTracker(() => { const lastFireDetected = ActiveFiresCollection.findOne({}, { sort: { when: -1 } }); return { - loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready() && alertSubscription.ready()), + loading: Meteor.status().status !== 'connected' || !subscription ? true : !(subscription.ready() && settingsSubs.ready() && alertSubscription.ready()), userSubs: userSubs ? userSubs.value : null, userSubsBounds: userSubs ? userSubsBounds.value : null, subsready: settingsSubs.ready(),