Merge pull request #62 from firelab/kc-BHP1-1286-default-enable-graph-settings

[BHP1-1286] Default Graph Settings to True When Needed

Author: rjsheperd

projects/behave/src/cljs/behave/wizard/subs.cljs

@@ -850,3 +850,15 @@
  (fn [[_ ws-uuid]] (subscribe [:wizard/multi-value-input-count ws-uuid]))
  (fn [count _]
    (pos? count)))
+
+(reg-sub
+ :wizard/enable-graph-settings?
+ (fn [[_ ws-uuid]]
+   [(subscribe [:worksheet/get-graph-settings-attr
+                ws-uuid
+                :graph-settings/enabled?])
+    (subscribe [:worksheet/multi-value-input-uuids ws-uuid])])
+ (fn [[saved-enabled?-setting multi-valued-inputs] _]
+   (if (not (nil? (first saved-enabled?-setting)))
+     (first saved-enabled?-setting)
+     (pos? (count multi-valued-inputs)))))

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

@@ -439,13 +439,11 @@
   (let [*multi-value-input-uuids (subscribe [:worksheet/multi-value-input-uuids ws-uuid])
         group-variables          (->> @*multi-value-input-uuids
                                       (map #(deref (subscribe [:wizard/group-variable %]))))
-        enabled?                 (first @(subscribe [:worksheet/get-graph-settings-attr
-                                                     ws-uuid
-                                                     :graph-settings/enabled?]))
         multi-valued-input-uuids @(subscribe [:worksheet/multi-value-input-uuids ws-uuid])
         multi-valued-input-count (count multi-valued-input-uuids)
         x-axis-limits            (first @(subscribe [:worksheet/graph-settings-x-axis-limits ws-uuid]))
-        units-lookup                   @(subscribe [:worksheet/result-table-units ws-uuid])]
+        units-lookup             @(subscribe [:worksheet/result-table-units ws-uuid])
+        enabled?                 @(subscribe [:wizard/enable-graph-settings? ws-uuid])]
     (letfn [(radio-group [{:keys [label attr variables on-change]}]
               (let [*values   (subscribe [:worksheet/get-graph-settings-attr ws-uuid attr])
                     selected? (first @*values)]

projects/behave/src/cljs/behave/worksheet/events.cljs

@@ -427,7 +427,9 @@
    (let [graph-setting-id (get-in worksheet [:worksheet/graph-settings :db/id])
          enabled?         (get-in worksheet [:worksheet/graph-settings :graph-settings/enabled?])]
      {:transact [{:db/id                   graph-setting-id
-                  :graph-settings/enabled? (not enabled?)}]
+                  :graph-settings/enabled? (if (nil? enabled?)
+                                             false
+                                             (not enabled?))}]
       :fx       [[:dispatch [:worksheet/set-default-graph-settings ws-uuid]]]})))
 
 (rp/reg-event-fx