dali-store

demo/src/demo/env.clj

@@ -0,0 +1,9 @@
+(ns demo.env
+  (:require
+   [dali.store.file :refer [create-dali-file-store]]))
+
+(def env
+  {:dali-store (create-dali-file-store
+                {:fpath ".data/public/dali"
+                 :rpath "/r/dali"})})
+

demo/src/demo/service/aggrid.clj

@@ -1,7 +1,8 @@
 (ns demo.service.aggrid
   (:require
    [tablecloth.api :as tc]
-   [rtable.plot.aggrid :refer [aggrid-ds]]))
+   [rtable.plot.aggrid :refer [aggrid-ds]]
+   [demo.env :refer [env]]))
 
 ;; WORKING
 
@@ -12,18 +13,17 @@
                         {:field "date" :header "date" :width 220 :resizable true}
                         {:field "price" :header "price" :width 90 :resizable true
                          :cellStyle {:color "red" :background-color "green"}
-                         :type "rightAligned"
-                         }]}]
-  (aggrid-ds opts ds)))
+                         :type "rightAligned"}]}]
+    (aggrid-ds env opts ds)))
 
 
 
-(comment 
+(comment
   (-> (stock-csv)
       ;(tc/info)     
       )
-  
-  
+
+
  ; 
   )
 

demo/src/demo/service/cheetah.clj

@@ -3,7 +3,8 @@
    [tick.core :as t]
    [tech.v3.dataset :as ds]
    [tablecloth.api :as tc]
-   [rtable.plot.cheetah :refer [cheetah-ds]]))
+   [rtable.plot.cheetah :refer [cheetah-ds]]
+   [demo.env :refer [env]]))
 
 ;; WORKING
 
@@ -14,16 +15,16 @@
                         {:field "date" :caption "date" :width 220}
                         {:field "price" :caption "price" :width 90
                          :style 'demo.helper.format2/red-color}]}]
-  (cheetah-ds opts ds)))
+    (cheetah-ds env opts ds)))
 
 
 
-(comment 
+(comment
   (-> (stock-csv)
       ;(tc/info)     
       )
-  
-  
+
+
  ; 
   )
 

demo/src/demo/service/pixi.clj

@@ -1,7 +1,9 @@
 (ns demo.service.pixi
   (:require
-   [dali.transform.transit :refer [load-transit]]
-   [rtable.plot.pixi :refer [pixi-ds]]))
+   [rtable.plot.pixi :refer [pixi-ds]]
+   [cquant.tmlds :refer [transit-json-file->ds]]
+   [demo.env :refer [env]]
+   ))
 
 (def opts {:style {:width "100%"
                     :height "800px"
@@ -26,6 +28,6 @@
                       {:type :point :col :high :color "green-9"}]]})
 
 (defn pixi-static []
-  (pixi-ds opts (load-transit "resources/public/bars-1m-full.transit-json")))
+  (pixi-ds env opts (transit-json-file->ds "resources/public/bars-1m-full.transit-json")))
 
 

deps.edn

@@ -6,7 +6,7 @@
   ; source code heavily modified, but based on this one:
   ;org.clojars.frozenlock/reagent-table {:mvn/version "0.1.6"}
   io.helins/canvas {:mvn/version "2.0.0-beta0"}
-  org.pinkgorilla/dali {:mvn/version "0.1.24"}}
+  org.pinkgorilla/dali {:mvn/version "0.1.26"}}
  :aliases
  {; github ci  
   :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}

src/dali/store/file/transit.clj

@@ -0,0 +1,12 @@
+(ns dali.store.file.transit
+  (:refer-clojure :exclude [read])
+  (:require
+   [dali.store.file :refer [write-file open-file]]
+   [cquant.tmlds :refer [ds->transit-json-file transit-json-file->ds]]))
+
+(defmethod write-file "transit-json" [_ filename ds]
+  (ds->transit-json-file ds filename))
+
+(defmethod open-file "transit-json" [_ filename]
+  (transit-json-file->ds filename))
+

src/rtable/plot/aggrid.clj

@@ -3,7 +3,8 @@
    [tick.core :as t]
    [tablecloth.api :as tc]
    [dali.spec :refer [create-dali-spec]]
-   [dali.transform.transit :refer [save-transit]]))
+   [dali.store.file.transit] ; side effects
+   [dali.store :refer [write]]))
 
 ;; DATE FORMAT
 
@@ -50,7 +51,8 @@
     spec must follow r-table spec format.
     The ui shows a table with specified columns,
     Specified formats, created from the ds"
-  [{:keys [style class columns]
+  [{:keys [dali-store]}
+   {:keys [style class columns]
     :or {style {:width "100%" :height "100%"}
          class ""}
     :as opts}
@@ -62,9 +64,7 @@
     :data {:style style
            :class class
            :columns columns
-           :load (-> ds
-                     ;(format-date opts)
-                     (select-columns opts)
-                     #_(tc/rename-columns {:open "open"
-                                           :high "high"})
-                     (save-transit))}}))
+           :load (->>  (select-columns ds opts)
+                       #_(tc/rename-columns {:open "open"
+                                             :high "high"})
+                       (write dali-store "transit-json"))}}))

src/rtable/plot/cheetah.clj

@@ -1,9 +1,11 @@
 (ns rtable.plot.cheetah
   (:require
    [dali.spec :refer [create-dali-spec]]
-   [dali.transform.transit :refer [save-transit]]))
+   [dali.store.file.transit] ; side effects
+   [dali.store :refer [write]]))
 
-(defn cheetah-ds [{:keys [style class columns]
+(defn cheetah-ds [{:keys [dali-store]}
+                  {:keys [style class columns]
                    :or {style {:width "100%" :height "100%"}
                         class ""}} ds]
   (create-dali-spec
@@ -12,4 +14,4 @@
     :data {:style style
            :class class
            :columns columns
-           :load (save-transit ds)}}))
+           :load (write dali-store "transit-json" ds)}}))

src/rtable/plot/highcharts.clj

@@ -1,15 +1,18 @@
 (ns rtable.plot.highcharts
   (:require
    [dali.spec :refer [create-dali-spec]]
-   [dali.transform.transit :refer [save-transit]]))
+   [dali.store.file.transit] ; side effects
+   [dali.store :refer [write]]))
 
-(defn highstock-ds [{:keys [style class charts]
+(defn highstock-ds [{:keys [dali-store]}
+                    {:keys [style class charts]
                      :or {style {:width "100%" :height "100%"}
-                          class ""}} ds]
+                          class ""}}
+                    ds]
   (create-dali-spec
    {:viewer-fn 'rtable.viewer.highcharts/highstock
     :transform-fn 'rtable.transform.highcharts/load-and-transform-highcharts
     :data {:style style
            :class class
            :charts charts
-           :load (save-transit ds)}}))
+           :load (write dali-store "transit-json" ds)}}))

src/rtable/plot/pixi.clj

@@ -1,9 +1,11 @@
 (ns rtable.plot.pixi
   (:require
    [dali.spec :refer [create-dali-spec]]
-   [dali.transform.transit :refer [save-transit]]))
+   [dali.store.file.transit] ; side effects
+   [dali.store :refer [write]]))
 
-(defn pixi-ds [{:keys [style class charts]
+(defn pixi-ds [{:keys [dali-store]}
+               {:keys [style class charts]
                 :or {style {:width "100%" :height "100%"}
                      class ""}} ds]
   (create-dali-spec
@@ -12,4 +14,4 @@
     :data {:style style
            :class class
            :columns charts
-           :load (save-transit ds)}}))
+           :load (write dali-store "transit-json" ds)}}))