[Canvas] Force embeddables to refresh when renderable reevaluated (el…

…astic#67133) * Force embeddables to refresh when renderable reevaluated * prettier * Rename generated property Co-authored-by: Elastic Machine <[email protected]>
VladLasitsa · May 26, 2020 · c8b1fc5 · c8b1fc5
1 parent 5d26740
commit c8b1fc5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -12,9 +12,23 @@ export const EmbeddableExpressionType = 'embeddable';
 export { EmbeddableTypes, EmbeddableInput };
 
 export interface EmbeddableExpression<Input extends EmbeddableInput> {
+  /**
+   * The type of the expression result
+   */
   type: typeof EmbeddableExpressionType;
+  /**
+   * The input to be passed to the embeddable
+   */
   input: Input;
+  /**
+   * The type of embeddable
+   */
   embeddableType: string;
+  /**
+   * Timestamp. Needed to get a different result after each time the expression is evaluated
+   * to force a reload of the embeddables internal data
+   */
+  generatedAt: number;
 }
 
 export const embeddableType = (): ExpressionTypeDefinition<

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts
@@ -76,6 +76,7 @@ export function savedLens(): ExpressionFunctionDefinition<
           disableTriggers: true,
         },
         embeddableType: EmbeddableTypes.lens,
+        generatedAt: Date.now(),
       };
     },
   };

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
@@ -98,6 +98,7 @@ export function savedMap(): ExpressionFunctionDefinition<
           hiddenLayers: args.hideLayer || [],
         },
         embeddableType: EmbeddableTypes.map,
+        generatedAt: Date.now(),
       };
     },
   };

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
@@ -49,6 +49,7 @@ export function savedSearch(): ExpressionFunctionDefinition<
           ...buildEmbeddableFilters(filters),
         },
         embeddableType: EmbeddableTypes.search,
+        generatedAt: Date.now(),
       };
     },
   };

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
@@ -92,6 +92,7 @@ export function savedVisualization(): ExpressionFunctionDefinition<
           vis: visOptions,
         },
         embeddableType: EmbeddableTypes.visualization,
+        generatedAt: Date.now(),
       };
     },
   };

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -112,6 +112,7 @@ export const embeddableRendererFactory = (core: CoreStart, plugins: StartDeps) =
         });
       } else {
         embeddablesRegistry[uniqueId].updateInput(input);
+        embeddablesRegistry[uniqueId].reload();
       }
     },
   });