Project ordering

src/uxbox/data/dashboard.cljs

@@ -62,6 +62,17 @@
     (-pr-writer [mv writer _]
       (-write writer "#<event:u.d.d/initialize>"))))
 
+(defn set-project-ordering
+  [order]
+  (reify
+    rs/UpdateEvent
+    (-apply-update [_ state]
+      (assoc-in state [:dashboard :project-ordering] order))
+
+    IPrintWithWriter
+    (-pr-writer [mv writer _]
+      (-write writer "#<event:u.d.d/set-project-ordering>"))))
+
 (defn set-collection-type
   [type]
   {:pre [(contains? #{:builtin :own} type)]}

src/uxbox/data/projects.cljs

@@ -57,6 +57,13 @@
        (sort-by :created)
        (into [])))
 
+(defn sort-projects-by
+  [ordering projs]
+  (case ordering
+    :name (sort-by :name projs)
+    :created (reverse (sort-by :created projs))
+    projs))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Events
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

src/uxbox/locales/en.cljs

@@ -5,6 +5,10 @@
    "ds.num-projects" ["No projects"
                       "%s project"
                       "%s projects"]
+   "ds.project-ordering" "Sort by"
+   "ds.project-ordering.by-name" "name"
+   "ds.project-ordering.by-last-update" "last update"
+   "ds.project-ordering.by-creation-date" "creation date"
 
    "ds.elements" "ELEMENTS"
    "ds.icons" "ICONS"

src/uxbox/state.cljs

@@ -7,7 +7,7 @@
 (defonce stream
   (rs/init {:user {:fullname "Cirilla Fiona"
                    :avatar "http://lorempixel.com/50/50/"}
-            :dashboard {}
+            :dashboard {:project-ordering :name}
             :workspace {}
             :shapes-by-id {}
             :elements-by-id {}

src/uxbox/ui/dashboard/projects.cljs

@@ -8,6 +8,7 @@
             [uxbox.rstore :as rs]
             [uxbox.state :as s]
             [uxbox.time :as time]
+            [uxbox.data.dashboard :as dd]
             [uxbox.data.projects :as dp]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.icons :as i]
@@ -21,9 +22,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; FIXME rename
-(def +ordering-options+ {:name "name"
+(def +ordering-options+ {:name "ds.project-ordering.by-name"
-                         :last-updated "date updated"
+                         :created "ds.project-ordering.by-creation-date"})
-                         :created "date created"})
 
 (def +layouts+ {:mobile {:name "Mobile"
                          :id "mobile"
@@ -154,16 +154,33 @@
   (as-> (l/select-keys [:projects-by-id]) $
     (l/focus-atom $ s/state)))
 
-(rum/defc project-sort-selector < rum/reactive
+(def ^:static project-ordering-l
-  [sort-order]
+  (as-> (l/in [:dashboard :project-ordering]) $
-  nil)
+    (l/focus-atom $ s/state)))
-  ;; (let [sort-name (get project-orderings (rum/react sort-order))]
+
-  ;;   [:select.input-select
+(defn project-sort-render
-  ;;    {:on-change #(reset! sort-order (name->order (.-value (.-target %))))
+  []
-  ;;     :value sort-name}
+  (let [ordering (rum/react project-ordering-l)]
-  ;;    (for [order (keys project-orderings)
+    (html
-  ;;          :let [name (get project-orderings order)]]
+     [:div
-  ;;      [:option {:key name} name])]))
+       [:span (tr "ds.project-ordering")]
+       [:select.input-select
+        {:on-change #(rs/emit! (dd/set-project-ordering (keyword (.-value (.-target %)))))
+         :value (name ordering)}
+        (for [option (keys +ordering-options+)
+              :let [option-id (get +ordering-options+ option)
+                    option-value (name option)
+                    option-text (tr option-id)]]
+          [:option
+           {:key option-id
+            :value option-value}
+           option-text])]])))
+
+(def project-sort-selector
+  (mx/component
+   {:render project-sort-render
+    :name "project-sort-order"
+    :mixins [rum/reactive]}))
 
 (defn menu-render
   []
@@ -173,7 +190,7 @@
      [:section#dashboard-bar.dashboard-bar
       [:div.dashboard-info
        [:span.dashboard-projects (tr "ds.num-projects" (t/c pcount))]
-       [:span "Sort by"]]
+       (project-sort-selector)]
       [:div.dashboard-search
        i/search]])))
 
@@ -236,14 +253,15 @@
   (letfn [(on-click [e]
             (dom/prevent-default e)
             (lightbox/open! :new-project))]
-    (let [state (rum/react grid-l)]
+    (let [state (rum/react grid-l)
+          ordering (rum/react project-ordering-l)]
       (html
        [:section.dashboard-grid
         [:h2 "Your projects"]
          [:div.dashboard-grid-content
           [:div.grid-item.add-project {:on-click on-click}
            [:span "+ New project"]]
-          (for [item (vals (:projects-by-id state))]
+          (for [item (dp/sort-projects-by ordering (vals (:projects-by-id state)))]
             (rum/with-key (project-item item) (:id item)))]]))))
 
 (def grid