notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fixed warnings.

Browse Source
This commit is contained in:
Bryce Covert
2022-07-26 05:56:41 -07:00
parent f6f73a6110
commit 96c80853ef
133 changed files with 670 additions and 1640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cljs/auto_ap/effects.cljs
View File

@@ -1,18 +1,20 @@
(ns auto-ap.effects
(:require-macros [cljs.core.async.macros :refer [go]])
(:require [re-frame.core :as re-frame]
[cljs-http.client :as http]
[cljs-time.coerce :as c]
[cljs-time.core :as time]
[cljs-time.format :as format]
[cljs.core.async :refer [<! ] :as async]
[clojure.string :as str]
[clojure.walk :as walk]
[venia.core :as v]
[auto-ap.history :as p]
[auto-ap.views.utils :refer [date->str standard]]
[auto-ap.status :as status]
[pushy.core :as pushy]))
(:require
[auto-ap.history :as p]
[auto-ap.status :as status]
[auto-ap.views.utils :refer [date->str standard]]
[cemerick.url :as url]
[cljs-http.client :as http]
[cljs-time.coerce :as c]
[cljs-time.core :as time]
[cljs-time.format :as format]
[cljs.core.async :refer [<!] :as async]
[clojure.string :as str]
[clojure.walk :as walk]
[pushy.core :as pushy]
[re-frame.core :as re-frame]
[venia.core :as v]))
(re-frame/reg-fx
:redirect
@@ -26,8 +28,8 @@
(pushy/set-token! p/history
(str (.-protocol (.-location js/window)) "//" (.-host (.-location js/window)) (.-pathname (.-location js/window))
"?"
(cemerick.url/map->query (->> uri-params
(filter (fn [[k v]] (and v
(url/map->query (->> uri-params
(filter (fn [[_ v]] (and v
(or (not (seqable? v))
(not-empty v)))) )
(map

24
src/cljs/auto_ap/effects/forward.cljs
View File

@@ -7,17 +7,17 @@
::register
(let [process-one-entry (fn [{:as m :keys [id events event-fn]}]
(let [_ (assert (map? m) (str "re-frame: effects handler for :forward-events expected a map or a list of maps. Got: " m))
_ (assert (= #{:id :events :event-fn} (-> m keys set)) (str "re-frame: effects handler for :forward-events given wrong map keys" (-> m keys set)))]
(let [post-event-callback-fn (fn [event-v _]
(when (events (first event-v))
(re-frame/dispatch (event-fn event-v))))]
(re-frame/add-post-event-callback post-event-callback-fn)
(swap! id->listen-fn assoc id post-event-callback-fn))))]
_ (assert (= #{:id :events :event-fn} (-> m keys set)) (str "re-frame: effects handler for :forward-events given wrong map keys" (-> m keys set)))
post-event-callback-fn (fn [event-v _]
(when (events (first event-v))
(re-frame/dispatch (event-fn event-v))))]
(re-frame/add-post-event-callback post-event-callback-fn)
(swap! id->listen-fn assoc id post-event-callback-fn)))]
(fn [val]
(cond
(map? val) (process-one-entry val)
(sequential? val) (doall (map process-one-entry val))
:else (re-frame/console :error ":forward-events expected a map or a list of maps, but got: " val)))))
:else (re-frame/console :error ":forward-events expected a map or a list of maps, but got: " val)))))
@@ -25,11 +25,11 @@
::dispose
(let [process-one-entry (fn [{:as m :keys [id]}]
(let [_ (assert (map? m) (str "re-frame: effects handler for :forward-events expected a map or a list of maps. Got: " m))
_ (assert (= #{:id} (-> m keys set)) (str "re-frame: effects handler for :forward-events given wrong map keys" (-> m keys set)))]
(let [f (@id->listen-fn id)
_ (assert (some? f) (str ":forward-events asked to unregister an unknown id: " id))]
(re-frame/remove-post-event-callback f)
(swap! id->listen-fn dissoc id))))]
_ (assert (= #{:id} (-> m keys set)) (str "re-frame: effects handler for :forward-events given wrong map keys" (-> m keys set)))
f (@id->listen-fn id)
_ (assert (some? f) (str ":forward-events asked to unregister an unknown id: " id))]
(re-frame/remove-post-event-callback f)
(swap! id->listen-fn dissoc id)))]
(fn [val]
(cond
(map? val) (process-one-entry val)

16
src/cljs/auto_ap/events.cljs
View File

@@ -3,12 +3,12 @@
[auto-ap.db :as db]
[auto-ap.routes :as routes]
[auto-ap.utils :refer [by]]
[auto-ap.views.utils :refer [with-user parse-jwt]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [parse-jwt with-user]]
[bidi.bidi :as bidi]
[clojure.string :as str]
[goog.crypt.base64 :as b64]
[re-frame.core :as re-frame]
[goog.crypt.base64 :as base64]))
[re-frame.core :as re-frame]))
(defn jwt->data [token]
(js->clj (.parse js/JSON (b64/decodeString (second (str/split token #"\." ))))))
@@ -131,14 +131,6 @@
(.setItem js/localStorage "last-client-id" (:id client))
(assoc db :client (:id client))))
(re-frame/reg-event-db
::change-form
(fn [db [_ location field value]]
(if value
(assoc-in db (into location field) value)
(update-in db (into location (butlast field)) dissoc (last field)))))
(re-frame/reg-event-fx
::set-active-route
(fn [{:keys [db]} [_ handler params route-params]]
@@ -164,7 +156,7 @@
:menu nil
:query-params params
:route-params route-params)
(auto-ap.views.pages.data-page/dispose-all))})))
(data-page/dispose-all))})))
(re-frame/reg-event-fx

9
src/cljs/auto_ap/forms.cljs
View File

@@ -105,7 +105,7 @@
(re-frame/reg-event-db
::attempted-submit
(fn [db [_ form & paths]]
(fn [db [_ form ]]
(assoc-in db [::forms form :attempted-submit?] true)))
(defn change-handler [form customize-fn]
@@ -154,16 +154,17 @@
(defn triggers-loading [form]
(re-frame/enrich
(fn [db event]
(fn [db _]
(loading db form))))
(defn triggers-stop [form]
(re-frame/enrich
(fn [db event]
(fn [db _]
(stop-form db form))))
(defn triggers-stop-loading [form]
(re-frame/enrich
(fn [db event]
(fn [db _]
(assoc-in db [::forms form :status] nil))))
(defn save-succeeded [db id]

4
src/cljs/auto_ap/forms/builder.cljs
View File

@@ -24,7 +24,7 @@
{:errors (merge (-> me/default-errors
(assoc ::m/missing-key {:error/message "Required"}
::m/invalid-type {:error/fn
(fn [a b]
(fn [a _]
(if (nil? (:value a))
"Required"
"Invalid"))}))
@@ -210,7 +210,7 @@
(r/as-element (into [:<>]
(r/children (r/current-component))))))
(defn vertical-control [{:keys [is-small? required?]}]
(defn vertical-control [{:keys [required?]}]
(let [[label & children] (r/children (r/current-component))]
(consume Consumer
["fullwidth?"]

1
src/cljs/auto_ap/history.cljs
View File

@@ -3,7 +3,6 @@
[pushy.core :as pushy]
[auto-ap.routes :as routes]
[auto-ap.views.utils :as u]
[cemerick.url :refer [url]]
[re-frame.core :as re-frame]))
(defn parse-url [url]

20
src/cljs/auto_ap/status.cljs
View File

@@ -109,7 +109,7 @@
(re-frame/reg-event-db
::completed
[(re-frame/path [::status]) ]
(fn [db [_ single which]]
(fn [db [_ single _]]
(assoc db single {:state nil
:error nil})))
@@ -135,21 +135,19 @@
info-states
(->> states (filter #(:info %)))]
[:<>
(if (seq error-states)
(when (seq error-states)
[:div.notification.is-danger.is-light
(for [state states
state (:error state)]
(do
^{:key (:message state)}
[:p (or (:message state)
(:error state)
"An unexpected error occured.")]))])
(if (seq info-states)
^{:key (:message state)}
[:p (or (:message state)
(:error state)
"An unexpected error occured.")])])
(when (seq info-states)
[:div.notification.is-info.is-light
(for [state states]
(do
^{:key (:info state)}
[:p (:info state)]))])]))
^{:key (:info state)}
[:p (:info state)])])]))
(defn big-loader [status]
(when (= :loading (:state status))

4
src/cljs/auto_ap/views/components/address.cljs
View File

@@ -1,6 +1,5 @@
(ns auto-ap.views.components.address
(:require
[auto-ap.entities.address :as address]
[auto-ap.forms.builder :as form-builder]
[auto-ap.views.components.level :as level]))
@@ -20,8 +19,7 @@
[:p.help "City"]
[:input.input.is-expanded {:type "text"
:placeholder "Cupertino"
:field [:city]
:spec ::address/city}]]
:field [:city]}]]
[form-builder/field-v2 {:field :state}
[:p.help "State"]
[:input.input {:type "text"

8
src/cljs/auto_ap/views/components/admin/side_bar.cljs
View File

@@ -7,7 +7,7 @@
[re-frame.core :as re-frame]
[reagent.core :as r]))
(defn admin-side-bar [params ]
(defn admin-side-bar []
(let [ap @(re-frame/subscribe [::subs/active-page])]
[:div
[:p.menu-label "General"]
@@ -45,12 +45,6 @@
[:a {:href (bidi/path-for routes/routes :admin-rules), :class (str "item" (active-when ap = :admin-rules))}
[:span {:class "icon icon-cog-play-1" :style {:font-size "25px"}}]
[:span {:class "name"} "Rules"]]]
[:ul ]]
[:p.menu-label "Import"]
[:ul.menu-list

6
src/cljs/auto_ap/views/components/buttons.cljs
View File

@@ -2,7 +2,7 @@
(:require [auto-ap.views.utils :refer [dispatch-event]]
[reagent.core :as r]))
(defn fa-icon [{:keys [event icon class on-click] :as params}]
(defn fa-icon [{:keys [event icon on-click] :as params}]
[:a.button (cond-> params
true (dissoc :event :icon)
(and (not on-click)
@@ -15,7 +15,7 @@
(defn sl-icon [{:keys [event icon class on-click] :as params}]
(defn sl-icon [{:keys [event icon on-click] :as params}]
[:a.button (cond-> params
true (dissoc :event :icon)
(and (not on-click)
@@ -28,7 +28,7 @@
[:span.icon [:i.fa.fa-plus]]
[:span name]])
(defn dropdown [{:keys [event icon class on-click] :as params}]
(defn dropdown [{:keys [event on-click] :as params}]
[:a.button (cond-> params
true (dissoc :event :icon)
(and (not on-click)

6
src/cljs/auto_ap/views/components/dropdown.cljs
View File

@@ -5,7 +5,7 @@
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]))
(defn drop-down-contents [{:keys [id]} children ]
(defn drop-down-contents [{:keys [id]}]
(let [toggle-fn (fn [] (re-frame/dispatch [::events/toggle-menu id]))]
(r/create-class {:component-did-mount (fn [] (.addEventListener js/document "click" toggle-fn))
:component-will-unmount (fn [] (.removeEventListener js/document "click" toggle-fn))
@@ -13,8 +13,8 @@
(fn [children]
children)})))
(defn drop-down [{:keys [ header id is-right? class]} child]
(let [menu-active? (re-frame/subscribe [::subs/menu-active? id])]
(defn drop-down [{:keys [ id ]} _]
(let [_ (re-frame/subscribe [::subs/menu-active? id])]
(r/create-class
{:reagent-render (fn [{:keys [header id is-right? class] :or {is-right? true}} child]
(let [menu-active? @(re-frame/subscribe [::subs/menu-active? id])]

38
src/cljs/auto_ap/views/components/grid.cljs
View File

@@ -1,13 +1,13 @@
(ns auto-ap.views.components.grid
(:require [reagent.core :as r]
[auto-ap.views.utils :refer [appearing copy-to-clipboard]]
[auto-ap.utils :refer [default-pagination-size]]
[react :as react]
[re-frame.core :as re-frame]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.subs :as subs]
[react-dom :as react-dom]))
(:require
[auto-ap.subs :as subs]
[auto-ap.utils :refer [default-pagination-size]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [copy-to-clipboard]]
[re-frame.core :as re-frame]
[react :as react]
[reagent.core :as r]))
(set! *warn-on-infer* true)
(defonce ^js/React.Context grid-context ( react/createContext "default"))
@@ -60,7 +60,7 @@
:else
y))
(defn paginator [{:keys [start per-page end count total on-change] :as g}]
(defn paginator [{:keys [start per-page end total on-change]}]
(let [per-page (or per-page default-pagination-size)
max-buttons 5
buttons-before (Math/floor (/ max-buttons 2))
@@ -72,7 +72,7 @@
[:li
[:a.pagination-link {:class (when (= current-page x)
"is-current")
:on-click (fn [e] (on-change {:start (* x per-page)
:on-click (fn [_] (on-change {:start (* x per-page)
:per-page per-page}))}
(inc x)]]))
@@ -117,11 +117,11 @@
[:a.tag.is-medium.is-delete {:on-click (fn []
(on-change {:sort (filter #(not= sort-key (:sort-key %)) sort)}))}]]])])
(defn controls [{:keys [start end count total per-page action-buttons] :as para}]
(defn controls [{:keys [start end count total action-buttons]}]
(let [children (r/children (r/current-component))]
[:> Consumer {}
(fn [consume]
(let [{:strs [on-params-change params] :as consume} (js->clj consume)]
(let [{:strs [on-params-change params]} (js->clj consume)]
(r/as-element (into
[:div {:style {:margin-bottom "1rem"}}
[:div.level
@@ -174,8 +174,8 @@
:checked (if (get checked id)
"checked"
"")
:on-change (fn [x e]
(if id
:on-change (fn [_ _]
(when id
(let [checked (or checked #{})]
;; TODO only map once everything is moved over to data-page
(if (map? checked)
@@ -199,7 +199,7 @@
]])))
(map r/as-element children))))]))
(defn button-cell [params]
(defn button-cell []
(apply r/create-element "td" #js {"style" #js {"overflow" "visible"}}
(map r/as-element (r/children (r/current-component)))))
@@ -244,13 +244,13 @@
children)))))]))
(defn sortable-header-cell [{:keys [style class sort-key sort-name asc]}]
(defn sortable-header-cell [{:keys [style class sort-key sort-name]}]
(let [children (r/children (r/current-component))]
[:> Consumer {}
(fn [consume]
(let [{:strs [on-params-change params] :as consume} (js->clj consume)]
(let [{:strs [on-params-change params]} (js->clj consume)]
(r/as-element (conj (into
[:th {:on-click (fn [e]
[:th {:on-click (fn [_]
(on-params-change
(toggle-sort-by {:sort (:sort params)} sort-key sort-name)))
:style (assoc style

4
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -27,7 +27,7 @@
:ref (fn [n]
(reset! !child n))
:tab-index 0
:onBlur (fn [e]
:onBlur (fn [_]
(js/setTimeout (fn []
(println @!child)
(println (.-activeElement js/document))
@@ -120,7 +120,7 @@
(re-frame/dispatch [::events/swap-client client]))
} name])]]))
(defn navbar [ap]
(defn navbar []
(let [navbar-menu-shown? (r/atom false)]
(fn [ap]
(let [user (re-frame/subscribe [::subs/user])

14
src/cljs/auto_ap/views/components/modal.cljs
View File

@@ -1,10 +1,8 @@
(ns auto-ap.views.components.modal
(:require [re-frame.core :as re-frame]
[reagent.core :as r]
[auto-ap.events :as events]
[auto-ap.subs :as subs]
[auto-ap.status :as status]
[auto-ap.views.utils :refer [with-keys appearing dispatch-event]]))
(:require
[auto-ap.status :as status]
[auto-ap.views.utils :refer [appearing dispatch-event]]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::modal-state
@@ -18,7 +16,7 @@
(re-frame/reg-event-fx
::modal-closed
(fn [{:keys [db]} [_ state]]
(fn [{:keys [db]} [_ _]]
(let [[_ status-id] (some-> db ::state :confirm :status-from )]
(cond-> {:db (dissoc db ::state)}
status-id (assoc :dispatch [::status/completed status-id])))))
@@ -27,7 +25,7 @@
(defn global-modal []
(let [state (re-frame/subscribe [::modal-state])]
(fn []
(if (:visible? @state)
(when (:visible? @state)
(let [{:keys [title body status-from foot class cancel? confirm]} @state]
[:div.modal.is-active (cond-> {}
class (assoc :class class))

5
src/cljs/auto_ap/views/components/multi.cljs
View File

@@ -1,16 +1,13 @@
(ns auto-ap.views.components.multi
(:require
[cemerick.url]
#_{:clj-kondo/ignore [:unused-namespace]}
[reagent.core :as reagent]
[react :as react]
[auto-ap.entities.shared :as shared]
[auto-ap.views.utils :refer [appearing-group]]
[auto-ap.forms.builder :as form-builder]))
;; TODO just embrace the fact that it will need to be remounted, and use index based keys
(defn multi-field-v2-internal [{:keys [template key-fn allow-change? disable-new? disable-remove? schema on-change disabled new-text] prop-value :value :as props} ]
(defn multi-field-v2-internal [{:keys [template key-fn allow-change? disable-new? disable-remove? schema on-change disabled new-text] prop-value :value } ]
(let [prop-value (if (seq prop-value)
(vec prop-value)
[])]

55
src/cljs/auto_ap/views/components/paginator.cljs
View File

@@ -1,55 +0,0 @@
(ns auto-ap.views.components.paginator
(:require [re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [date->str]]
[reagent.core :as reagent]
[clojure.string :as str]
[cljs-time.format :as format]))
(defn bound [x y z]
(cond
(< z x)
x
(< y x)
x
(> y z)
z
:else
y))
(defn paginator [{:keys [start end count total on-change]}]
(let [per-page 100
max-buttons 5
buttons-before (Math/floor (/ max-buttons 2))
total-pages (Math/ceil (/ total per-page))
current-page (Math/floor (/ start per-page))
first-page-button (bound 0 (- current-page buttons-before) (- total-pages max-buttons))
all-buttons (into [] (for [x (range total-pages)]
^{:key x}
[:li
[:a.pagination-link {:class (when (= current-page x)
"is-current")
:on-click (fn [e] (on-change {:start (* x per-page)}))}
(inc x)]]))
last-page-button (Math/min total-pages (+ max-buttons first-page-button))
extended-last-page-button (when (not= last-page-button total-pages)
(list
^ {:key -1} [:li [:span.pagination-ellipsis "…"]]
^ {:key -2} (last all-buttons)))
extended-first-page-button (when (not= first-page-button 0)
(list
^{:key -1} (first all-buttons)
^{:key -2} [:li [:span.pagination-ellipsis "…"]]))]
[:nav.pagination {:role "pagination"}
[:ul.pagination-list
extended-first-page-button
(apply list (subvec all-buttons first-page-button last-page-button))
extended-last-page-button
"Showing " (Math/min (inc start) total) "-" end "/" total]]))

1
src/cljs/auto_ap/views/components/percentage_field.cljs
View File

@@ -1,6 +1,5 @@
(ns auto-ap.views.components.percentage-field
(:require [reagent.core :as r]
[auto-ap.views.utils :refer [->short$]]
[clojure.string :as str]
[react :as react]))
(def good-% #"^\d{1,3}$")

21
src/cljs/auto_ap/views/components/sort_by_list.cljs
View File

@@ -1,21 +0,0 @@
(ns auto-ap.views.components.sort-by-list
(:require [re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [date->str]]
[reagent.core :as reagent]
[clojure.string :as str]
[cljs-time.format :as format]))
(defn sort-by-list [{:keys [sort on-change]}]
[:div.field.is-grouped.is-grouped-multiline
(for [{:keys [sort-key sort-name asc]} sort]
^{:key sort-key}
[:div.control
[:div.tags.has-addons
[:div.tag.is-medium [:span.icon (if asc
[:i.fa.fa-sort-up]
[:i.fa.fa-sort-down])]
[:span sort-name] ]
[:a.tag.is-medium.is-delete {:on-click (fn []
(on-change {:sort (filter #(not= sort-key (:sort-key %)) sort)}))}]]])])

49
src/cljs/auto_ap/views/components/sorter.cljs
View File

@@ -1,49 +0,0 @@
(ns auto-ap.views.components.sorter
(:require [re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [date->str]]
[reagent.core :as reagent]
[clojure.string :as str]
[cljs-time.format :as format]))
(defn toggle-sort-by [params sort-key sort-name asc]
(let [[found? sort] (reduce
(fn [[found? sort] sort-item]
(if (= sort-key (:sort-key sort-item))
[true (conj sort
(update sort-item :asc not))]
[found? (conj sort sort-item)]))
[false []]
(:sort params))
sort (if found?
sort
(conj sort {:sort-key sort-key
:sort-name sort-name
:asc true}))]
(-> params
(assoc :sort sort))))
(defn sort-icon [which sort asc]
(let [sort-item (first (filter #(= which (:sort-key %)) sort))]
(cond
(and sort-item (:asc sort-item))
[:span.icon
[:i.fa.fa-sort-up]]
(and sort-item (not (:asc sort-item)))
[:span.icon
[:i.fa.fa-sort-down]]
:else
[:span.icon
[:i.fa.fa-sort]])))
(defn sorted-column [{:keys [on-sort sort-key sort sort-name asc style class]} & rest]
[:th {:on-click (fn [e]
(on-sort
(toggle-sort-by {:sort sort} sort-key sort-name asc)))
:style style
:class class}
rest
(sort-icon sort-key sort asc)])

2
src/cljs/auto_ap/views/components/vendor_dialog.cljs
View File

@@ -166,7 +166,7 @@
(defn form-content [{:keys [data]}]
(defn form-content []
(let [is-admin? @(re-frame/subscribe [::subs/is-admin?])
clients @(re-frame/subscribe [::subs/client-refs])]
[form-builder/builder {:submit-event [::save]

11
src/cljs/auto_ap/views/pages/admin.cljs
View File

@@ -1,12 +1,7 @@
(ns auto-ap.views.pages.admin
(:require-macros [cljs.core.async.macros :refer [go]])
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.utils :refer [login-url]]))
(:require
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]))
(defn admin-page []
[side-bar-layout {:side-bar [admin-side-bar {}]

37
src/cljs/auto_ap/views/pages/admin/accounts.cljs
View File

@@ -1,25 +1,20 @@
(ns auto-ap.views.pages.admin.accounts
(:require [auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.utils :refer [replace-by]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.pages.admin.accounts.side-bar :as side-bar]
[auto-ap.views.pages.admin.accounts.table :as table]
[auto-ap.views.utils :refer [dispatch-event action-cell-width with-user]]
[auto-ap.views.components.layouts
:refer
[appearing-side-bar side-bar-layout]]
[auto-ap.views.pages.admin.accounts.form :as account-form]
[re-frame.core :as re-frame]
[auto-ap.views.components.grid :as grid]
[auto-ap.status :as status]
[auto-ap.views.components.buttons :as buttons]
[reagent.core :as reagent]
[clojure.string :as str]
[vimsical.re-frame.fx.track :as track]
[auto-ap.views.pages.data-page :as data-page]
[clojure.set :as set]
[auto-ap.effects.forward :as forward]))
(:require
[auto-ap.effects.forward :as forward]
[auto-ap.forms :as forms]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.layouts
:refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.pages.admin.accounts.form :as account-form]
[auto-ap.views.pages.admin.accounts.side-bar :as side-bar]
[auto-ap.views.pages.admin.accounts.table :as table]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[vimsical.re-frame.fx.track :as track]))
(def default-read [:numeric-code :name :location :type :account_set :applicability :id [:client-overrides [:name [:client [:name :id]]]]])

6
src/cljs/auto_ap/views/pages/admin/accounts/side_bar.cljs
View File

@@ -1,10 +1,8 @@
(ns auto-ap.views.pages.admin.accounts.side-bar
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.pages.data-page :as data-page]))
[re-frame.core :as re-frame]))
(defn accounts-side-bar [{:keys [data-page]}]
[:div

7
src/cljs/auto_ap/views/pages/admin/accounts/table.cljs
View File

@@ -1,12 +1,11 @@
(ns auto-ap.views.pages.admin.accounts.table
(:require
[auto-ap.status :as status]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.admin.accounts.form :as account-form]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [action-cell-width]]
[re-frame.core :as re-frame]
[auto-ap.views.pages.data-page :as data-page]))
[re-frame.core :as re-frame]))
(defn accounts-table [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])]
@@ -24,7 +23,7 @@
[grid/header-cell {} "Location"]
[grid/header-cell {:style {:width (action-cell-width 1)}} ]]]
[grid/body
(for [{:keys [id numeric-code name type location class] :as account} (:data data)]
(for [{:keys [id numeric-code name type location] :as account} (:data data)]
^{:key id}
[grid/row {:class (:class account) :id id}
[grid/cell {} numeric-code]

7
src/cljs/auto_ap/views/pages/admin/clients/form.cljs
View File

@@ -1,6 +1,5 @@
(ns auto-ap.views.pages.admin.clients.form
(:require
[auto-ap.entities.clients :as entity]
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
@@ -21,7 +20,6 @@
[cljs-time.core :as t]
[re-frame.core :as re-frame]
[reagent.core :as r]
[react-signature-canvas]
[vimsical.re-frame.cofx.inject :as inject]
[auto-ap.schema :as schema]
[malli.core :as m]))
@@ -178,7 +176,7 @@
:identifier identifier
:amount amount})
(:forecasted-transactions new-client-data))
:bank-accounts (map-indexed (fn [i {:keys [number name check-number plaid-account intuit-bank-account include-in-reports type id code numeric-code start-date bank-name routing bank-code new? sort-order visible yodlee-account-id locations yodlee-account use-date-instead-of-post-date]}]
:bank-accounts (map-indexed (fn [i {:keys [number name check-number plaid-account intuit-bank-account include-in-reports type id code numeric-code start-date bank-name routing bank-code new? visible locations yodlee-account use-date-instead-of-post-date]}]
{:number number
:name name
:check-number check-number
@@ -526,8 +524,7 @@
"Client code"
[:input.input {:type "code"
:style {:width "5em"}
:disabled (boolean (:id new-client))
:spec ::entity/code}]]
:disabled (boolean (:id new-client))}]]
[form-builder/field-v2 {:field :locations}
"Locations"

6
src/cljs/auto_ap/views/pages/admin/clients/side_bar.cljs
View File

@@ -13,7 +13,7 @@
::filters
:<- [::specific-filters]
:<- [::subs/query-params]
(fn [[specific-filters vendors-by-id query-params] ]
(fn [[specific-filters _ query-params] ]
(let [url-filters (-> query-params
(select-keys #{:name
:code}))
@@ -32,7 +32,7 @@
:<- [::settled-filters]
:<- [::filters]
:<- [::subs/active-page]
(fn [[settled-filters filters ap ]]
(fn [[settled-filters filters _ ]]
(let [filters (or settled-filters filters)]
{:name (:name filters)
:code (:code filters)})))
@@ -44,7 +44,7 @@
(re-frame/reg-event-fx
::filters-settled
(fn [{:keys [db]} [_ & params]]
(fn [{:keys [db]} _]
{:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
(re-frame/reg-event-fx

65
src/cljs/auto_ap/views/pages/admin/import_batches.cljs
View File

@@ -1,29 +1,22 @@
(ns auto-ap.views.pages.admin.import-batches
(:require [auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.pages.admin.import-batches.table :as table]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[vimsical.re-frame.cofx.inject :as inject]
[vimsical.re-frame.fx.track :as track]
[auto-ap.events :as events]
[auto-ap.utils :refer [replace-by merge-by]]
[re-frame.core :as re-frame]
[auto-ap.status :as status]
[auto-ap.effects.forward :as forward]
[auto-ap.views.pages.data-page :as data-page]
[clojure.set :as set]
[auto-ap.views.components.buttons :as buttons]
[clojure.string :as str]))
(:require
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.pages.admin.import-batches.table :as table]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[vimsical.re-frame.fx.track :as track]))
(def default-read [:user-name :date :source :status :id :imported :suppressed :extant])
(re-frame/reg-event-fx
::params-change
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
(fn [{:keys [user]} [_ params]]
{:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [{:query/data [:import_batch_page
@@ -54,30 +47,13 @@
(re-frame/reg-event-fx ::request-intuit
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
(fn [{:keys [user]} [_ _]]
{:graphql {:token user
:owns-state {:single ::intuit}
:query "mutation RequestIntuitImport{request_import(which: \":intuit\")}"
:on-success [::success-intuit]
}}))
(re-frame/reg-event-db
::success-yodlee
(fn [db [_ n]]
(assoc db ::msg (str "Your job " (:request-import n) " has been scheduled." ))))
(re-frame/reg-event-fx
::request-yodlee
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
{:graphql {:token user
:owns-state {:single ::yodlee}
:query "mutation RequestIntuitImport{request_import(which: \":yodlee\")}"
:on-success [::success-yodlee]
}}))
(re-frame/reg-event-db
::success-yodlee2
(fn [db [_ n]]
@@ -86,7 +62,7 @@
(re-frame/reg-event-fx
::request-yodlee2
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
(fn [{:keys [user]} [_ _]]
{:graphql {:token user
:owns-state {:single ::yodlee2}
:query "mutation RequestIntuitImport{request_import(which: \":yodlee2\")}"
@@ -103,7 +79,7 @@
(re-frame/reg-event-fx
::request-plaid
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
(fn [{:keys [user]} [_ _]]
{:graphql {:token user
:owns-state {:single ::plaid}
:query "mutation RequestIntuitImport{request_import(which: \":plaid\")}"
@@ -112,7 +88,7 @@
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]}]
(fn [_]
{::track/register {:id ::params
:subscription [::data-page/params ::page]
:event-fn (fn [params]
@@ -131,7 +107,6 @@
(fn []
(let [user @(re-frame/subscribe [::subs/user])
intuit-request-import-status @(re-frame/subscribe [::status/single ::intuit])
yodlee-request-import-status @(re-frame/subscribe [::status/single ::yodlee])
yodlee2-request-import-status @(re-frame/subscribe [::status/single ::yodlee2])
plaid-request-import-status @(re-frame/subscribe [::status/single ::plaid])
message @(re-frame/subscribe [::msg])]
@@ -143,13 +118,7 @@
[:div
[:div.is-pulled-right
[:div.buttons
[:button.button.is-primary-two {:aria-haspopup true
:type "button"
:on-click (dispatch-event [::request-yodlee])
:disabled (status/disabled-for yodlee-request-import-status)
:class (status/class-for yodlee-request-import-status)}
"Start Yodlee Import"]
[:button.button.is-primary-two {:aria-haspopup true
:type "button"
:on-click (dispatch-event [::request-yodlee2])

10
src/cljs/auto_ap/views/pages/admin/import_batches/table.cljs
View File

@@ -31,13 +31,7 @@
(fn [[specific-table-params query-params]]
(merge (select-keys query-params #{:start :sort}) specific-table-params )))
(re-frame/reg-event-fx
::params-changed
[(re-frame/path [::table-params])]
(fn [{table-params :db} [_ params :as z]]
{:db (merge table-params params)}))
(defn table* [{:keys [id data-page]}]
(defn table* [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])]
[grid/grid {:data-page data-page
:column-count 6}
@@ -82,7 +76,7 @@
:icon "fa-external-link"}]]
])]]]))
(defn table [params]
(defn table []
(r/create-class {:component-will-unmount (dispatch-event [::unmounted])
:reagent-render (fn [params]
[table* params])}))

61
src/cljs/auto_ap/views/pages/admin/plaid/table.cljs
View File

@@ -1,46 +1,24 @@
(ns auto-ap.views.pages.admin.plaid.table
(:require [auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.pages.admin.users.form :as form]
[auto-ap.views.utils :refer [->$ action-cell-width date->str with-user dispatch-event]]
[re-frame.core :as re-frame]
[auto-ap.forms :as forms]
[auto-ap.views.pages.data-page :as data-page]))
#_(re-frame/reg-event-fx
::refreshed
[with-user ]
(fn [{:keys [user db]} [_ provider-account ]]
;; this is tracked in yodlee main, for refreshing
{}))
#_(re-frame/reg-event-fx
::request-refresh
[with-user ]
(fn [{:keys [user db]} [_ provider-account client-id ]]
{:http {:token user
:method :post
:headers {"Content-Type" "application/edn"}
:uri (str "/api/yodlee2/provider-accounts/refresh/")
:owns-state {:multi ::refresh
:which provider-account}
:body {:client-id client-id
:provider-account-id provider-account}
:on-success [::refreshed provider-account]}}))
(:require
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils
:refer [->$ action-cell-width date->str dispatch-event with-user]]
[re-frame.core :as re-frame]))
(re-frame/reg-event-fx
::plaid-item-deleted
(fn [{:keys [db]} [_ i result]]
(fn [_ _]
{:dispatch [::modal/modal-closed ]}))
(re-frame/reg-event-fx
::delete-plaid-item
[with-user ]
(fn [{:keys [user db]} [_ id ]]
(fn [{:keys [user]} [_ id ]]
{:graphql {:token user
:owns-state {:single ::delete-plaid-item}
:query-obj
@@ -55,7 +33,7 @@
(re-frame/reg-event-fx
::delete-requested
[with-user]
(fn [{:keys [user db]} [_ id]]
(fn [_ [_ id]]
{:dispatch
[::modal/modal-requested {:title "Delete Provider account "
:body [:div "Are you sure you want to delete " id "?"]
@@ -66,21 +44,14 @@
:close-event [::status/completed ::delete-plaid-item]}
:cancel? true}]}))
(re-frame/reg-event-fx
::params-changed
(fn [{:keys [db]} [_ p]]
{:db (assoc db ::params p)}))
(re-frame/reg-sub
::params
(fn [db]
(-> db ::params)))
(defn table [{:keys [status data-page]}]
(defn table [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
params @(re-frame/subscribe [::params])
is-admin? @(re-frame/subscribe [::subs/is-admin?])
statuses @(re-frame/subscribe [::status/multi ::refresh])]
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[grid/grid {:data-page data-page
:column-count 5}
[grid/controls data]
@@ -93,7 +64,7 @@
[grid/header-cell {} "Accounts"]
[grid/header-cell {:style {:width (action-cell-width 1)}} ]]]
[grid/body
(for [{:keys [id name accounts status last-updated clients] :as c} (:data data)]
(for [{:keys [id name accounts status last-updated] :as c} (:data data)]
^{:key (str name "-" id )}
[grid/row {:class (:class c) :id id}
[grid/cell {} id]

14
src/cljs/auto_ap/views/pages/admin/rules/results_modal.cljs
View File

@@ -1,7 +1,5 @@
(ns auto-ap.views.pages.admin.rules.results-modal
(:require [auto-ap.events :as events]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [date->str dispatch-event with-user]]
(:require [auto-ap.views.utils :refer [date->str dispatch-event with-user]]
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
[re-frame.core :as re-frame]
[auto-ap.views.components.modal :as modal]
@@ -37,11 +35,10 @@
(count checked)
0)))
(defn results-body [params]
(defn results-body []
(let [runnable? @(re-frame/subscribe [::runnable?])
checked @(re-frame/subscribe [::checked])
all-checked @(re-frame/subscribe [::all-checked])
checked-count @(re-frame/subscribe [::checked-count])]
all-checked @(re-frame/subscribe [::all-checked])]
[:table.table.is-fullwidth.compact
[:tr
(when runnable?
@@ -71,7 +68,6 @@
(defn foot [params]
(let [runnable? @(re-frame/subscribe [::runnable?])
checked @(re-frame/subscribe [::checked])
all-checked @(re-frame/subscribe [::all-checked])
checked-count @(re-frame/subscribe [::checked-count])
status @(re-frame/subscribe [::status/single ::apply])]
@@ -115,8 +111,8 @@
(re-frame/reg-event-db
::toggle-all
(fn [db [_ which]]
(let [{::keys [all-checked checked test-results]} db]
(fn [db [_ _]]
(let [{::keys [all-checked test-results]} db]
(assoc db
::all-checked (not all-checked)
::checked (if all-checked

19
src/cljs/auto_ap/views/pages/admin/rules/table.cljs
View File

@@ -16,7 +16,7 @@
(re-frame/reg-event-fx
::run-clicked
[with-user]
(fn [{:keys [user db]} [_ which]]
(fn [{:keys [user]} [_ which]]
{:graphql
{:token user
:owns-state {:multi ::run
@@ -36,7 +36,7 @@
(re-frame/reg-event-fx
::succeeded-run
(fn [{:keys [db]} [_ transaction-rule-id result]]
(fn [_ [_ transaction-rule-id result]]
{:dispatch [::results-modal/opening (:run-transaction-rule result) transaction-rule-id true]}))
(re-frame/reg-sub
@@ -56,13 +56,6 @@
(fn [[specific-table-params query-params]]
(merge (select-keys query-params #{:start :sort}) specific-table-params )))
(re-frame/reg-event-fx
::params-changed
[(re-frame/path [::table-params])]
(fn [{table-params :db} [_ params :as z]]
{:db (merge table-params params)}))
(re-frame/reg-event-fx
::deleted-transaction-rule
(fn []
@@ -71,7 +64,7 @@
(re-frame/reg-event-fx
::delete-transaction-rule
[with-user]
(fn [{:keys [db user]} [_ id]]
(fn [{:keys [user]} [_ id]]
{:graphql
{:token user
:owns-state {:single ::delete-transaction-rule}
@@ -97,9 +90,9 @@
(defn table* [{:keys [id data-page]}]
(defn table* [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
selected-client @(re-frame/subscribe [::subs/client])
_ @(re-frame/subscribe [::subs/client])
states @(re-frame/subscribe [::status/multi ::run])]
[grid/grid {:data-page data-page
:column-count 6}
@@ -152,7 +145,7 @@
[buttons/sl-icon {:event [::request-delete r] :icon :icon-bin-2}]
[buttons/fa-icon {:event [::form/editing r] :icon :fa-pencil}]]]])]]]))
(defn table [params]
(defn table []
(r/create-class {:component-will-unmount (dispatch-event [::unmounted])
:reagent-render (fn [params]
[table* params])}))

2
src/cljs/auto_ap/views/pages/admin/users.cljs
View File

@@ -53,7 +53,7 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
(fn [_ _]
{::forward/dispose {:id ::edited-user}}))

6
src/cljs/auto_ap/views/pages/admin/vendors/side_bar.cljs vendored
View File

@@ -1,10 +1,8 @@
(ns auto-ap.views.pages.admin.vendors.side-bar
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.pages.data-page :as data-page]))
[re-frame.core :as re-frame]))
(defn vendor-side-bar [{:keys [data-page]}]
[:div

165
src/cljs/auto_ap/views/pages/check.cljs
View File

@@ -1,165 +0,0 @@
(ns auto-ap.views.pages.check
(:require-macros [cljs.core.async.macros :refer [go]])
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [login-url]]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]
[goog.string :as gstring]))
(re-frame/reg-sub
::checks
(fn [db]
(-> db ::checks)))
(defn check-page []
(let [checks @(re-frame/subscribe [::checks])]
[:div
(for [{:keys [vendor-name paid-to client check date amount memo]} checks
:let [amount (gstring/format "--%.2f--" amount)]]
[:div
[:div.columns
(let [{:keys [name address1 city state zip bank]} client]
(list
[:div.column.is-4
[:p name]
[:p address1]
[:p city ", " state zip]]
[:div.column.is-7
[:p.has-text-centered (:name bank)]
[:p.has-text-centered (:acct bank)]
]))
[:div.column
check]
]
[:div.columns
[:div.column.is-11]
[:div.column date]
]
[:div.columns
[:div.column
"PAY"
]
[:div.column
"TO THE ORDER OF"]
[:div.column.is-9
vendor-name]
[:div.column
amount]]
[:div.columns
[:div.column]
[:div.column.is-8 {:style {"border-bottom" "1px solid black"}} "One thousand two hundred thirty four and fifty six cents"]
[:div.column.is-3]]
[:div.columns
[:div.column ""]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column
"MEMO"]
[:div.column.is-7 {:style {"border-bottom" "1px solid black"}}
memo]
[:div.column.is-4]]
[:div.columns
[:div.column.is-2 ]
[:div.column.is-10 {:style {"font-family" "MICR" "font-size" "20pt"}}
(str "c" check "c a" (:acct-number (:bank client)) "a 10302c")]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column]
[:div.column.is-10
(let [{:keys [name address1 city state zip bank]} client]
(list
[:p name]
[:p address1]
[:p city ", " state zip]
))
]
[:div.column
check]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column]
[:div.column.is-5
vendor-name]
[:div.column
[:p.has-text-right "Paid to:"]
[:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]]
[:div.column.is-5
[:p paid-to]
[:p amount]
[:p date]]]
[:div.columns
[:div.column "MEMO"]
[:div.column.is-11
memo
]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column.is-6]
[:div.column
[:p.has-text-right "Check:"]
[:p.has-text-right "Vendor:"]
[:p.has-text-right "Bank Account:"]
[:p.has-text-right "Paid To:"]
[:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]]
[:div.column.is-5
[:p check]
[:p vendor-name]
[:p (:name (:bank client))]
[:p paid-to]
[:p amount]
[:p date]]]
[:div.columns
[:div.column "MEMO"]
[:div.column.is-11
memo]]
[:footer]])]))

20
src/cljs/auto_ap/views/pages/company/plaid.cljs
View File

@@ -3,16 +3,15 @@
[auto-ap.effects.forward :as forward]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.pages.company.side-bar :refer [company-side-bar]]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.pages.admin.plaid.table :as table]
[auto-ap.views.pages.company.side-bar :refer [company-side-bar]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[react-plaid-link :refer [usePlaidLink]]
[reagent.core :as reagent]
[auto-ap.views.pages.data-page :as data-page]
[clojure.set :as set]
[vimsical.re-frame.fx.track :as track]))
(re-frame/reg-sub
@@ -36,17 +35,10 @@
(fn [db]
(::plaid-items db)))
(re-frame/reg-event-fx
::params-change
(fn [_ [_ params]]
{:set-uri-params params}))
(re-frame/reg-event-fx
::data-requested
(fn [{:keys [db]} [_ params]]
(println "PRAAMS" params)
{:graphql {:token (:user db)
:owns-state {:single ::page}
:query-obj {:venia/queries [{:query/data [:plaid-item-page {:client-id (:id @(re-frame/subscribe [::subs/client]))
@@ -72,7 +64,7 @@
{:dispatch [::data-requested]
::forward/register {:id ::plaid-item-deleted
:events #{::table/plaid-item-deleted}
:event-fn (fn [[_ query-result]]
:event-fn (fn [[_ _]]
[::data-requested])}
::track/register {:id ::params
:subscription [::data-page/params ::page]
@@ -84,7 +76,7 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
(fn [_ _]
{::forward/dispose {:id ::plaid-item-deleted}
::track/dispose [{:id ::params}]}))
@@ -92,7 +84,7 @@
(re-frame/reg-event-fx
::get-link-token
[with-user]
(fn [{:keys [db]} [_ client]]
(fn [{:keys [db]} [_ _]]
{:graphql {:token (:user db)
:owns-state {:single ::get-link-token}
:query-obj {:venia/queries [[:plaid-link-token {:client-id (:id @(re-frame/subscribe [::subs/client]))}

2
src/cljs/auto_ap/views/pages/company/yodlee2/table.cljs
View File

@@ -107,7 +107,7 @@
[grid/header-cell {} "Accounts"]
[grid/header-cell {:style {:width (action-cell-width 3)}} ]]]
[grid/body
(for [{:keys [id name accounts status detailed-status last-updated clients] :as c} (:data page)]
(for [{:keys [id name accounts status detailed-status last-updated] :as c} (:data page)]
^{:key (str name "-" id )}
[grid/row {:class (:class c) :id id}
[grid/cell {} id]

20
src/cljs/auto_ap/views/pages/data_page.cljs
View File

@@ -1,8 +1,10 @@
(ns auto-ap.views.pages.data-page
(:require [auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.utils :refer [deep-merge replace-by]]
[re-frame.core :as re-frame]))
(:require
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.utils :refer [deep-merge replace-by]]
[auto-ap.views.utils :as u]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::checked
@@ -68,7 +70,7 @@
(re-frame/subscribe [::table-params id])
(re-frame/subscribe [::additional-params id])])
(fn [[client filters table-params additional-params]]
(let [query-params (auto-ap.views.utils/query-params)]
(let [query-params (u/query-params)]
(cond-> {}
client (assoc :client-id (:id client))
(seq query-params) (merge query-params)
@@ -80,7 +82,7 @@
::received
(fn [{:keys [db]} [_ id data]]
(let [uri-params (dissoc @(re-frame/subscribe [::params id]) :client-id)
current-uri-params (auto-ap.views.utils/query-params)]
current-uri-params (u/query-params)]
(cond-> {:db (-> db (assoc-in [::data id] data)
(assoc :query-params uri-params))}
(not= uri-params current-uri-params) (assoc :set-uri-params uri-params)))))
@@ -130,13 +132,13 @@
(re-frame/reg-event-fx
::table-params-changed
(fn [{:keys [db]} [_ which params :as z]]
(fn [{:keys [db]} [_ which params]]
{:db (update-in db [::table-params which] merge params)}))
(re-frame/reg-event-fx
::additional-params-changed
(fn [{:keys [db]} [_ which params :as z]]
(fn [{:keys [db]} [_ which params]]
{:db (-> db
(update-in [::additional-params which] merge params)
(assoc-in [::table-params which :start] 0))}))
@@ -158,7 +160,7 @@
::filter
(fn [[_ id]]
[(re-frame/subscribe [::filters id])])
(fn [[filters] [_ id which]]
(fn [[filters] [_ _ which]]
(get filters which)))

9
src/cljs/auto_ap/views/pages/error.cljs
View File

@@ -1,11 +1,4 @@
(ns auto-ap.views.pages.error
(:require [re-frame.core :as re-frame]
[auto-ap.views.components.layouts :refer [side-bar-layout]]))
(re-frame/reg-sub
::error
(fn [db]
(:initial-error db)))
(ns auto-ap.views.pages.error)
(defn error-page []
[:div.container

7
src/cljs/auto_ap/views/pages/index.cljs
View File

@@ -1,7 +0,0 @@
(ns auto-ap.views.pages.index
(:require [bidi.bidi :as bidi]
[auto-ap.routes :as routes]))
(defn index-page []
[:div
[:h1.title "Dashboard"]])

3
src/cljs/auto_ap/views/pages/invoices/advanced_print_checks.cljs
View File

@@ -12,7 +12,6 @@
:refer [does-amount-exceed-outstanding? invoice-read]]
[auto-ap.views.utils :refer [coerce-float dispatch-event with-user]]
[malli.core :as m]
[malli.error :as me]
[re-frame.core :as re-frame]))
(def advanced-print-schema (m/schema
@@ -23,7 +22,7 @@
:string
[:map
[:amount schema/money]]]]]
[:fn (fn [{:keys [invoices invoice-amounts] :as z}]
[:fn (fn [{:keys [invoices invoice-amounts]}]
(if (seq (filter
(fn [{:keys [id outstanding-balance]}]
(does-amount-exceed-outstanding? (get-in invoice-amounts [id :amount]) outstanding-balance ))

23
src/cljs/auto_ap/views/pages/invoices/form.cljs
View File

@@ -3,39 +3,32 @@
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
[auto-ap.schema :as schema]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.time-utils :refer [next-dom]]
[auto-ap.utils :refer [dollars=]]
[auto-ap.schema :as schema]
[auto-ap.views.components :as com]
[auto-ap.views.components.dropdown :refer [drop-down]]
[auto-ap.views.components.expense-accounts-field
:as eaf
:refer [recalculate-amounts
expense-accounts-field-v2]]
:refer [expense-accounts-field-v2 recalculate-amounts]]
[auto-ap.views.components.layouts :as layouts]
[auto-ap.views.components.level :refer [left-stack]]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.components.dropdown :refer [drop-down]]
[auto-ap.views.components.money-field :refer [money-field]]
[auto-ap.views.components.switch-field :refer [switch-field]]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[auto-ap.views.pages.invoices.common :refer [invoice-read]]
[auto-ap.views.utils
:refer [date-picker
dispatch-event
with-user]]
[auto-ap.views.utils :refer [date-picker dispatch-event with-user]]
[cljs-time.core :as c]
[clojure.string :as str]
[malli.core :as m]
[re-frame.core :as re-frame]
[reagent.core :as r]
[malli.core :as m]
[vimsical.re-frame.cofx.inject :as inject]
[vimsical.re-frame.fx.track :as track]
[auto-ap.views.components :as com]))
[vimsical.re-frame.fx.track :as track]))
(def schema (m/schema
[:map
@@ -321,7 +314,7 @@
{::track/dispose [{:id ::client}
{:id ::vendor-change}]}))
(defn form-content [params]
(defn form-content []
[layouts/side-bar {:on-close (dispatch-event [::forms/form-closing ::form ])}
(let [{:keys [data]} @(re-frame/subscribe [::forms/form ::form])
can-submit? (boolean @(re-frame/subscribe [::can-submit]))

18
src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs
View File

@@ -1,31 +1,27 @@
(ns auto-ap.views.pages.ledger.balance-sheet
(:require
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
[auto-ap.ledger.reports :as l-reports]
[auto-ap.status :as status]
[clojure.string :as str]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.components :as com]
[auto-ap.views.components.layouts
:refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.components.switch-field :refer [switch-field]]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.pages.ledger.report-table :as rtable]
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
[auto-ap.views.pages.ledger.table :as ledger-table]
[auto-ap.views.utils
:refer [date-picker
dispatch-event
local-now
with-user]]
:refer [date-picker dispatch-event local-now with-user]]
[cljs-time.core :as t]
[clojure.set :as set]
[clojure.string :as str]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[vimsical.re-frame.fx.track :as track]
[vimsical.re-frame.cofx.inject :as inject]
[auto-ap.views.pages.ledger.report-table :as rtable]
[auto-ap.forms.builder :as form-builder]
[auto-ap.views.components :as com]))
[vimsical.re-frame.fx.track :as track]))
(defn data-params->query-params [params]
(when params

5
src/cljs/auto_ap/views/pages/ledger/external_import.cljs
View File

@@ -119,10 +119,9 @@
;; COMPONENTS
(defn textarea->table [{:keys [headings value on-change read-only-headings]} & children]
(defn textarea->table [{:keys [read-only-headings]} & children]
(let [text-form (r/atom "")
include-headers (r/atom true)
table-form (r/atom nil)]
include-headers (r/atom true)]
(fn [{:keys [headings value on-change row-filter]}]
[:div
(when (> (count value) 2000)

10
src/cljs/auto_ap/views/pages/ledger/external_ledger.cljs
View File

@@ -34,7 +34,7 @@
(re-frame/reg-event-fx
::params-change
[with-user]
(fn [{:keys [user db]} [_ params]]
(fn [{:keys [user]} [_ params]]
{:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [[:ledger-page
@@ -63,21 +63,21 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
(fn [_ _]
{:dispatch-n [[::data-page/dispose ::page]
[::status/dispose-single ::delete-selected]]
::track/dispose {:id ::params}}))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
(fn [_ _]
{::track/register {:id ::params
:subscription [::data-page/params ::page]
:event-fn (fn [params] [::params-change params])}}))
(re-frame/reg-event-fx
::delete-successful
(fn [cofx [_ result params]]
(fn [_ [_ result params]]
{:dispatch-n [[::params-change params]
[::status/info ::delete-selected (:message (:delete-external-ledger result))]]}))
@@ -102,7 +102,7 @@
[::delete-successful result params])}})))
(defn ledger-content []
(let [current-client @(re-frame/subscribe [::subs/client])
(let [_ @(re-frame/subscribe [::subs/client])
params @(re-frame/subscribe [::data-page/params ::page])
checked @(re-frame/subscribe [::data-page/checked ::page])]
[:div

24
src/cljs/auto_ap/views/pages/ledger/external_ledger_table.cljs
View File

@@ -1,16 +1,12 @@
(ns auto-ap.views.pages.ledger.external-ledger-table
(:require [auto-ap.subs :as subs]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.views.components.sorter :refer [sorted-column]]
[auto-ap.views.components.sort-by-list :refer [sort-by-list]]
[auto-ap.views.utils :refer [date->str dispatch-event nf]]
[goog.string :as gstring]
[re-frame.core :as re-frame]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.data-page :as data-page]))
(:require
[auto-ap.subs :as subs]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [date->str nf]]
[re-frame.core :as re-frame]))
(defn external-ledger-row [{{:keys [client vendor alternate-description status date amount id source external-id line-items] :as i} :row
(defn external-ledger-row [{{:keys [client vendor alternate-description date amount id source external-id line-items] :as i} :row
:keys [selected-client bank-accounts-by-id]}]
[:<>
[grid/row {:class (:class i) :id id :checkable? true :entity i}
@@ -46,8 +42,8 @@
[grid/cell {:class "has-text-right"} (when debit (nf debit ))]
[grid/cell {:class "has-text-right"} (when credit (nf credit ))]])]])
(defn table [{:keys [id data-page status vendors on-check-changed expense-event]}]
(let [{:keys [data status params]} @(re-frame/subscribe [::data-page/page data-page])
(defn table [{:keys [data-page]}]
(let [{:keys [data params]} @(re-frame/subscribe [::data-page/page data-page])
selected-client @(re-frame/subscribe [::subs/client])
bank-accounts-by-id @(re-frame/subscribe [::subs/bank-accounts-by-id])]
[grid/grid {:data-page data-page
@@ -68,7 +64,7 @@
[grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Debit"]
[grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Credit"]]]
[grid/body
(for [{:keys [client vendor status date amount id line-items] :as i} (:data data)]
(for [{:keys [id] :as i} (:data data)]
^{:key id}
[external-ledger-row {:row i
:selected-client selected-client

2
src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs
View File

@@ -254,7 +254,7 @@ NOTE: Please review the transactions we may have question for you here: https://
active (reagent/atom nil)]
(fn []
(let [{:keys [data]} @(re-frame/subscribe [::forms/form ::form])
{:keys [periods selected-preset include-deltas column-per-location]} data]
{:keys [selected-preset include-deltas column-per-location]} data]
[form-builder/builder {:can-submit [::can-submit]
:change-event [::change]
:submit-event [::report-requested]

1
src/cljs/auto_ap/views/pages/ledger/report_table.cljs
View File

@@ -1,6 +1,5 @@
(ns auto-ap.views.pages.ledger.report-table
(:require
[auto-ap.utils :refer [dollars-0?]]
[clojure.string :as str]
[auto-ap.views.utils :refer [->$ ->% dispatch-event]]))

1
src/cljs/auto_ap/views/pages/ledger/side_bar.cljs
View File

@@ -6,7 +6,6 @@
:refer [bank-account-filter]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.number-filter :refer [number-filter]]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[auto-ap.views.pages.data-page :as data-page]

12
src/cljs/auto_ap/views/pages/login.cljs
View File

@@ -1,13 +1,7 @@
(ns auto-ap.views.pages.login
(:require-macros [cljs.core.async.macros :refer [go]])
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [login-url]]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]))
(:require
[auto-ap.views.utils :refer [login-url]]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::logout-reason

13
src/cljs/auto_ap/views/pages/needs_activation.cljs
View File

@@ -1,14 +1,7 @@
(ns auto-ap.views.pages.needs-activation
(:require-macros [cljs.core.async.macros :refer [go]])
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [login-url dispatch-event]]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]
[goog.string :as gstring]))
(:require
[auto-ap.views.utils :refer [login-url]]
[re-frame.core :as re-frame]))
(re-frame/reg-event-fx
::relogin

4
src/cljs/auto_ap/views/pages/payments/side_bar.cljs
View File

@@ -10,8 +10,8 @@
[re-frame.core :as re-frame]))
(defn side-bar [{:keys [data-page]}]
(let [ap @(re-frame/subscribe [::subs/active-page])
user @(re-frame/subscribe [::subs/user])]
(let [_ @(re-frame/subscribe [::subs/active-page])
_ @(re-frame/subscribe [::subs/user])]
[:div
[:div
[:p.menu-label "Vendor"]

2
src/cljs/auto_ap/views/pages/pos/expected_deposits/table.cljs
View File

@@ -65,7 +65,7 @@
(defn table [{:keys [data-page]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])]
{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])]
[grid/grid {:data-page data-page
:column-count (if selected-client 7 8)}
[grid/controls data]

2
src/cljs/auto_ap/views/pages/pos/sales_orders.cljs
View File

@@ -18,7 +18,7 @@
(re-frame/reg-event-fx
::params-change
[with-user]
(fn [{:keys [user db ]}[_ params]]
(fn [{:keys [user]}[_ params]]
{:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [[:sales_order_page

2
src/cljs/auto_ap/views/pages/pos/table.cljs
View File

@@ -90,7 +90,7 @@
(defn table [{:keys [data-page]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])]
{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])]
[grid/grid {:data-page data-page
:column-count (if selected-client 7 8)}
[grid/controls data

20
src/cljs/auto_ap/views/pages/transactions/manual.cljs
View File

@@ -1,14 +1,14 @@
(ns auto-ap.views.pages.transactions.manual
(:require [auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[re-frame.core :as re-frame]
[auto-ap.forms.builder :as form-builder]
[auto-ap.schema :as schema]
[malli.core :as m]))
(:require
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
[auto-ap.schema :as schema]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[malli.core :as m]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::can-submit

13
src/cljs/auto_ap/views/pages/transactions/table.cljs
View File

@@ -27,12 +27,6 @@
{:dispatch
[::edit/editing which (:potential-payment-matches matches) (:potential-autopay-invoices-matches matches) (:potential-unpaid-invoices-matches matches) (:potential-transaction-rule-matches matches)]}))
(re-frame/reg-event-fx
::editing-matches-failed
(fn [_ [_ which payment-matches]]
{:dispatch
[::edit/editing which payment-matches]}))
(re-frame/reg-event-fx
::intend-to-edit
[with-role]
@@ -68,12 +62,6 @@
(fn [db]
(::table-params db)))
(re-frame/reg-event-fx
::params-changed
[(re-frame/path [::table-params])]
(fn [{table-params :db} [_ params :as z]]
{:db (merge table-params params)}))
(defn table [{:keys [data-page check-boxes? action-buttons]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data params]} @(re-frame/subscribe [::data-page/page data-page])
@@ -101,7 +89,6 @@
[grid/row {:class (:class i) :id id :entity i}
(when-not selected-client
[grid/cell {} (:name client)])
#_[:td description-original]
[grid/cell {}
(:name bank-account )]

27
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -29,9 +29,8 @@
[goog.string :as gstring]
[re-frame.core :as re-frame]
[reagent.core :as r]
[vimsical.re-frame.fx.track :as track]
[vimsical.re-frame.cofx.inject :as inject]
[react-dom :as react-dom]))
[vimsical.re-frame.fx.track :as track]))
(re-frame/reg-event-fx
::params-change
@@ -51,7 +50,7 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
(fn [_ _]
{:dispatch-n [[::data-page/dispose :invoices]
[::forms/form-closing ::form/form]]
::forward/dispose [{:id ::updated}
@@ -60,7 +59,7 @@
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
(fn [_ _]
{::track/register [{:id ::params
:subscription [::data-page/params :invoices]
:event-fn (fn [params]
@@ -111,7 +110,7 @@
(re-frame/reg-event-fx
::pay-invoices-from-balance
[with-user (re-frame/inject-cofx ::inject/sub [::data-page/checked :invoices])]
(fn [{:keys [db user] ::data-page/keys [checked] :as cofx} _]
(fn [{:keys [db user] ::data-page/keys [checked]} _]
{:graphql
{:token user
:owns-state {:single ::print-checks}
@@ -135,7 +134,7 @@
(re-frame/reg-event-fx
::checks-printed
(fn [{:keys [db]} [_ invoices pdf-url]]
(fn [_ [_ invoices pdf-url]]
{:dispatch-n (cond->> [[::data-page/reset-checked :invoices]]
true (into (mapv
(fn [i]
@@ -150,14 +149,14 @@
(re-frame/reg-event-fx
::new-invoice-clicked
(fn [{:keys [db]} _]
(fn [_ _]
{:dispatch [::form/adding {:client @(re-frame/subscribe [::subs/client])
:status :unpaid
#_#_:date (date->str (c/now) standard)
:location (first (:locations @(re-frame/subscribe [::subs/client])))}]}))
(re-frame/reg-event-fx
::voided-selected
(fn [cofx [_]]
(fn [_ [_]]
{:dispatch-n [[::modal/modal-closed]
[::params-change @(re-frame/subscribe [::data-page/params ::page])]
[::data-page/reset-checked :invoices]]}))
@@ -242,7 +241,7 @@
:is-right? true}
[:div
(list
(for [{:keys [id number name type]} (->> (:bank-accounts current-client) (filter :visible) (sort-by :sort-order))]
(for [{:keys [id name type]} (->> (:bank-accounts current-client) (filter :visible) (sort-by :sort-order))]
(if (= :cash type)
^{:key id} [:a.dropdown-item {:on-click (dispatch-event [::print-checks id :cash])
:disabled (status/disabled-for print-checks-status)} "With cash"]
@@ -276,7 +275,7 @@
(defn unpaid-invoices-content [{:keys [status]}]
(let [page @(re-frame/subscribe [::data-page/page :invoices])
current-client @(re-frame/subscribe [::subs/client])]
_ @(re-frame/subscribe [::subs/client])]
[:div
[:h1.title (str (str/capitalize (name (or status :all))) " invoices")]
[status/status-notification {:statuses [[::status/single ::print-checks]
@@ -297,28 +296,28 @@
:main [unpaid-invoices-content params]
:right-side-bar [appearing-side-bar {:visible? invoice-bar-active?} [form/form {}]]}]))
(defn unpaid-invoices-page [params]
(defn unpaid-invoices-page []
(r/create-class
{:display-name "unpaid-invoices-page"
:component-will-unmount #(re-frame/dispatch-sync [::unmounted])
:component-did-mount #(re-frame/dispatch [::mounted])
:reagent-render layout}))
(defn paid-invoices-page [params]
(defn paid-invoices-page []
(r/create-class
{:display-name "paid-invoices-page"
:component-will-unmount #(re-frame/dispatch-sync [::unmounted])
:component-did-mount #(re-frame/dispatch [::mounted])
:reagent-render layout}))
(defn voided-invoices-page [params]
(defn voided-invoices-page []
(r/create-class
{:display-name "voided-invoices-page"
:component-will-unmount #(re-frame/dispatch-sync [::unmounted])
:component-did-mount #(re-frame/dispatch [::mounted])
:reagent-render layout}))
(defn all-invoices-page [params]
(defn all-invoices-page []
(r/create-class
{:display-name "all-invoices-page"
:component-will-unmount #(re-frame/dispatch-sync [::unmounted])

29
src/cljs/auto_ap/views/utils.cljs
View File

@@ -5,20 +5,21 @@
[cljs-time.core :as t]
[cljs-time.format :as format]
[cljs.tools.reader.edn :as edn]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[goog.crypt.base64 :as base64]
[re-frame.core :as re-frame]
[react-transition-group :as react-transition-group]
#_{:clj-kondo/ignore [:unused-namespace]}
[reagent.core :as reagent]
[reagent.core :as r]
[react :as react]
[auto-ap.entities.shared :as shared])
[reagent.core :as r])
(:import
(goog.i18n NumberFormat)
(goog.i18n.NumberFormat Format)))
(def date-regex #"[2]{1}[0-9]{3}-[0-9]{1,2}-[0-9]{1,2}")
(def money-regex #"\-?[0-9]+(\.[0-9]{2})?$")
(def nff
(NumberFormat. Format/CURRENCY))
@@ -98,32 +99,24 @@
(when d
(format/unparse format d))))
(defn date-time->str [d]
(when d
(format/unparse pretty-long d)))
(defn str->date [d f]
(when d
(format/parse f d)))
(defn with-keys [children]
(map-indexed (fn [i c] ^{:key i} c) children))
(def css-transition-group
(reagent/adapt-react-class react-transition-group/CSSTransition))
(r/adapt-react-class react-transition-group/CSSTransition))
(def transition
(reagent/adapt-react-class react-transition-group/Transition))
(r/adapt-react-class react-transition-group/Transition))
(def transition-group
(reagent/adapt-react-class react-transition-group/TransitionGroup))
(r/adapt-react-class react-transition-group/TransitionGroup))
(def switch-transition
(reagent/adapt-react-class react-transition-group/SwitchTransition))
(r/adapt-react-class react-transition-group/SwitchTransition))
(defn appearing [{:keys [visible? enter-class exit-class timeout]}]
(let [final-state (reagent/atom visible?)]
(let [final-state (r/atom visible?)]
(fn [{:keys [visible?]} & children]
[css-transition-group {:in visible? :class-names {:exit exit-class :enter enter-class} :timeout timeout :onEnter (fn [] (reset! final-state true )) :onExited (fn [] (reset! final-state false))}
(if (or @final-state visible?)
@@ -210,7 +203,7 @@
;; if it's a perfect match, change it on the spot
;; especially important for calendar clicking, don't
;; want to wait for blur
(when (or (re-matches shared/date-regex (.. e -target -value))
(when (or (re-matches date-regex (.. e -target -value))
(nil? (.. e -target -value)))
(swap-external-value (some-> (.. e -target -value) coerce-date))))