Merge pull request #65 from firelab/kc-BHP1-1289-fix-graph-results

Author: rjsheperd

projects/behave/src/cljs/behave/components/results/graphs.cljs

@@ -3,8 +3,7 @@
             [re-frame.core                       :refer [subscribe]]))
 
 (defn result-graphs [ws-uuid cell-data]
-  (let [worksheet      @(subscribe [:worksheet ws-uuid])
-        graph-enabled? (get-in worksheet [:worksheet/graph-settings :graph-settings/enabled?])
+  (let [graph-enabled? @(subscribe [:wizard/enable-graph-settings? ws-uuid])
         graph-settings @(subscribe [:worksheet/graph-settings ws-uuid])]
     (when (and graph-enabled? graph-settings)
       (let [*output-uuids (subscribe [:worksheet/output-uuids-filtered ws-uuid])

projects/behave/src/cljs/behave/wizard/views.cljs

@@ -660,7 +660,7 @@
                                        :icon-name :tables
                                        :selected? (= @*tab-selected :outputs)}])
 
-                               (get-in @*worksheet [:worksheet/graph-settings :graph-settings/enabled?])
+                               @(subscribe [:wizard/enable-graph-settings? ws-uuid])
                                (conj {:label     (-> @(<t (bp "output_graphs"))
                                                      s/capitalize-words)
                                       :tab       :graph