Skip to content

Commit 7f91db3

Browse files
committed
fix checkbox graph settings enabled?
1 parent f763e38 commit 7f91db3

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,3 +850,15 @@
850850
(fn [[_ ws-uuid]] (subscribe [:wizard/multi-value-input-count ws-uuid]))
851851
(fn [count _]
852852
(pos? count)))
853+
854+
(reg-sub
855+
:wizard/enable-graph-settings?
856+
(fn [[_ ws-uuid]]
857+
[(subscribe [:worksheet/get-graph-settings-attr
858+
ws-uuid
859+
:graph-settings/enabled?])
860+
(subscribe [:worksheet/multi-value-input-uuids ws-uuid])])
861+
(fn [[saved-enabled?-setting multi-valued-inputs] _]
862+
(if (not (nil? (first saved-enabled?-setting)))
863+
(first saved-enabled?-setting)
864+
(pos? (count multi-valued-inputs)))))

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,7 @@
443443
multi-valued-input-count (count multi-valued-input-uuids)
444444
x-axis-limits (first @(subscribe [:worksheet/graph-settings-x-axis-limits ws-uuid]))
445445
units-lookup @(subscribe [:worksheet/result-table-units ws-uuid])
446-
saved-enabled?-setting (first @(subscribe [:worksheet/get-graph-settings-attr
447-
ws-uuid
448-
:graph-settings/enabled?]))
449-
enabled? (if (not (nil? saved-enabled?-setting))
450-
saved-enabled?-setting
451-
(pos? multi-valued-input-count))]
446+
enabled? @(subscribe [:wizard/enable-graph-settings? ws-uuid])]
452447
(letfn [(radio-group [{:keys [label attr variables on-change]}]
453448
(let [*values (subscribe [:worksheet/get-graph-settings-attr ws-uuid attr])
454449
selected? (first @*values)]

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,9 @@
427427
(let [graph-setting-id (get-in worksheet [:worksheet/graph-settings :db/id])
428428
enabled? (get-in worksheet [:worksheet/graph-settings :graph-settings/enabled?])]
429429
{:transact [{:db/id graph-setting-id
430-
:graph-settings/enabled? (not enabled?)}]
430+
:graph-settings/enabled? (if (nil? enabled?)
431+
false
432+
(not enabled?))}]
431433
:fx [[:dispatch [:worksheet/set-default-graph-settings ws-uuid]]]})))
432434

433435
(rp/reg-event-fx

0 commit comments

Comments
 (0)