From a180c33a32a6949202a04950a9ceb3b8effee40c Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 5 Sep 2024 09:26:22 +0200 Subject: [PATCH 1/7] :bug: Fix problem with SVG import --- CHANGES.md | 1 + frontend/src/app/main/data/workspace/svg_upload.cljs | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2667f4c75..a09d96f2a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -76,6 +76,7 @@ - Fix fill collapsed options [Taiga #8351](https://tree.taiga.io/project/penpot/issue/8351) - Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353) - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) +- Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888) ## 2.1.5 diff --git a/frontend/src/app/main/data/workspace/svg_upload.cljs b/frontend/src/app/main/data/workspace/svg_upload.cljs index 169e2dd3e..6f04e7c66 100644 --- a/frontend/src/app/main/data/workspace/svg_upload.cljs +++ b/frontend/src/app/main/data/workspace/svg_upload.cljs @@ -73,7 +73,6 @@ (let [id (d/nilv id (uuid/next)) page-id (:current-page-id state) objects (wsh/lookup-page-objects state page-id) - frame-id (ctst/top-nested-frame objects position) selected (if ignore-selection? #{} (wsh/lookup-selected state)) base (cfh/get-base-shape objects selected) @@ -81,9 +80,16 @@ selected-frame? (and (= 1 (count selected)) (= :frame (dm/get-in objects [selected-id :type]))) + base-id (:parent-id base) + + frame-id (if (or selected-frame? (empty? selected) + (not= :frame (dm/get-in objects [base-id :type]))) + (ctst/top-nested-frame objects position) + base-id) + parent-id (if (or selected-frame? (empty? selected)) frame-id - (:parent-id base)) + base-id) [new-shape new-children] (csvg.shapes-builder/create-svg-shapes id svg-data position objects frame-id parent-id selected true) From 6a161267ba8a3683fb523252cbba3c9b7b37a16d Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 5 Sep 2024 10:48:00 +0200 Subject: [PATCH 2/7] :bug: Fix problem with overlay positions in viewer --- CHANGES.md | 1 + frontend/src/app/main/ui/viewer/shapes.cljs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a09d96f2a..619de08d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -77,6 +77,7 @@ - Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353) - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) - Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888) +- Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464) ## 2.1.5 diff --git a/frontend/src/app/main/ui/viewer/shapes.cljs b/frontend/src/app/main/ui/viewer/shapes.cljs index 833a9fd79..0f9aec6bf 100644 --- a/frontend/src/app/main/ui/viewer/shapes.cljs +++ b/frontend/src/app/main/ui/viewer/shapes.cljs @@ -427,7 +427,8 @@ (let [childs (mapv #(get objects %) (:shapes (unchecked-get props "shape"))) props (obj/merge! #js {} props #js {:childs childs - :objects objects})] + :objects objects + :all-objects all-objects})] (when (not-empty childs) [:> group-wrapper props]))))) From caf78a6b4d91f826a68354c305beb38753088254 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 5 Sep 2024 11:50:16 +0200 Subject: [PATCH 3/7] :bug: Fix layer panel overflowing --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/sidebar/sitemap.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 619de08d6..ebd9aa992 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -78,6 +78,7 @@ - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) - Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888) - Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464) +- Fix layer panel overflowing [Taiga #8665](https://tree.taiga.io/project/penpot/issue/8665) ## 2.1.5 diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss b/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss index cd12ae572..c24801d0f 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss @@ -55,6 +55,7 @@ overflow-x: hidden; overflow-y: overlay; scrollbar-gutter: stable; + max-width: var(--width); } .pages-list { From b15b394c65112faf9cc0cad5a643f771530049bc Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 5 Sep 2024 14:41:09 +0200 Subject: [PATCH 4/7] :bug: Fix problem when creating a component instance from grid layout --- CHANGES.md | 1 + common/src/app/common/types/shape/layout.cljc | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ebd9aa992..39f0a47a3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -79,6 +79,7 @@ - Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888) - Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464) - Fix layer panel overflowing [Taiga #8665](https://tree.taiga.io/project/penpot/issue/8665) +- Fix problem when creating a component instance from grid layout [Github #4881](https://github.com/penpot/penpot/issues/4881) ## 2.1.5 diff --git a/common/src/app/common/types/shape/layout.cljc b/common/src/app/common/types/shape/layout.cljc index a999145cb..9a71931cc 100644 --- a/common/src/app/common/types/shape/layout.cljc +++ b/common/src/app/common/types/shape/layout.cljc @@ -1622,13 +1622,17 @@ (defn remap-grid-cells "Remaps the shapes ids inside the cells" [shape ids-map] - (let [do-remap-cells + (let [remap-shape + (fn [id] + (get ids-map id id)) + + remap-cell (fn [cell] (-> cell - (update :shapes #(into [] (keep ids-map) %)))) + (update :shapes #(into [] (keep remap-shape) %)))) shape (-> shape - (update :layout-grid-cells update-vals do-remap-cells))] + (update :layout-grid-cells update-vals remap-cell))] shape)) (defn merge-cells From 03040ed40beae974493ae3ddbc31080011d48ef6 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 6 Sep 2024 11:02:02 +0200 Subject: [PATCH 5/7] :bug: Fix problem when dismissing shared library update --- CHANGES.md | 1 + backend/src/app/rpc/commands/files.clj | 2 +- backend/src/app/util/time.clj | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 39f0a47a3..8943da36c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -80,6 +80,7 @@ - Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464) - Fix layer panel overflowing [Taiga #8665](https://tree.taiga.io/project/penpot/issue/8665) - Fix problem when creating a component instance from grid layout [Github #4881](https://github.com/penpot/penpot/issues/4881) +- Fix problem when dismissing shared library update [Taiga #8669](https://tree.taiga.io/project/penpot/issue/8669) ## 2.1.5 diff --git a/backend/src/app/rpc/commands/files.clj b/backend/src/app/rpc/commands/files.clj index d3317ac2b..79381d34f 100644 --- a/backend/src/app/rpc/commands/files.clj +++ b/backend/src/app/rpc/commands/files.clj @@ -1058,7 +1058,7 @@ (def ^:private schema:ignore-file-library-sync-status [:map {:title "ignore-file-library-sync-status"} [:file-id ::sm/uuid] - [:date ::dt/duration]]) + [:date ::dt/instant]]) ;; TODO: improve naming (sv/defmethod ::ignore-file-library-sync-status diff --git a/backend/src/app/util/time.clj b/backend/src/app/util/time.clj index 6d40df6aa..c1526bfb4 100644 --- a/backend/src/app/util/time.clj +++ b/backend/src/app/util/time.clj @@ -141,21 +141,22 @@ ;; --- INSTANT +(defn instant? + [v] + (instance? Instant v)) + (defn instant ([s] - (if (int? s) - (Instant/ofEpochMilli s) - (Instant/parse s))) + (cond + (instant? s) s + (int? s) (Instant/ofEpochMilli s) + :else (Instant/parse s))) ([s fmt] (case fmt :rfc1123 (Instant/from (.parse DateTimeFormatter/RFC_1123_DATE_TIME ^String s)) :iso (Instant/from (.parse DateTimeFormatter/ISO_INSTANT ^String s)) :iso8601 (Instant/from (.parse DateTimeFormatter/ISO_INSTANT ^String s))))) -(defn instant? - [v] - (instance? Instant v)) - (defn is-after? [da db] (.isAfter ^Instant da ^Instant db)) From d583661e589ea3b28d10712e888bba5a879f9fed Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 6 Sep 2024 12:29:48 +0200 Subject: [PATCH 6/7] :bug: Fix storybook build related to commonjs to esm module conversion issue --- frontend/package.json | 1 + frontend/src/app/util/functions.cljs | 29 ++++++++++++++++++++++++++++ frontend/src/app/util/storage.cljs | 5 ++--- frontend/yarn.lock | 1 + 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 frontend/src/app/util/functions.cljs diff --git a/frontend/package.json b/frontend/package.json index 67bb13612..1612361ab 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -96,6 +96,7 @@ "highlight.js": "^11.9.0", "js-beautify": "^1.15.1", "jszip": "^3.10.1", + "lodash": "^4.17.21", "luxon": "^3.4.4", "mousetrap": "^1.6.5", "opentype.js": "^1.3.4", diff --git a/frontend/src/app/util/functions.cljs b/frontend/src/app/util/functions.cljs new file mode 100644 index 000000000..fa7818ea7 --- /dev/null +++ b/frontend/src/app/util/functions.cljs @@ -0,0 +1,29 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; Copyright (c) KALEIDOS INC + +(ns app.util.functions + "A functions helpers" + (:require + ["lodash/debounce.js" :as lodash-debounce])) + +;; NOTE: this is needed because depending on the type of the build and +;; target execution evironment (browser, esm), the real export can be +;; different. All this issue is about the commonjs and esm +;; interop/conversion, because the js ecosystem decided that is should +;; work this way. +;; +;; In this concrete case, lodash exposes commonjs module which works +;; ok on browser build but for ESM build it is converted in the best +;; effort to esm module, exporting the module.exports as the default +;; property. This is why on ESM builds we need to look on .-default +;; property. +(def ^:private ext-debounce + (or (.-default lodash-debounce) + lodash-debounce)) + +(defn debounce + [f timeout] + (ext-debounce f timeout #{:leading false :trailing true})) diff --git a/frontend/src/app/util/storage.cljs b/frontend/src/app/util/storage.cljs index 80fd72f6e..df08e0eac 100644 --- a/frontend/src/app/util/storage.cljs +++ b/frontend/src/app/util/storage.cljs @@ -6,9 +6,9 @@ (ns app.util.storage (:require - ["lodash/debounce" :as ldebounce] [app.common.exceptions :as ex] [app.common.transit :as t] + [app.util.functions :as fns] [app.util.globals :as g] [cuerdas.core :as str])) @@ -76,8 +76,7 @@ (set! latest-state curr-state))))) (defonce on-change - (ldebounce on-change* 2000 #js {:leading false :trailing true})) - + (fns/debounce on-change* 2000)) (defonce storage (atom latest-state)) (add-watch storage :persistence diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 24131d15b..43a1f3c3e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -6647,6 +6647,7 @@ __metadata: js-beautify: "npm:^1.15.1" jsdom: "npm:^24.1.0" jszip: "npm:^3.10.1" + lodash: "npm:^4.17.21" luxon: "npm:^3.4.4" map-stream: "npm:0.0.7" marked: "npm:^12.0.2" From 3f34aa92fa46f7d785ff176e305c972f9a25e7be Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 5 Sep 2024 15:28:24 +0200 Subject: [PATCH 7/7] :sparkles: Add support for optional human challenge --- .../resources/templates/challenge.mustache | 18 ++++++++++++++++++ frontend/scripts/_helpers.js | 7 +++++++ frontend/src/app/main/data/users.cljs | 13 ++++++++++++- frontend/src/app/main/repo.cljs | 10 +++++++++- frontend/src/app/util/router.cljs | 16 ++++++++++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 frontend/resources/templates/challenge.mustache diff --git a/frontend/resources/templates/challenge.mustache b/frontend/resources/templates/challenge.mustache new file mode 100644 index 000000000..16bba9b6a --- /dev/null +++ b/frontend/resources/templates/challenge.mustache @@ -0,0 +1,18 @@ + + + + + Penpot - Challenge + + + + + + + diff --git a/frontend/scripts/_helpers.js b/frontend/scripts/_helpers.js index 0e284111d..6e2bd2765 100644 --- a/frontend/scripts/_helpers.js +++ b/frontend/scripts/_helpers.js @@ -333,6 +333,13 @@ async function generateTemplates() { await fs.writeFile("./resources/public/index.html", content); + content = await renderTemplate( + "resources/templates/challenge.mustache", + {}, + partials, + ); + await fs.writeFile("./resources/public/challenge.html", content); + content = await renderTemplate("resources/templates/preview-body.mustache", { manifest: manifest, translations: JSON.stringify(translations), diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs index 375119931..bd27cddb8 100644 --- a/frontend/src/app/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -137,13 +137,24 @@ (when (not= previous-email email) (set-current-team! nil))))))) +(defn- on-fetch-profile-exception + [cause] + (let [data (ex-data cause)] + (if (and (= :authorization (:type data)) + (= :challenge-required (:code data))) + (let [path (rt/get-current-path) + href (str "/challenge.html?redirect=" path)] + (rx/of (rt/nav-raw href))) + (rx/throw cause)))) + (defn fetch-profile [] (ptk/reify ::fetch-profile ptk/WatchEvent (watch [_ _ _] (->> (rp/cmd! :get-profile) - (rx/map profile-fetched))))) + (rx/map profile-fetched) + (rx/catch on-fetch-profile-exception))))) ;; --- EVENT: login diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs index b19edf933..77d4de012 100644 --- a/frontend/src/app/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -17,7 +17,7 @@ [cuerdas.core :as str])) (defn handle-response - [{:keys [status body] :as response}] + [{:keys [status body headers] :as response}] (cond (= 204 status) ;; We need to send "something" so the streams listening downstream can act @@ -40,6 +40,13 @@ {:type :validation :code :request-body-too-large})) + (and (= status 403) + (or (= "cloudflare" (get headers "server")) + (= "challenge" (get headers "cf-mitigated")))) + (rx/throw (ex-info "http error" + {:type :authorization + :code :challenge-required})) + (and (>= status 400) (map? body)) (rx/throw (ex-info "http error" body)) @@ -48,6 +55,7 @@ (ex-info "http error" {:type :unexpected-error :status status + :headers headers :data body})))) (def default-options diff --git a/frontend/src/app/util/router.cljs b/frontend/src/app/util/router.cljs index c4d541cfd..cb17f1a80 100644 --- a/frontend/src/app/util/router.cljs +++ b/frontend/src/app/util/router.cljs @@ -13,8 +13,10 @@ [app.main.data.events :as ev] [app.util.browser-history :as bhistory] [app.util.dom :as dom] + [app.util.globals :as globals] [app.util.timers :as ts] [beicon.v2.core :as rx] + [cuerdas.core :as str] [goog.events :as e] [potok.v2.core :as ptk] [reitit.core :as r])) @@ -143,6 +145,20 @@ (= (.-hostname location) (:host referrer))) (nav-back)))) +(defn nav-raw + [href] + (ptk/reify ::nav-raw + ptk/EffectEvent + (effect [_ _ _] + (set! (.-href globals/location) href)))) + +(defn get-current-path + [] + (let [hash (.-hash globals/location)] + (if (str/starts-with? hash "#") + (subs hash 1) + hash))) + ;; --- History API (defn initialize-history