spark joy

Author: invaliduser

src/com/yetanalytics/lrs_admin_ui/db.cljs

@@ -191,15 +191,12 @@
   (s/coll-of (s/keys :req-un [:statements-upload-error/message])))
 
 (s/def ::statements-upload-manual-errors
-  (s/keys :req-un [:statements-upload/xapi
-                   :statements-upload/json]))
+  (s/keys :req-un [:statements-upload-error/xapi
+                   :statements-upload-error/json]))
 
 (s/def ::statements-upload-file
 (s/nilable #(instance? js/File %)))
 
-(s/def ::statements-upload-file-name
-  (s/nilable string?))
-
 (s/def ::statements-upload-editor-contents string?)
 
 (s/def ::statements-upload-analyzed? boolean?)
@@ -289,7 +286,7 @@
                           ::statements-upload-manual-errors
                           ::statements-upload-editor-contents
                           ::statements-upload-analyzed?
-                          ::statements-upload-file-name
+                          ::statements-upload-file
                           ::dialog-ref
                           ::dialog-data
                           ::no-val?

src/com/yetanalytics/lrs_admin_ui/handlers.cljs

@@ -701,8 +701,6 @@
        :else {:fx [[:dispatch [:statements-upload/set-editor-contents text]]]
               :db (-> db (assoc ::db/statements-upload-file
                                 file
-                                ::db/statements-upload-filename
-                                (.-name file)
                                 ::db/statements-upload-statements-count
                                 (if json-errors
                                   0
@@ -714,7 +712,7 @@
  :statements-upload/manual-upload-click
  (fn [{{[credential] ::db/credentials
         text         ::db/statements-upload-editor-contents
-        :as         db} :db :as _cofx} [_event-name]]
+        :as         _db} :db :as _cofx} [_event-name]]
    (if credential
      (let [parsed  (try (.parse js/JSON text)
                         (catch :default _e nil))
@@ -778,11 +776,8 @@
 
 (re-frame/reg-event-fx
  :statements-upload/error-handler
- (fn [{{file ::db/statements-upload-file
-        :as db} :db}
-      [_ result]]
-   (let [
-         precursor (str "Failed to upload statements: ")
+ (fn [{db :db :as _cofx} [_ result]]
+   (let [precursor "Failed to upload statements: "
          msg         (cond (#{0 -1} (:status result))
                            "Couldn't reach server"
                            :else
@@ -804,8 +799,8 @@
  :statements-upload/set-editor-contents
  (fn [{db :db
        :as _cofx} [_ text]]
-   (let [json-errors (try (do (js/JSON.parse text)
-                              nil)
+   (let [json-errors (try (js/JSON.parse text)
+                          nil
                           (catch js/Error e
                             [{:message "Invalid JSON Syntax"
                               :details (str e)}]))]

src/com/yetanalytics/lrs_admin_ui/subs.cljs

@@ -7,6 +7,7 @@
             [com.yetanalytics.lrs-admin-ui.spec.csv-download]
             [com.yetanalytics.lrs-admin-ui.spec.reaction-edit]
             [clojure.spec.alpha :as s :include-macros true]
+            [clojure.string]
             [xapi-schema.spec :as xs]))
 
 (reg-sub

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

@@ -11,7 +11,7 @@
    [com.yetanalytics.lrs-admin-ui.views.util.json :refer [json-viewer]]
    [com.yetanalytics.lrs-admin-ui.views.util.table :refer [data-table]]
    [com.yetanalytics.lrs-admin-ui.views.util.langmap :refer [langmap]]
-   [com.yetanalytics.lrs-admin-ui.views.form.editor :refer [editor manual-json-editor]]))
+   [com.yetanalytics.lrs-admin-ui.views.form.editor :refer [manual-json-editor]]))
 
 (defn actor-display
   "Actor IFI progressive resolution to a display string."

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

@@ -1,6 +1,7 @@
 (ns com.yetanalytics.lrs-admin-ui.views.form.editor
   (:require [re-codemirror.core :as cm]
             [clojure.data :as data]
+            [clojure.string]
             [reagent.core :as r]
             [com.yetanalytics.lrs-admin-ui.views.form.validation :as v]
             ["codemirror/mode/javascript/javascript"]
@@ -173,7 +174,7 @@
    "
   [{:keys [buffer
            set-json]}]
-  (let [{:keys [json status errors]} @buffer]
+  (let [{:keys [json]} @buffer]
     [:div
      (when (not (clojure.string/blank? json))
        [raw-text-upload-validation-display