From 922a2494edac2d0e58cd42138d28ac4e0ec7701a Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 17 Jan 2017 20:39:42 +0100 Subject: [PATCH] Minor cosmetic changes on pages data events. --- frontend/src/uxbox/main/data/pages.cljs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/uxbox/main/data/pages.cljs b/frontend/src/uxbox/main/data/pages.cljs index 56d7e24c68..9b7e28d1df 100644 --- a/frontend/src/uxbox/main/data/pages.cljs +++ b/frontend/src/uxbox/main/data/pages.cljs @@ -134,21 +134,28 @@ (reduce assoc-page $ pages) (reduce assoc-packed-page $ pages)))) +(defn pages-fetched + [pages] + {:pre [(coll? pages)]} + (PagesFetched. pages)) + (defn pages-fetched? [v] (instance? PagesFetched v)) ;; --- Fetch Pages (by project id) -(deftype FetchPages [projectid] +(deftype FetchPages [id] ptk/WatchEvent (watch [_ state s] - (->> (rp/req :fetch/pages-by-project {:project projectid}) - (rx/map (comp ->PagesFetched :payload))))) + (->> (rp/req :fetch/pages-by-project {:project id}) + (rx/map :payload) + (rx/map pages-fetched)))) (defn fetch-pages - [projectid] - (FetchPages. projectid)) + [id] + {:pre [(uuid? id)]} + (FetchPages. id)) ;; --- Page Created