Autoformat code

intermine · Dec 4, 2019 · 72bd7b2 · 72bd7b2
1 parent 20046fc
commit 72bd7b2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/project.clj b/project.clj
@@ -25,7 +25,8 @@
             [lein-pdo "0.1.1"]
             [lein-cljfmt "0.6.1"]]
 
-  :cljfmt {:indents {wait-for [[:inner 0]]}}
+  :cljfmt {:indents {wait-for [[:inner 0]]
+                     after-load [[:inner 0]]}}
 
   :aliases {"dev" ["do" "clean"
                    ["pdo"

diff --git a/src/im_tables/events.cljs b/src/im_tables/events.cljs
@@ -569,8 +569,8 @@
  (sandbox)
  (fn [{db :db} [_ loc & {:keys [force?]}]]
    (let [deconstructed-query (->> (query/deconstruct-by-class
-                                    (get-in db [:service :model])
-                                    (get-in db [:query]))
+                                   (get-in db [:service :model])
+                                   (get-in db [:query]))
                                   vals
                                   (apply merge))]
      (cond-> {:db (assoc db :query-parts deconstructed-query)}

diff --git a/src/im_tables/views/dashboard/save.cljs b/src/im_tables/views/dashboard/save.cljs
@@ -93,15 +93,15 @@
     (fn [loc]
       [:div.dropdown
        {:ref (on-event
-               "show.bs.dropdown"
-               #(when (nil? @counts)
+              "show.bs.dropdown"
+              #(when (nil? @counts)
                   ;; This will only run for the initial query. For any
                   ;; subsequent queries, we'll `:main/count-deconstruction`
                   ;; alongside the query.
-                  (doseq [event (map (fn [[part details]]
-                                       [:main/count-deconstruction loc part details])
-                                     @query-parts)]
-                    (dispatch event))))}
+                 (doseq [event (map (fn [[part details]]
+                                      [:main/count-deconstruction loc part details])
+                                    @query-parts)]
+                   (dispatch event))))}
        [:button.btn.btn-default.dropdown-toggle
         {:data-toggle "dropdown"} [:span [:i.fa.fa-cloud-upload] " Save List"]]
        (into [:ul.dropdown-menu]

diff --git a/src/im_tables/views/table/head/controls.cljs b/src/im_tables/views/table/head/controls.cljs
@@ -308,16 +308,16 @@
       (let [active-filters? (not-empty (filter (partial constraint-has-path? view) (:where @query)))]
         [:span.dropdown
          {:ref (on-event
-                 "hide.bs.dropdown"
-                 (fn []
+                "hide.bs.dropdown"
+                (fn []
                    ;; Reset the blank constraint atom when the dropdown is closed
-                   (reset! blank-constraint-atom {:path view :op "=" :value nil})
+                  (reset! blank-constraint-atom {:path view :op "=" :value nil})
                    ;; *Try* to save the changes every time the dropdown is
                    ;; closed, even by just clicking off it.  This means a user
                    ;; can remove a handful of filters without having to click
                    ;; Apply. The event will do a diff to make sure something
                    ;; has actually changed before rerunning the query
-                   (dispatch [:filters/save-changes loc])))}
+                  (dispatch [:filters/save-changes loc])))}
          [:i.fa.fa-filter.dropdown-toggle.filter-icon
           {:on-click (fn [] (dispatch [:main/set-temp-query loc]))
            :data-toggle "dropdown"
@@ -366,15 +366,15 @@
           ;; want to know what's selected (for instance, highlighting the
           ;; histogram).
           {:ref (comp
-                  (on-event
-                    "hide.bs.dropdown"
-                    (fn []
-                      (reset! local-state {})
-                      (dispatch [:select/clear-selection loc view])))
-                  (on-event
-                    "show.bs.dropdown"
-                    #(when (nil? @response)
-                       (dispatch [:main/summarize-column loc view]))))}
+                 (on-event
+                  "hide.bs.dropdown"
+                  (fn []
+                    (reset! local-state {})
+                    (dispatch [:select/clear-selection loc view])))
+                 (on-event
+                  "show.bs.dropdown"
+                  #(when (nil? @response)
+                     (dispatch [:main/summarize-column loc view]))))}
           [:i.fa.fa-bar-chart.dropdown-toggle
            {:data-toggle "dropdown"
             :ref (fn [el] (reset! !summary-dropdown el))}]

diff --git a/test/cljs/im_tables/core_test.cljs b/test/cljs/im_tables/core_test.cljs
@@ -26,8 +26,8 @@
   (let [loc [:default]]
     (utils/after-load loc im-config
       (testing "im-table runs query"
-         (let [response @(rf/subscribe [:main/query-response loc])]
-           (is (some? response)))))))
+        (let [response @(rf/subscribe [:main/query-response loc])]
+          (is (some? response)))))))
 
 (deftest column-summary
   (let [loc [:default]]

diff --git a/test/cljs/im_tables/test_utils.cljc b/test/cljs/im_tables/test_utils.cljc
@@ -45,7 +45,7 @@
      {:before (fn []
                 (when-let [vars (seq @stubbed-variables)]
                   (doseq [restore-fn vars]
-                         (restore-fn))
+                    (restore-fn))
                   (reset! stubbed-variables '()))
                 (rf/dispatch-sync [:clear-db]))}))
 
@@ -91,6 +91,6 @@
   "Common operation that includes loading im-tables-3."
   [location im-config & body]
   `(run-test-async
-     (rf/dispatch-sync [:im-tables/load ~location ~im-config])
-     (wait-for [:main/replace-query-response]
-       ~@body)))
+    (rf/dispatch-sync [:im-tables/load ~location ~im-config])
+    (wait-for [:main/replace-query-response]
+      ~@body)))