hotfix/ Charts Theme change not persisting (#5036)

* revert and fix bug introduced in #4546 * improve theme change in chart, add `theme.apply_style()` to settings_controller/hub config change
OpenBB-finance · May 17, 2023 · b54c47e · b54c47e
1 parent 9beba4c
commit b54c47e
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 93 deletions.
diff --git a/frontend-components/plotly/src/App.tsx b/frontend-components/plotly/src/App.tsx
@@ -98,6 +98,7 @@ function App() {
       python_version: data.python_version,
       pywry_version: data.pywry_version,
       terminal_version: data.terminal_version,
+	  theme: data.theme,
       title,
     };
   };
@@ -155,6 +156,7 @@ function App() {
         cmd={transformedData.cmd}
         title={transformedData.title}
         globals={transformedData.globals}
+		theme={transformedData.theme}
         info={info}
       />
     );

diff --git a/frontend-components/plotly/src/components/Chart.tsx b/frontend-components/plotly/src/components/Chart.tsx
@@ -25,6 +25,7 @@ export default function Chart({
   cmd,
   title,
   globals,
+  theme,
   info,
 }: {
   // @ts-ignore
@@ -33,6 +34,7 @@ export default function Chart({
   cmd: string;
   title: string;
   globals: any;
+  theme: string;
   info?: any;
 }) {
   const posthog = usePostHog();
@@ -219,7 +221,7 @@ export default function Chart({
         const TRACES = plotData?.data.filter((trace) =>
           trace?.name?.startsWith("Volume")
         );
-        let darkmode = !darkMode;
+        const darkmode = !darkMode;
 
         window.document.body.style.backgroundColor = darkmode ? "#000" : "#fff";
 
@@ -240,15 +242,19 @@ export default function Chart({
           .getElementsByTagName("svg")[0]
           .setAttribute("viewBox", changeIcon.viewBox);
 
-        const volumeColors = {
-          "#e4003a": "#c80000",
-          "#00ACFF": "#009600",
+        const volumeColorsDark = {
           "#009600": "#00ACFF",
           "#c80000": "#e4003a",
         };
+        const volumeColorsLight = {
+          "#e4003a": "#c80000",
+          "#00ACFF": "#009600",
+        };
+
+        const volumeColors = darkmode ? volumeColorsDark : volumeColorsLight;
 
         TRACES.forEach((trace) => {
-          if (trace.type == "bar")
+          if (trace.type === "bar")
             trace.marker.color = trace.marker.color.map((color) => {
               return volumeColors[color] || color;
             });
@@ -367,6 +373,10 @@ export default function Chart({
           Plotly.relayout(plotDiv, layout_update);
         }
       });
+
+      if (theme !== "dark") {
+        setChangeTheme(true);
+      }
     }
   }, [plotLoaded]);
 

diff --git a/openbb_terminal/core/plots/backend.py b/openbb_terminal/core/plots/backend.py
@@ -350,7 +350,7 @@ def get_kwargs(self, title: str = "") -> dict:
             "download_path": str(get_current_user().preferences.USER_EXPORTS_DIRECTORY),
         }
 
-    def start(self, debug: bool = False):
+    def start(self, debug: bool = False):  # pylint: disable=W0221
         """Start the backend WindowManager process."""
         if self.isatty:
             super().start(debug)

diff --git a/openbb_terminal/core/plots/plotly.html b/openbb_terminal/core/plots/plotly.html
diff --git a/openbb_terminal/core/plots/plotly_helper.py b/openbb_terminal/core/plots/plotly_helper.py
@@ -125,8 +125,7 @@ def apply_console_style(self, style: Optional[str] = None) -> None:
 
     def apply_style(self, style: Optional[str] = "") -> None:
         """Apply the style to the libraries."""
-        if not style:
-            style = get_current_user().preferences.CHART_STYLE
+        style = style or self.plt_style
 
         if style != self.plt_style:
             self.load_style(style)
@@ -1055,7 +1054,6 @@ def show(
         if kwargs.pop("margin", True):
             self._adjust_margins()
 
-        theme.apply_style()
         self._apply_feature_flags()
         self._xaxis_tickformatstops()
 
@@ -1381,7 +1379,6 @@ def to_html(self, *args, **kwargs) -> str:
                 full_html=False,
             )
         )
-        theme.apply_style()
         self._apply_feature_flags()
         self._xaxis_tickformatstops()
 

diff --git a/openbb_terminal/core/session/local_model.py b/openbb_terminal/core/session/local_model.py
@@ -198,6 +198,10 @@ def set_chart_style_from_hub(configs: dict):
             chart_style = terminal_style.get("chart", None)
             if chart_style:
                 set_preference("CHART_STYLE", chart_style)
+                # pylint: disable=import-outside-toplevel
+                from openbb_terminal import theme
+
+                theme.apply_style(chart_style)
 
 
 def set_table_style_from_hub(configs: dict):

diff --git a/openbb_terminal/settings_controller.py b/openbb_terminal/settings_controller.py
@@ -284,6 +284,7 @@ def call_chart(self, other_args: List[str]):
                     auth_header=get_current_user().profile.get_auth_header(),
                 )
                 console.print("")
+            theme.apply_style(ns_parser.style)
             console.print("Chart theme updated.\n")
 
     @log_start_end(log=logger)