Fix location of result in db. See #127

metafacture · Sep 8, 2023 · 691e921 · 691e921
1 parent fc72b12
commit 691e921
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/cljs/metafacture_playground/events.cljs b/src/cljs/metafacture_playground/events.cljs
@@ -210,7 +210,7 @@
   (let [example-data (find-example-data example-name (:examples db))]
     (if example-data
         {:db (-> db
-                 (assoc :result nil)
+                 (assoc-in [:editors :result :content] nil)
                  (assoc-in [:ui :dropdown :active-item] example-name))
          :fx (mapv
               (fn [editor]
@@ -422,7 +422,7 @@
                        :body {:content (str "Response from server: " problem-message)}
                        :server (server-problem-message status status-text body))]
        {:db (-> db
-                (assoc-in [:result :loading?] false)
+                (assoc-in [:editors :result :loading?] false)
                 (assoc :message (merge message-data {:type :error})))}))
 
 (re-frame/reg-event-fx
@@ -441,7 +441,7 @@
                                       #"application/.*json" :json}
              :on-success             [::process-response]
              :on-failure             [::bad-response]}
-     :db (assoc-in db [:result :loading?] true)})
+     :db (assoc-in db [:editors :result :loading?] true)})
 
 (re-frame/reg-event-fx
  ::process

diff --git a/src/cljs/metafacture_playground/subs.cljs b/src/cljs/metafacture_playground/subs.cljs
@@ -103,7 +103,7 @@
 (re-frame/reg-sub
  ::result-loading?
  (fn [db _]
-   (get-in db [:editor :result :loading?])))
+   (get-in db [:editors :result :loading?])))
 
 (re-frame/reg-sub
  ::backend-versions

diff --git a/src/cljs/metafacture_playground/views.cljs b/src/cljs/metafacture_playground/views.cljs
@@ -407,7 +407,7 @@
      {:color color
       :stackable true}
      [title-label @label]
-     [collapse-label [:result]]]
+     [collapse-label :result]]
     [result]]]))
 
 ;;; Main panel

diff --git a/test/cljs/metafacture_playground/event_handler_test.cljs b/test/cljs/metafacture_playground/event_handler_test.cljs
@@ -97,7 +97,7 @@
                   (events/load-example [:load-example example-name]))
           {:keys [data flux transformation]} (get-in db' [:db :editors])
           db'' (events/process db' [:process (:content data) (:content flux) (:content transformation)])]
-      (is (get-in db'' [:db :result :loading?])))))
+      (is (get-in db'' [:db :editors :result :loading?])))))
 
 (deftest collapse-panel-test
   (testing "Test collapse behaviour"
@@ -106,7 +106,7 @@
       (and (is (get-in db' [:db :editors :flux :collapsed?]))
            (is (not (get-in db' [:db :editors :transformation :collapsed?])))
            (is (not (get-in db' [:db :editors :data :collapsed?])))
-           (is (not (get-in db' [:db :result :collapsed?]))))))
+           (is (not (get-in db' [:db :editors :result :collapsed?]))))))
 
   (testing "Test collapsing and expanding a panel"
     (let [db' (-> empty-db