unified validation display

Author: invaliduser

resources/sass/form.scss

@@ -30,6 +30,10 @@ div.form-input-container {
   @extend .form-text-input;
 }
 
+.json-editor {
+    border: 1px solid black;
+}
+
 // Toggle
 
 /* The switch - the box around the slider */

src/com/yetanalytics/lrs_admin_ui/handlers.cljs

@@ -809,7 +809,7 @@
                          ::db/statements-upload-analyzed? false)
             json-errors       (assoc-in [::db/statements-upload-manual-errors :json] json-errors)
             (not json-errors) (assoc-in [::db/statements-upload-manual-errors :json] []))
-      :dispatch-later [{:ms 3000
+      :dispatch-later [{:ms 1500
                         :dispatch [:statements-upload/validate-manual-xapi]
                         :event-id :manual-xapi-validate}]})))
 

src/com/yetanalytics/lrs_admin_ui/subs.cljs

@@ -266,10 +266,13 @@
  :statements-upload/manual-json-buffer
  :<- [:statements-upload/editor-contents]
  :<- [:statements-upload/manual-errors]
- (fn [[json errors]]
+ :<- [:statements-upload/analyzed?]
+ (fn [[json errors analyzed?]]
    {:json (or json "")
     :errors errors
-    :status (if (seq errors) :error :valid)}))
+    :status (cond (not analyzed?) :loading
+                  (seq errors) :error
+                  :else :valid)}))
 
 (reg-sub
  :statements-upload/analyzed?

src/com/yetanalytics/lrs_admin_ui/views/browser.cljs

@@ -270,6 +270,8 @@
        [:div
         [json-file-picker]
         [:br]
+        [:h5 {:class "content-title"}
+         "Manual Statement Entry"]
         [manual-json-editor {:buffer buffer
                              :set-json #(dispatch [:statements-upload/set-editor-contents %])}]
         [:br]
@@ -288,7 +290,7 @@
                                    " "
                                    (get % "event"))}
                       {:name @(subscribe [:lang/get :statements-upload.event-log.header.duration])
-                       :selector #(str (get % "duration"))}
+                       :selector #(str (get % "duration") " ms")}
                       {:name @(subscribe [:lang/get :statements-upload.event-log.header.timestamp])
                        :selector #(time/ms->local (get % "timestamp"))}]
                 data   events

src/com/yetanalytics/lrs_admin_ui/views/form/editor.cljs

@@ -143,25 +143,27 @@
     (fn []
       (let [{:keys [status errors]} @buffer]
         [:div {:class "validation-display-wrapper"}
-         (if (= :valid status)
-           [v/validation-static-display
-            status
-            "Valid"]
-           ;; Error or Warning
-           (let [message (format-error-message errors status)
-                 dis-msg (format-error-details-message status)
-                 display [v/validation-item-display
-                          status
-                          dis-msg
-                          display-ref
-                          :message
-                          error-details-display
-                          errors]]
-             [v/validation-display
-              status
-              message
-              display-ref
-              display]))]))))
+         (case status
+           :valid      [v/validation-static-display
+                        status
+                        "Valid"]
+           :loading [v/validation-static-display
+                        status
+                        "Validating..."]
+           :error (let [message (format-error-message errors status)
+                        dis-msg (format-error-details-message status)
+                        display [v/validation-item-display
+                                 status
+                                 dis-msg
+                                 display-ref
+                                 :message
+                                 error-details-display
+                                 errors]]
+                    [v/validation-display
+                     status
+                     message
+                     display-ref
+                     display]))]))))
 
 (defn manual-json-editor
   "Create a JSON CodeMirror editor similar to buffered-json-editor
@@ -175,7 +177,7 @@
   [{:keys [buffer
            set-json]}]
   (let [{:keys [json]} @buffer]
-    [:div
+    [:div.json-editor
      (when (not (clojure.string/blank? json))
        [raw-text-upload-validation-display
         buffer])