improved uirevision logic

Author: dbuezas

src/parse-config/defaults.ts

@@ -119,13 +119,9 @@ export function addPreParsingDefaults(yaml: InputConfig): InputConfig {
 
 export function addPostParsingDefaults({
   yaml,
-  isBrowsing,
-  old_uirevision,
   css_vars,
 }: {
   yaml: Config;
-  isBrowsing: boolean;
-  old_uirevision: number;
   css_vars: HATheme;
 }): Config {
   // 3rd pass: decorate
@@ -150,8 +146,6 @@ export function addPostParsingDefaults({
           xaxis: {
             range: yaml.visible_range,
           },
-          //changing the uirevision triggers a reset to the axes
-          uirevision: isBrowsing ? old_uirevision : Math.random(),
         },
     yaml.raw_plotly_config ? {} : yAxisTitles,
     yaml.layout

src/parse-config/parse-config.ts

@@ -46,9 +46,6 @@ class ConfigParser {
     this.errors = [];
     this.hass = hass;
     this.yaml_with_defaults = addPreParsingDefaults(input_yaml);
-    const isBrowsing = !!input_yaml.visible_range;
-    console.log("isBrowsing", isBrowsing);
-
     // 2nd pass: evaluate functions
 
     this.fnParam = {
@@ -74,8 +71,6 @@ class ConfigParser {
     //TODO: mutates
     this.yaml = addPostParsingDefaults({
       yaml: this.yaml,
-      isBrowsing,
-      old_uirevision,
       css_vars,
     });
 

src/plotly-graph-card.ts

@@ -226,7 +226,8 @@ export class PlotlyGraph extends HTMLElement {
   }
 
   getVisibleRange() {
-    return this.contentEl.layout.xaxis!.range!.map((date) => {
+    // TODO: if the x axis is not there, or is not time, don't fetch & replot
+    return this.contentEl.layout.xaxis?.range?.map((date) => {
       // if autoscale is used after scrolling, plotly returns the dates as timestamps (numbers) instead of iso strings
       if (Number.isFinite(date)) return date;
       if (date.startsWith("-")) {
@@ -309,19 +310,30 @@ export class PlotlyGraph extends HTMLElement {
     if (this.pausedRendering) return;
     const should_fetch = this.fetchScheduled;
     this.fetchScheduled = false;
+    let i = 0;
     while (!(this.config && this.hass && this.isConnected)) {
+      if (i++ > 10) throw new Error("Card didn't load");
       console.log("waiting for loading");
       await sleep(100);
     }
     const fetch_mask = this.contentEl.data.map(
       ({ visible }) => should_fetch && visible !== "legendonly"
     );
+    const uirevision = this.isBrowsing
+      ? this.contentEl.layout?.uirevision || 0
+      : Math.random();
     const yaml = merge(
       {},
       this.config,
-      { layout: this.size },
-      { fetch_mask },
+      {
+        layout: {
+          ...this.size,
+          ...{ uirevision },
+        },
+        fetch_mask,
+      },
       this.isBrowsing ? { visible_range: this.getVisibleRange() } : {},
+
       this.config
     );
     const { errors, parsed } = await this.configParser.update({