fix excalidraw ci build

.gitignore

@@ -14,7 +14,7 @@ pom.*
 # cljs
 .shadow-cljs
 .nrepl-*
-package-lock.json
+/package-lock.json
 node_modules/
 public/js/
 

src/main/cljs/dda/c4k_jitsi/browser.cljs

@@ -1,11 +1,9 @@
 (ns dda.c4k-jitsi.browser
   (:require
    [clojure.tools.reader.edn :as edn]
-   [dda.c4k-common.monitoring :as mon]
    [dda.c4k-common.common :as cm]
    [dda.c4k-common.browser :as br]
-   [dda.c4k-jitsi.core :as core]
+   [dda.c4k-jitsi.core :as core]))
-   [dda.c4k-jitsi.jitsi :as jitsi]))
 
 (defn generate-content []
   (cm/concat-vec
@@ -13,22 +11,22 @@
       (br/generate-needs-validation) :content
       (cm/concat-vec
        (br/generate-group
-        "domain"
+        "config"
-        (cm/concat-vec
+        (br/generate-text-area
-         (br/generate-input-field "fqdn" "Your fqdn:" "jitsi.prod.meissa-gmbh.de")
+         "config" "Your config.edn:"
-         (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
+         "{:fqdn \"jitsi.your.domain\"
-         (br/generate-input-field "mon-cluster-name" "(Optional) monitoring cluster name:" "jitsi")
+ :mon-cfg {:cluster-name \"jitsi\"
-         (br/generate-input-field "mon-cluster-stage" "(Optional) monitoring cluster stage:" "test")
+                 :cluster-stage \"test\"
-         (br/generate-input-field "mon-cloud-url" "(Optional) grafana cloud url:" "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push")
+                 :grafana-cloud-url \"https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push\"}}"
-         ))
+         "5"))
        (br/generate-group
-        "credentials"
+        "auth"
         (br/generate-text-area "auth" "Your auth.edn:" "{:jvb-auth-password \"jitsi\"
  :jicofo-auth-password \"jicofo-password\"
  :jicofo-component-secret \"jicofo-component-secrect\"
  :mon-auth {:grafana-cloud-user \"your-user-id\"
             :grafana-cloud-password \"your-cloud-password\"}}}"
-        "5"))
+        "6"))
        [(br/generate-br)]
        (br/generate-button "generate-button" "Generate c4k yaml")))]
     (br/generate-output "c4k-jitsi-output" "Your c4k deployment.yaml:" "25")))
@@ -40,27 +38,8 @@
    :content
    (generate-content)})
 
-(defn config-from-document []
-  (let [issuer (br/get-content-from-element "issuer" :optional true)
-        mon-cluster-name (br/get-content-from-element "mon-cluster-name" :optional true)
-        mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true)
-        mon-cloud-url (br/get-content-from-element "mon-cloud-url" :optional true)]
-    (merge
-     {:fqdn (br/get-content-from-element "fqdn")}     
-     (when (some? issuer)
-       {:issuer issuer})
-     (when (some? mon-cluster-name)
-       {:mon-cfg {:cluster-name mon-cluster-name
-                  :cluster-stage (keyword mon-cluster-stage)
-                  :grafana-cloud-url mon-cloud-url}})
-     )))
-
 (defn validate-all! []
-  (br/validate! "fqdn" ::jitsi/fqdn)  
+  (br/validate! "config" core/config? :deserializer edn/read-string)
-  (br/validate! "issuer" ::jitsi/issuer :optional true)
-  (br/validate! "mon-cluster-name" ::mon/cluster-name :optional true)
-  (br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true)
-  (br/validate! "mon-cloud-url" ::mon/grafana-cloud-url :optional true)
   (br/validate! "auth" core/auth? :deserializer edn/read-string)
   (br/set-form-validated!))
 
@@ -68,22 +47,22 @@
   (-> (br/get-element-by-id name)
       (.addEventListener "blur" #(do (validate-all!)))))
 
-
 (defn init []
   (br/append-hickory (generate-content-div))
-  (-> js/document
+  (let [config-only false
-      (.getElementById "generate-button")
+        auth-only false]
-      (.addEventListener "click"
+    (-> js/document
-                         #(do (validate-all!)
+        (.getElementById "generate-button")
-                              (-> (cm/generate-common
+        (.addEventListener "click"
-                                   (config-from-document)
+                           #(do (validate-all!)
-                                   (br/get-content-from-element "auth" :deserializer edn/read-string)
+                                (-> (cm/generate-cm
-                                   {}
+                                     (br/get-content-from-element "config" :deserializer edn/read-string)
-                                   core/k8s-objects)
+                                     (br/get-content-from-element "auth" :deserializer edn/read-string)
-                                  (br/set-output!)))))
+                                     core/config-defaults
-  (add-validate-listener "fqdn")
+                                     core/config-objects
-  (add-validate-listener "issuer")
+                                     core/auth-objects
-  (add-validate-listener "mon-cluster-name")
+                                     config-only
-  (add-validate-listener "mon-cluster-stage")
+                                     auth-only)
-  (add-validate-listener "mon-cloud-url")
+                                    (br/set-output!)))))
-  (add-validate-listener "auth"))
+    (add-validate-listener "config")
+    (add-validate-listener "auth")))