📎 Update changelog.

CHANGES.md

@@ -1,8 +1,5 @@
 # CHANGELOG #
 
-
-
-
 ## :rocket: Next
 
 ### :sparkles: New features
@@ -13,6 +10,13 @@
 ### :heart: Community contributions by (Thank you!)
 
 
+## 1.7.3-alpha
+
+### :bug: Bugs fixed
+
+- Fix font uploading issue on Windows.
+
+
 ## 1.7.2-alpha
 
 ### :sparkles: New features

backend/src/app/rpc/mutations/fonts.clj

@@ -6,6 +6,7 @@
 
 (ns app.rpc.mutations.fonts
   (:require
+   [app.common.exceptions :as ex]
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -49,6 +50,7 @@
   (let [data    (media/run cfg {:cmd :generate-fonts :input data :rlimit :font})
         storage (media/configure-assets-storage storage conn)
 
+
         otf     (when-let [fdata (get data "font/otf")]
                   (sto/put-object storage {:content (sto/content fdata)
                                            :content-type "font/otf"}))
@@ -65,6 +67,13 @@
                   (sto/put-object storage {:content (sto/content fdata)
                                            :content-type "font/woff2"}))]
 
+    (when (and (nil? otf)
+               (nil? ttf)
+               (nil? woff1)
+               (nil? woff2))
+      (ex/raise :type :validation
+                :code :invalid-font-upload))
+
     (db/insert! conn :team-font-variant
                 {:id (uuid/next)
                  :team-id (:team-id params)

backend/src/app/rpc/mutations/projects.clj

@@ -117,11 +117,15 @@
 (s/def ::delete-project
   (s/keys :req-un [::id ::profile-id]))
 
+;; TODO: right now, we just don't allow delete default projects, in a
+;; future we need to ensure raise a correct exception signaling that
+;; this is not allowed.
+
 (sv/defmethod ::delete-project
   [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}]
   (db/with-atomic [conn pool]
     (proj/check-edition-permissions! conn profile-id id)
     (db/update! conn :project
                 {:deleted-at (dt/now)}
-                {:id id})
+                {:id id :is-default false})
     nil))

backend/src/app/rpc/mutations/teams.clj

@@ -125,6 +125,10 @@
 (s/def ::delete-team
   (s/keys :req-un [::profile-id ::id]))
 
+;; TODO: right now just don't allow delete default team, in future it
+;; should raise a speific exception for signal that this acction is
+;; not allowed.
+
 (sv/defmethod ::delete-team
   [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}]
   (db/with-atomic [conn pool]
@@ -135,7 +139,7 @@
 
       (db/update! conn :team
                   {:deleted-at (dt/now)}
-                  {:id id})
+                  {:id id :is-default false})
       nil)))
 
 

backend/src/app/rpc/queries/profile.clj

@@ -95,7 +95,8 @@
 (defn retrieve-profile-data-by-email
   [conn email]
   (try
-    (db/get-by-params conn :profile {:email (str/lower email)})
+    (db/get-by-params conn :profile {:email (str/lower email)
+                                     :deleted-at nil})
     (catch Exception _e)))
 
 ;; --- Attrs Helpers

frontend/src/app/main/data/fonts.cljs

@@ -111,10 +111,13 @@
                                            (:data content)})
                              (dissoc :content)))))))
 
-          (parse-mtype [mtype]
-            (case mtype
-              "application/vnd.oasis.opendocument.formula-template" "font/otf"
-              mtype))
+          (parse-mtype [ba]
+            (let [u8 (js/Uint8Array. ba 0 4)
+                  sg (areduce u8 i ret "" (str ret (if (zero? i) "" " ") (.toString (aget u8 i) 8)))]
+              (case sg
+                "117 124 124 117" "font/otf"
+                "0 1 0 0"         "font/ttf"
+                "167 117 106 106" "font/woff")))
 
           (parse-font [{:keys [data] :as params}]
             (try
@@ -128,7 +131,11 @@
                  (rx/map (fn [data]
                            {:data data
                             :name (.-name blob)
-                            :type (parse-mtype (.-type blob))}))))]
+                            :type (parse-mtype data)}))
+                 (rx/mapcat (fn [{:keys [type] :as font}]
+                              (if type
+                                (rx/of font)
+                                (rx/empty))))))]
 
     (->> (rx/from blobs)
          (rx/mapcat read-blob)

frontend/src/app/main/data/workspace.cljs

@@ -206,7 +206,6 @@
       (dissoc state
               :current-file-id
               :current-project-id
-              :current-team-id
               :workspace-data
               :workspace-editor-state
               :workspace-file

version.txt

@@ -1 +1 @@
-1.7.2-alpha
+1.7.3-alpha