Bug/inferred metric

src/app/global/mixins/reach-api-helper.js

@@ -163,12 +163,41 @@ export const reachApiHelper = {
     // these take just the correlation status object
     displayGaugeCorrelationLatestReadingTime(status) {
       if (status && status.latestReading) {
-        const now = new Date();
         const readingTime = new Date(status.latestReading.dateTime);
-        return humanReadable(now.getTime() - readingTime.getTime())
+        return this.timeSince(readingTime);
       }
       return '';
     },
+    // returns the metric from correlationDetails if it
+    // is set; if not, infers by checking gaugeInfo's latest
+    // readings and defaulting to CFS if available
+    getCorrelationMetric(gauge) {
+      if (gauge.correlationDetails && gauge.correlationDetails.metric) {
+        return gauge.correlationDetails.metric;
+      } else {
+        if (gauge.gaugeInfo.latestFlowReading) {
+          return this.correlationMetrics.cfs.key;
+        } else if (gauge.gaugeInfo.latestStageReading) {
+          return this.correlationMetrics.levelFT.key;
+        }
+      }
+      return null;
+    },
+    // returns latest reading from status if corrDetails are set
+    // otherwise, returns from gaugeInfo, defaulting to cfs
+    // if available and otherwise returning stage or null
+    getLatestReading(gauge) {
+      if (gauge.status) {
+        return gauge.status.latestReading;
+      } else {
+        return gauge.gaugeInfo.latestFlowReading ||
+          gauge.gaugeInfo.latestStageReading || null;
+      }
+    },
+    timeSince(dateTime) {
+      const now = new Date();
+      return humanReadable(now.getTime() - dateTime.getTime());
+    },
     cssClassForGaugeCorrelation(status) {
       if (status && status.status) {
         return status.status; // TODO: not 100% sure if this works atm

src/app/views/river-detail/components/flow-tab/components/flow-chart/flow-chart.vue

@@ -25,7 +25,7 @@ export default {
       type: String,
       required: false,
       default: 'week',
-      validator: val => ['24h', 'week', 'year'].indexOf(val) > -1
+      validator: val => ['24h', 'week', 'month', 'year'].indexOf(val) > -1
     },
     readings: {
       type: Array,

src/app/views/river-detail/components/flow-tab/flow-tab.vue

@@ -38,9 +38,8 @@
                     Difficulty at this level
                   </template>
                 </div>
-                <div v-if="gauge.status" :class="`gauge-reading background`">
-                  {{ gauge.status.latestReading.value }} {{ correlationMetrics[gauge.status.metric].unit }}
-                  @ {{ formatDate(new Date(gauge.status.latestReading.dateTime)) }}
+                <div v-if="displayLatestReading(gauge)" :class="`gauge-reading background`">
+                  {{ displayLatestReading(gauge) }}
                 </div>
                 <div v-if="gauge.correlationDetails" class="gauge-range">
                   {{ gauge.correlationDetails.beginLowRunnable }} - {{ gauge.correlationDetails.endHighRunnable }}
@@ -76,8 +75,6 @@
                                 :timeScale="gauge.historyTimeScale"
                                 class="mb-md"
                                 :metric="correlationMetrics[gauge.requestedMetric]"
-                                :current="gauge.status.latestReading.value"
-
                             />
                           </div>
                         </div>
@@ -277,9 +274,13 @@ export default {
         let correlations = [];
         if (reachDetail?.detail?.correlations) {
           correlations = reachDetail?.detail?.correlations.map(c => {
+            // if metric isn't set (and corrDetails isn't set),
+            // infer default metric based on what data is available, defaulting to CFS
+            const requestedMetric = this.getCorrelationMetric(c);
+
             return {
               ...c,
-              requestedMetric: c.correlationDetails?.metric,
+              requestedMetric: requestedMetric,
               historyTimeScale: 'week',
               readings: [],
               loading: true
@@ -309,14 +310,25 @@ export default {
         return ('too-hi')
       }
     },
+    displayLatestReading(gauge) {
+      if (gauge.status) {
+        return `${gauge.status.latestReading.value} ${this.correlationMetrics[gauge.status.metric].unit}` +
+          ` @ ${this.formatDate(new Date(gauge.status.latestReading.dateTime))}`;
+      } else if (gauge.readings && gauge.readings.length) {
+        const reading = gauge.readings[0];
+        return `${reading.value} ${this.correlationMetrics[gauge.requestedMetric].unit}` +
+          ` @ ${this.formatDate(new Date(reading.dateTime))}`;
+      }
+      return null;
+    },
     correlationMatchesMetric(gauge) {
      return gauge && gauge.correlationDetails &&
         gauge.correlationDetails.metric === gauge.requestedMetric;
     },
     async getReadings(gauge) {
       gauge.loading = true;
       gauge.readings = await gaugeClient.gaugeReadingsHistory.query({
-        desiredMetric: gauge.requestedMetric || this.correlationMetrics.cfs.key,
+        desiredMetric: gauge.requestedMetric,
         timePeriod: gauge.historyTimeScale || '24h',
         gaugeSource: gauge.gaugeInfo.gaugeSource,
         gaugeSourceIdentifier: gauge.gaugeInfo.gaugeSourceIdentifier

src/app/views/river-detail/components/main-tab/components/beta-box/beta-box.vue

@@ -71,20 +71,20 @@
               {{ correlationMetrics[gaugeCorrelation.correlationDetails.data.metric].unit }}
             </td>
           </tr>
-          <tr v-if="gaugeCorrelation.status">
+          <tr v-if="gaugeCorrelation && getLatestReading(gaugeCorrelation)">
             <td>
               Flow Rate
-              as of {{ displayGaugeCorrelationLatestReadingTime(gaugeCorrelation.status) }}
+              as of {{ displayLatestReadingTime }}
             </td>
             <td class="river-flow-rate">
-              {{ gaugeCorrelation.status.latestReading.value }} {{ correlationMetrics[gaugeCorrelation.status.metric].unit }}
+              {{ getLatestReading(gaugeCorrelation).value }} {{ correlationMetrics[getCorrelationMetric(gaugeCorrelation)].unit }}
               <cv-tag
                   v-if="adjustedReachDifficulty(gaugeCorrelation)"
                   kind="cool-gray"
                   :label="adjustedReachDifficulty(gaugeCorrelation)"
               />
               <cv-tag
-                  v-if="gaugeCorrelation.status.status"
+                  v-if="gaugeCorrelation.status && gaugeCorrelation.status.status"
                   :class="gaugeCorrelation.status.status"
                   :label="gaugeCorrelation.status.status.replace('-', ' ').replace('migration', '')"
               /> <!-- TODO: reference to "migration" above handles existing legacy migration-runnable data -->
@@ -161,6 +161,10 @@ export default {
       }
       return null;
     },
+    displayLatestReadingTime() {
+      const readingTime = new Date(this.getLatestReading(this.gaugeCorrelation).dateTime);
+      return this.timeSince(readingTime);
+    },
     /**
      * Event date or null
      */

src/app/views/river-index/rivers-by-state.vue

@@ -25,14 +25,14 @@
               <tr v-for="reach in reaches" :key="reach.id" :class="`${cssClassForGaugeCorrelation(reach.correlation)} reach`" @click="$router.push(`/river-detail/${reach.id}/main`)">
                 <td>
                   <strong>
-                    {{ [reach.river, renderLegacyDifficulty(reach.class)].join(" - ") }}
+                    {{ [reach.river, reach.class].join(" - ") }}
                   </strong>
                   <br>
                   {{ reach.section }}
                   <span v-if="reach.altname">({{ reach.altname }})</span>
                 </td>
                 <td class="reach-flow">
-                  <strong v-if="reach.correlation && reach.correlation.status">
+                  <strong v-if="reach.correlation">
                     {{ reach.correlation.latestReading.value }} {{ correlationMetrics[reach.correlation.metric].unit }}
                   </strong>
                 </td>