Set default source type in templates (#650)

Author: ismaelbej

client/src/planwise/client/projects2/components/listings.cljs

@@ -41,7 +41,7 @@
     [:p.message-margin "You have no projects yet"]
     [m/Button {:type       "button"
                :unelevated "unelevated"
-               :on-click   (utils/prevent-default #(dispatch [:projects2/new-project]))}
+               :on-click   (utils/prevent-default #(dispatch [:projects2/template-project]))}
      "Create one"]]])
 
 (defn- listing-component []

client/src/planwise/client/projects2/components/settings.cljs

@@ -190,14 +190,20 @@
                                   :model     (:region-id @current-project)
                                   :disabled? read-only}]]))
 
-(defn- consumer-source-type-checkbox
-  [label type]
-  (let [source-types (subscribe [:projects2/source-types])]
-    [m/Checkbox {:label label
-                 :checked (some? (@source-types type))
-                 :value type
-                 :on-change #(rf/dispatch-sync
-                              [:projects2/toggle-source-type type])}]))
+(defn- sources-type-component
+  [{:keys [label]}]
+  (let [source-types (subscribe [:projects2/source-types])
+        options      [{:label "Raster (population)" :type "raster"}
+                      {:label "Points" :type "points"}]]
+    [:div.source-type-settings
+     [:p label]
+     [:div
+      (doall (for [{:keys [label type]} options]
+               [m/Checkbox {:key (str "consumer-source-" type)
+                            :label label
+                            :checked (some? (@source-types type))
+                            :value type
+                            :on-change #(rf/dispatch-sync [:projects2/toggle-source-type type])}]))]]))
 
 (defn- current-project-step-consumers
   [read-only]
@@ -207,11 +213,7 @@
     [:section {:class-name "project-settings-section"}
      [section-header 2 "Consumers"]
      (when-not read-only
-       [:div.source-type-settings
-        [:p "Data type"]
-        [:div
-         [consumer-source-type-checkbox "Raster (population)" "raster"]
-         [consumer-source-type-checkbox "Points" "points"]]])
+       [sources-type-component {:label "Data type"}])
      [sources-dropdown-component {:label     "Consumer Dataset"
                                   :value     (:source-set-id @current-project)
                                   :on-change #(dispatch [:projects2/save-key :source-set-id %])

client/src/planwise/client/projects2/handlers.cljs

@@ -99,19 +99,21 @@
  :projects2/save-project-data
  in-projects2
  (fn [db [_ current-project]]
-   (-> db
-       (clear-current-project) ;; Just to clear source type selection
-
-       (assoc :current-project current-project)
-       ;; Keep list in sync with current project
-       (update :list
-               (fn [list]
-                 (some-> list
-                         (utils/update-by-id (:id current-project)
-                                             #(-> %
-                                                  (assoc :state (:state current-project))
-                                                  (assoc :name (:name current-project))
-                                                  (assoc :region-id (:region-id current-project))))))))))
+   (let [source-type (get-in current-project [:config :source-type])]
+     (-> db
+         (assoc :source-types (if (some? source-type)
+                                #{source-type}
+                                #{"raster" "points"}))
+         (assoc :current-project current-project)
+         ;; Keep list in sync with current project
+         (update :list
+                 (fn [list]
+                   (some-> list
+                           (utils/update-by-id (:id current-project)
+                                               #(-> %
+                                                    (assoc :state (:state current-project))
+                                                    (assoc :name (:name current-project))
+                                                    (assoc :region-id (:region-id current-project)))))))))))
 
 
 (rf/reg-event-fx

src/planwise/configuration/templates.clj

@@ -22,7 +22,8 @@
                                              :investment 10000}
                                             {:id "upgrade-1"
                                              :capacity 300
-                                             :investment 40000}]}}
+                                             :investment 40000}]}
+                        :source-type "raster"}
 
                :source-set-id nil
                :region-id nil
@@ -33,7 +34,8 @@
     :defaults {:name "sample"
                :config {:coverage {}
                         :demographics {}
-                        :actions {}}
+                        :actions {}
+                        :source-type "points"}
 
                :source-set-id nil
                :region-id nil