From 00d2ee644a4ef5397258df7fff0d219d310818a3 Mon Sep 17 00:00:00 2001 From: David de la Iglesia Castro Date: Tue, 8 Mar 2022 10:21:57 +0100 Subject: [PATCH] vega: Extract `_fill_properties`. --- src/dvc_render/vega.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/dvc_render/vega.py b/src/dvc_render/vega.py index 46a6b08..fe9b5c1 100644 --- a/src/dvc_render/vega.py +++ b/src/dvc_render/vega.py @@ -37,6 +37,18 @@ def __init__(self, datapoints: Dict, name: str, **properties): self.properties.get("template_dir", None), ) + def _fill_properties(self, content: str) -> str: + self.properties.setdefault("title", "") + self.properties.setdefault("x_label", self.properties.get("x")) + self.properties.setdefault("y_label", self.properties.get("y")) + + names = ["title", "x", "y", "x_label", "y_label"] + for name in names: + value = self.properties.get(name) + if value is not None: + content = self.template.fill_anchor(content, name, value) + return content + def partial_html(self) -> str: content = deepcopy(self.template.content) if self.template.anchor_str("data") not in self.template.content: @@ -55,15 +67,7 @@ def partial_html(self) -> str: self.datapoints, self.properties.get("y") ) + content = self._fill_properties(content) content = self.template.fill_anchor(content, "data", self.datapoints) - self.properties.setdefault("title", "") - self.properties.setdefault("x_label", self.properties.get("x")) - self.properties.setdefault("y_label", self.properties.get("y")) - - names = ["title", "x", "y", "x_label", "y_label"] - for name in names: - value = self.properties.get(name) - if value is not None: - content = self.template.fill_anchor(content, name, value) return content