From 0a40b5697fa9f97c4a71b9d59f55bcd95f5cc3e7 Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 12 Aug 2022 11:31:51 +0200 Subject: [PATCH] Fixed volume-total-storage-size error in browser --- shadow-cljs.edn | 2 +- src/main/cljs/dda/c4k_gitea/browser.cljs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index a31cc14..be071ef 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.0"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.1"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-gitea.browser/init}} diff --git a/src/main/cljs/dda/c4k_gitea/browser.cljs b/src/main/cljs/dda/c4k_gitea/browser.cljs index d0e6f4c..810f80c 100644 --- a/src/main/cljs/dda/c4k_gitea/browser.cljs +++ b/src/main/cljs/dda/c4k_gitea/browser.cljs @@ -69,11 +69,10 @@ domain-whitelist (br/get-content-from-element "domain-whitelist" :optional true)] (merge {:fqdn (br/get-content-from-element "fqdn") - ;:mailer-from (br/get-content-from-element "mailer-from") - ;:mailer-host-port (br/get-content-from-element "mailer-host-port") - ;:service-noreply-address (br/get-content-from-element "service-noreply-address") - ;:volume-total-storage-size (br/get-content-from-element "volume-total-storage-size" :deserializer #(read-string %))} ; TODO: Do not use read-string! - } + :mailer-from (br/get-content-from-element "mailer-from") + :mailer-host-port (br/get-content-from-element "mailer-host-port") + :service-noreply-address (br/get-content-from-element "service-noreply-address") + :volume-total-storage-size (br/get-content-from-element "volume-total-storage-size" :deserializer js/parseInt)} (when (not (st/blank? postgres-data-volume-path)) {:postgres-data-volume-path postgres-data-volume-path}) (when (not (st/blank? issuer)) @@ -93,7 +92,7 @@ (br/validate! "app-name" ::gitea/default-app-name :optional true) (br/validate! "domain-whitelist" ::gitea/service-domain-whitelist :optional true) (br/validate! "postgres-data-volume-path" ::pgc/postgres-data-volume-path :optional true) - (br/validate! "volume-total-storage-size" ::gitea/volume-total-storage-size) + (br/validate! "volume-total-storage-size" ::gitea/volume-total-storage-size :deserializer js/parseInt) (br/validate! "auth" gitea/auth? :deserializer edn/read-string) (br/set-form-validated!))