From f80ac704a7b710cddfb1d75c0a8bfa0da5924a4f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 22 Jun 2016 22:23:24 +0300 Subject: [PATCH] Remove usage of deprecated functions from lentes library. --- src/uxbox/main/data/forms.cljs | 4 +-- src/uxbox/main/state.cljs | 2 +- src/uxbox/main/ui.cljs | 2 +- src/uxbox/main/ui/auth/recovery.cljs | 4 +-- src/uxbox/main/ui/auth/recovery_request.cljs | 4 +-- src/uxbox/main/ui/auth/register.cljs | 4 +-- src/uxbox/main/ui/dashboard/colors.cljs | 6 ++--- src/uxbox/main/ui/dashboard/header.cljs | 2 +- src/uxbox/main/ui/dashboard/icons.cljs | 2 +- src/uxbox/main/ui/dashboard/images.cljs | 10 ++++---- src/uxbox/main/ui/dashboard/projects.cljs | 6 ++--- src/uxbox/main/ui/lightbox.cljs | 2 +- src/uxbox/main/ui/messages.cljs | 2 +- src/uxbox/main/ui/settings/header.cljs | 2 +- src/uxbox/main/ui/settings/password.cljs | 4 +-- src/uxbox/main/ui/settings/profile.cljs | 6 ++--- src/uxbox/main/ui/shapes.cljs | 2 +- src/uxbox/main/ui/shapes/common.cljs | 4 +-- src/uxbox/main/ui/users.cljs | 2 +- src/uxbox/main/ui/workspace/base.cljs | 25 +++++++++---------- src/uxbox/main/ui/workspace/clipboard.cljs | 2 +- src/uxbox/main/ui/workspace/colorpalette.cljs | 2 +- src/uxbox/main/ui/workspace/colorpicker.cljs | 2 +- src/uxbox/main/ui/workspace/selection.cljs | 4 +-- .../main/ui/workspace/sidebar/drawtools.cljs | 2 +- .../main/ui/workspace/sidebar/history.cljs | 2 +- .../main/ui/workspace/sidebar/icons.cljs | 2 +- .../main/ui/workspace/sidebar/layers.cljs | 2 +- .../main/ui/workspace/sidebar/options.cljs | 4 +-- .../main/ui/workspace/sidebar/sitemap.cljs | 5 ++-- src/uxbox/util/lens.cljs | 6 +---- src/uxbox/view/state.cljs | 2 +- 32 files changed, 62 insertions(+), 68 deletions(-) diff --git a/src/uxbox/main/data/forms.cljs b/src/uxbox/main/data/forms.cljs index 740a257f4..2ba837eb3 100644 --- a/src/uxbox/main/data/forms.cljs +++ b/src/uxbox/main/data/forms.cljs @@ -80,11 +80,11 @@ (defn focus-form-data [type] (-> (l/in [:forms type]) - (l/focus-atom st/state))) + (l/derive st/state))) (defn focus-form-errors [type] (-> (l/in [:errors type]) - (l/focus-atom st/state))) + (l/derive st/state))) diff --git a/src/uxbox/main/state.cljs b/src/uxbox/main/state.cljs index 7a3b6f909..3e475a535 100644 --- a/src/uxbox/main/state.cljs +++ b/src/uxbox/main/state.cljs @@ -19,7 +19,7 @@ (def auth-l (-> (l/key :auth) - (l/focus-atom state))) + (l/derive state))) (defn initial-state [] diff --git a/src/uxbox/main/ui.cljs b/src/uxbox/main/ui.cljs index 97f0d4d33..3d46ca515 100644 --- a/src/uxbox/main/ui.cljs +++ b/src/uxbox/main/ui.cljs @@ -44,7 +44,7 @@ (def route-l (-> (l/key :route) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Error Handling diff --git a/src/uxbox/main/ui/auth/recovery.cljs b/src/uxbox/main/ui/auth/recovery.cljs index 9cc58a559..df7a6df3c 100644 --- a/src/uxbox/main/ui/auth/recovery.cljs +++ b/src/uxbox/main/ui/auth/recovery.cljs @@ -27,11 +27,11 @@ (def form-data (-> (l/in [:forms :recovery]) - (l/focus-atom st/state))) + (l/derive st/state))) (def form-errors (-> (l/in [:errors :recovery]) - (l/focus-atom st/state))) + (l/derive st/state))) (def set-value! (partial udf/assign-field-value :recovery)) diff --git a/src/uxbox/main/ui/auth/recovery_request.cljs b/src/uxbox/main/ui/auth/recovery_request.cljs index d67173ca6..e00acd280 100644 --- a/src/uxbox/main/ui/auth/recovery_request.cljs +++ b/src/uxbox/main/ui/auth/recovery_request.cljs @@ -27,11 +27,11 @@ (def form-data (-> (l/in [:forms :recovery-request]) - (l/focus-atom st/state))) + (l/derive st/state))) (def form-errors (-> (l/in [:errors :recovery-request]) - (l/focus-atom st/state))) + (l/derive st/state))) (def set-value! (partial udf/assign-field-value :recovery-request)) diff --git a/src/uxbox/main/ui/auth/register.cljs b/src/uxbox/main/ui/auth/register.cljs index 6389facbd..dade05b88 100644 --- a/src/uxbox/main/ui/auth/register.cljs +++ b/src/uxbox/main/ui/auth/register.cljs @@ -27,11 +27,11 @@ (def form-data (-> (l/in [:forms :register]) - (l/focus-atom st/state))) + (l/derive st/state))) (def form-errors (-> (l/in [:errors :register]) - (l/focus-atom st/state))) + (l/derive st/state))) (def set-value! (partial udf/assign-field-value :register)) diff --git a/src/uxbox/main/ui/dashboard/colors.cljs b/src/uxbox/main/ui/dashboard/colors.cljs index 9d906fab8..68688d87b 100644 --- a/src/uxbox/main/ui/dashboard/colors.cljs +++ b/src/uxbox/main/ui/dashboard/colors.cljs @@ -33,17 +33,17 @@ (def ^:private dashboard-l (-> (l/key :dashboard) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:private collections-by-id-l (-> (comp (l/key :colors-by-id) (ul/merge library/+color-collections-by-id+)) - (l/focus-atom st/state))) + (l/derive st/state))) (defn- focus-collection [collid] (-> (l/key collid) - (l/focus-atom collections-by-id-l))) + (l/derive collections-by-id-l))) ;; --- Page Title diff --git a/src/uxbox/main/ui/dashboard/header.cljs b/src/uxbox/main/ui/dashboard/header.cljs index a53f0e47f..f3931a7ce 100644 --- a/src/uxbox/main/ui/dashboard/header.cljs +++ b/src/uxbox/main/ui/dashboard/header.cljs @@ -21,7 +21,7 @@ (def header-l (as-> (l/in [:dashboard]) $ - (l/focus-atom $ s/state))) + (l/derive $ s/state))) (defn- header-link [section content] diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs index f185be931..f88241d95 100644 --- a/src/uxbox/main/ui/dashboard/icons.cljs +++ b/src/uxbox/main/ui/dashboard/icons.cljs @@ -27,7 +27,7 @@ (def dashboard-l (as-> (l/in [:dashboard]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) ;; --- Page Title diff --git a/src/uxbox/main/ui/dashboard/images.cljs b/src/uxbox/main/ui/dashboard/images.cljs index 858be7d59..7102875b9 100644 --- a/src/uxbox/main/ui/dashboard/images.cljs +++ b/src/uxbox/main/ui/dashboard/images.cljs @@ -54,24 +54,24 @@ (def ^:private dashboard-l (-> (l/key :dashboard) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:private collections-by-id-l (-> (l/key :images-by-id) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:private images-ordering-l (-> (l/in [:dashboard :images-order]) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:private images-filtering-l (-> (l/in [:dashboard :images-filter]) - (l/focus-atom st/state))) + (l/derive st/state))) (defn- focus-collection [collid] (-> (l/key collid) - (l/focus-atom collections-by-id-l))) + (l/derive collections-by-id-l))) ;; --- Page Title diff --git a/src/uxbox/main/ui/dashboard/projects.cljs b/src/uxbox/main/ui/dashboard/projects.cljs index 20d314a80..1ffa85751 100644 --- a/src/uxbox/main/ui/dashboard/projects.cljs +++ b/src/uxbox/main/ui/dashboard/projects.cljs @@ -64,15 +64,15 @@ (def projects-by-id-l (as-> (l/key :projects-by-id) $ - (l/focus-atom $ s/state))) + (l/derive $ s/state))) (def project-ordering-l (as-> (l/in [:dashboard :project-order]) $ - (l/focus-atom $ s/state))) + (l/derive $ s/state))) (def project-filtering-l (as-> (l/in [:dashboard :project-filter]) $ - (l/focus-atom $ s/state))) + (l/derive $ s/state))) ;; --- Sort Widget diff --git a/src/uxbox/main/ui/lightbox.cljs b/src/uxbox/main/ui/lightbox.cljs index a81411008..7c48cb8da 100644 --- a/src/uxbox/main/ui/lightbox.cljs +++ b/src/uxbox/main/ui/lightbox.cljs @@ -15,7 +15,7 @@ (def ^:const ^:private lightbox-l (-> (l/key :lightbox) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Lightbox (Component) diff --git a/src/uxbox/main/ui/messages.cljs b/src/uxbox/main/ui/messages.cljs index dc2f8a1e0..7d0742298 100644 --- a/src/uxbox/main/ui/messages.cljs +++ b/src/uxbox/main/ui/messages.cljs @@ -14,7 +14,7 @@ (def ^:const ^:private message-l (-> (l/key :message) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Notification Component diff --git a/src/uxbox/main/ui/settings/header.cljs b/src/uxbox/main/ui/settings/header.cljs index 4b5e06c43..54f6c782f 100644 --- a/src/uxbox/main/ui/settings/header.cljs +++ b/src/uxbox/main/ui/settings/header.cljs @@ -21,7 +21,7 @@ (def ^:private section-l (-> (l/in [:route :id]) - (l/focus-atom st/state))) + (l/derive st/state))) (defn- header-link [section content] diff --git a/src/uxbox/main/ui/settings/password.cljs b/src/uxbox/main/ui/settings/password.cljs index 3ceee419d..5eb80680f 100644 --- a/src/uxbox/main/ui/settings/password.cljs +++ b/src/uxbox/main/ui/settings/password.cljs @@ -28,11 +28,11 @@ (def formdata (-> (l/in [:forms :profile/password]) - (l/focus-atom st/state))) + (l/derive st/state))) (def formerrors (-> (l/in [:errors :profile/password]) - (l/focus-atom st/state))) + (l/derive st/state))) (def assign-field-value (partial udf/assign-field-value :profile/password)) diff --git a/src/uxbox/main/ui/settings/profile.cljs b/src/uxbox/main/ui/settings/profile.cljs index c10c64048..c4e8cb7f3 100644 --- a/src/uxbox/main/ui/settings/profile.cljs +++ b/src/uxbox/main/ui/settings/profile.cljs @@ -28,18 +28,18 @@ (def formdata (-> (l/in [:forms :profile/main]) - (l/focus-atom st/state))) + (l/derive st/state))) (def formerrors (-> (l/in [:errors :profile/main]) - (l/focus-atom st/state))) + (l/derive st/state))) (def assign-field-value (partial udf/assign-field-value :profile/main)) (def ^:private profile-l (-> (l/key :profile) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Profile Form diff --git a/src/uxbox/main/ui/shapes.cljs b/src/uxbox/main/ui/shapes.cljs index cae3e8f7b..eceb8b64d 100644 --- a/src/uxbox/main/ui/shapes.cljs +++ b/src/uxbox/main/ui/shapes.cljs @@ -16,7 +16,7 @@ (defn- focus-shape [id] (-> (l/in [:shapes-by-id id]) - (l/focus-atom st/state))) + (l/derive st/state))) (defn- shape-render [own id] diff --git a/src/uxbox/main/ui/shapes/common.cljs b/src/uxbox/main/ui/shapes/common.cljs index 799a2bd36..f283aa360 100644 --- a/src/uxbox/main/ui/shapes/common.cljs +++ b/src/uxbox/main/ui/shapes/common.cljs @@ -19,11 +19,11 @@ (def ^:const selected-shapes-l (-> (l/in [:workspace :selected]) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:const drawing-state-l (-> (l/in [:workspace :drawing]) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Events diff --git a/src/uxbox/main/ui/users.cljs b/src/uxbox/main/ui/users.cljs index a4648ba6d..f2084819b 100644 --- a/src/uxbox/main/ui/users.cljs +++ b/src/uxbox/main/ui/users.cljs @@ -52,7 +52,7 @@ (def profile-l (as-> (l/key :profile) $ - (l/focus-atom $ s/state))) + (l/derive $ s/state))) (defn user-render [own] diff --git a/src/uxbox/main/ui/workspace/base.cljs b/src/uxbox/main/ui/workspace/base.cljs index 424dff683..5a347b1ba 100644 --- a/src/uxbox/main/ui/workspace/base.cljs +++ b/src/uxbox/main/ui/workspace/base.cljs @@ -14,7 +14,6 @@ [uxbox.main.data.workspace :as dw] [uxbox.main.data.shapes :as uds] [uxbox.common.geom.point :as gpt] - [uxbox.util.lens :as ul] [goog.events :as events]) (:import goog.events.EventType)) @@ -22,49 +21,49 @@ (def ^:const workspace-l (as-> (l/in [:workspace]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) (def ^:const project-l (letfn [(getter [state] (let [project (get-in state [:workspace :project])] (get-in state [:projects-by-id project])))] - (as-> (l/getter getter) $ - (l/focus-atom $ st/state)))) + (as-> (l/lens getter) $ + (l/derive $ st/state)))) (def ^:const page-l (letfn [(getter [state] (let [page (get-in state [:workspace :page])] (get-in state [:pages-by-id page])))] - (as-> (ul/getter getter) $ - (l/focus-atom $ st/state)))) + (as-> (l/lens getter) $ + (l/derive $ st/state)))) (def ^:const selected-shapes-l (as-> (l/in [:selected]) $ - (l/focus-atom $ workspace-l))) + (l/derive $ workspace-l))) (def ^:const toolboxes-l (as-> (l/in [:toolboxes]) $ - (l/focus-atom $ workspace-l))) + (l/derive $ workspace-l))) (def ^:const flags-l (as-> (l/in [:flags]) $ - (l/focus-atom $ workspace-l))) + (l/derive $ workspace-l))) (def ^:const shapes-by-id-l (as-> (l/key :shapes-by-id) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) (def ^:const zoom-l (-> (l/in [:workspace :zoom]) - (l/focus-atom st/state))) + (l/derive st/state))) (def ^:const alignment-l (letfn [(getter [flags] (and (contains? flags :grid/indexed) (contains? flags :grid/alignment) (contains? flags :grid)))] - (-> (l/getter getter) - (l/focus-atom flags-l)))) + (-> (l/lens getter) + (l/derive flags-l)))) ;; --- Scroll Stream diff --git a/src/uxbox/main/ui/workspace/clipboard.cljs b/src/uxbox/main/ui/workspace/clipboard.cljs index 187fd153e..ab922038c 100644 --- a/src/uxbox/main/ui/workspace/clipboard.cljs +++ b/src/uxbox/main/ui/workspace/clipboard.cljs @@ -23,7 +23,7 @@ (def ^:const ^:private clipboard-l (-> (l/key :clipboard) - (l/focus-atom st/state))) + (l/derive st/state))) ;; --- Clipboard Dialog Component diff --git a/src/uxbox/main/ui/workspace/colorpalette.cljs b/src/uxbox/main/ui/workspace/colorpalette.cljs index 8fa8b4b1c..41654fc62 100644 --- a/src/uxbox/main/ui/workspace/colorpalette.cljs +++ b/src/uxbox/main/ui/workspace/colorpalette.cljs @@ -33,7 +33,7 @@ (def ^:private collections-by-id-l (-> (comp (l/in [:colors-by-id]) (ul/merge library/+color-collections-by-id+)) - (l/focus-atom st/state))) + (l/derive st/state))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Component diff --git a/src/uxbox/main/ui/workspace/colorpicker.cljs b/src/uxbox/main/ui/workspace/colorpicker.cljs index cfca67c1e..a9c562ca9 100644 --- a/src/uxbox/main/ui/workspace/colorpicker.cljs +++ b/src/uxbox/main/ui/workspace/colorpicker.cljs @@ -29,7 +29,7 @@ (defn- focus-shape [id] (as-> (l/in [:shapes-by-id id]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) (defn- colorpicker-render [own {:keys [x y shape attr] :as opts}] diff --git a/src/uxbox/main/ui/workspace/selection.cljs b/src/uxbox/main/ui/workspace/selection.cljs index 8b4b6329d..87c8016fb 100644 --- a/src/uxbox/main/ui/workspace/selection.cljs +++ b/src/uxbox/main/ui/workspace/selection.cljs @@ -32,8 +32,8 @@ (letfn [(getter [state] (let [selected (get-in state [:workspace :selected])] (mapv #(get-in state [:shapes-by-id %]) selected)))] - (-> (l/getter getter) - (l/focus-atom st/state)))) + (-> (l/lens getter) + (l/derive st/state)))) ;; --- Selection Handlers (Component) diff --git a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs index 947473120..576ade7ed 100644 --- a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs @@ -31,7 +31,7 @@ rerender the whole toolbox on each workspace change." (as-> (l/in [:workspace :drawing]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Draw Tools diff --git a/src/uxbox/main/ui/workspace/sidebar/history.cljs b/src/uxbox/main/ui/workspace/sidebar/history.cljs index 15de6311d..d233d2fae 100644 --- a/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/history.cljs @@ -29,7 +29,7 @@ (def ^:const history-l (as-> (l/in [:workspace :history]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) ;; --- History Item (Component) diff --git a/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/src/uxbox/main/ui/workspace/sidebar/icons.cljs index 6f8a90c23..f34500947 100644 --- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -31,7 +31,7 @@ rerender the whole toolbox on each workspace change." (as-> (l/in [:workspace :drawing]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Icons diff --git a/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/src/uxbox/main/ui/workspace/sidebar/layers.cljs index dd20eaa2f..fa639eb7b 100644 --- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -32,7 +32,7 @@ (defn- focus-page [pageid] (as-> (l/in [:pages-by-id pageid]) $ - (l/focus-atom $ st/state))) + (l/derive $ st/state))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Components diff --git a/src/uxbox/main/ui/workspace/sidebar/options.cljs b/src/uxbox/main/ui/workspace/sidebar/options.cljs index 720bbc921..a738933e4 100644 --- a/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -106,8 +106,8 @@ (let [selected (get-in state [:workspace :selected])] (when (= 1 (count selected)) (get-in state [:shapes-by-id (first selected)]))))] - (as-> (l/getter getter) $ - (l/focus-atom $ st/state)))) + (-> (l/lens getter) + (l/derive st/state)))) (defn options-toolbox-render [own] diff --git a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index d2fab4318..85d1d1091 100644 --- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -25,7 +25,6 @@ [uxbox.main.ui.icons :as i] [uxbox.common.ui.mixins :as mx] [uxbox.main.ui.lightbox :as lbx] - [uxbox.util.lens :as ul] [uxbox.util.data :refer (read-string parse-int)] [uxbox.util.dom :as dom])) @@ -35,8 +34,8 @@ (letfn [(getter [state] (let [project (get-in state [:workspace :project])] (stpr/project-pages state project)))] - (as-> (ul/getter getter) $ - (l/focus-atom $ st/state)))) + (as-> (l/lens getter) $ + (l/derive $ st/state)))) ;; --- Component diff --git a/src/uxbox/util/lens.cljs b/src/uxbox/util/lens.cljs index 24f664999..a52efabfb 100644 --- a/src/uxbox/util/lens.cljs +++ b/src/uxbox/util/lens.cljs @@ -6,13 +6,9 @@ ;; Copyright (c) 2015-2016 Juan de la Cruz (ns uxbox.util.lens - (:refer-clojure :exclude [derive merge]) + (:refer-clojure :exclude [merge]) (:require [lentes.core :as l])) -(defn getter - [f] - (l/lens f #(throw (ex-info "Not implemented" {})))) - (defn merge [data] (l/lens diff --git a/src/uxbox/view/state.cljs b/src/uxbox/view/state.cljs index da36a2f31..988cef3e9 100644 --- a/src/uxbox/view/state.cljs +++ b/src/uxbox/view/state.cljs @@ -18,7 +18,7 @@ (def auth-l (-> (l/key :auth) - (l/focus-atom state))) + (l/derive state))) (defn initial-state []