empty where -> nil

Author: spicyfalafel

src/cljs/vd_designer/pages/form/controller.cljs

@@ -365,12 +365,11 @@
         select)))))
 
 (defn strip-empty-where-nodes [vd]
-  (let [blank? #(and (%1 %2) (str/blank? (%1 %2)))]
-    (update
-     vd
-     :where
-     (fn [where]
-       (remove #(blank? :path %) where)))))
+  (let [blank? #(and (%1 %2) (str/blank? (%1 %2)))
+        vd (update vd :where (fn [where] (remove #(blank? :path %) where)))]
+    (if (seq (:where vd))
+      vd
+      (dissoc vd :where))))
 
 (defn strip-empty-collections [vd]
   (medley/remove-kv

test/cljs/vd_designer/pages/form/controller_test.cljs

@@ -336,11 +336,11 @@
 (deftest strip-empty-where-nodes-test
   (testing "strip empty where"
     (is (match?
-         {:where []}
+         {:where nil}
          (sut/strip-empty-where-nodes {:where []}))))
   (testing "strip non empty where with empty node"
     (is (match?
-         {:where []}
+         {:where nil}
          (sut/strip-empty-where-nodes {:where [{:path ""}]}))))
   (testing "strip non empty where with non empty node"
     (is (match?