diff --git a/.github/workflows/plugins-deploy-api-doc.yml b/.github/workflows/plugins-deploy-api-doc.yml index 4d22311892..0d963cdfe6 100644 --- a/.github/workflows/plugins-deploy-api-doc.yml +++ b/.github/workflows/plugins-deploy-api-doc.yml @@ -51,7 +51,7 @@ jobs: uses: pnpm/setup@731dfb6463bbd11c11fd0ee11fe00ed0e36d48a1 # v3.2.0 with: working-directory: plugins - runtime: node@26.13.1 + runtime: node@24.22.3 install: false - name: Install deps diff --git a/.github/workflows/plugins-deploy-styles-doc.yml b/.github/workflows/plugins-deploy-styles-doc.yml index 8fd4157a41..60ffe05038 100644 --- a/.github/workflows/plugins-deploy-styles-doc.yml +++ b/.github/workflows/plugins-deploy-styles-doc.yml @@ -49,7 +49,7 @@ jobs: uses: pnpm/setup@731dfb6463bbd11c11fd0ee11fe00ed0e36d48a1 # v3.2.0 with: working-directory: plugins - runtime: node@26.13.1 + runtime: node@24.22.3 install: false - name: Install deps diff --git a/.serena/memories/backend/testing.md b/.serena/memories/backend/testing.md index 61c92d8fed..b761504a87 100644 --- a/.serena/memories/backend/testing.md +++ b/.serena/memories/backend/testing.md @@ -33,4 +33,4 @@ JVM `clojure.test` (kaocha runner) under `backend/test/backend_tests/`. `worker-config` can talk to a different Redis key prefix than a cfg the test builds itself. The symptom is a component that silently does nothing locally and races in CI (which sets no `PENPOT_TENANT`). -- `backend-tests.helpers` has `metrics-stub` (a metrics instance with no collectors, where every `run!` is a no-op), `init-climit` (a concurrency limiter built from an inline config map, with an optional second argument for the metrics instance to publish to) and `with-climit`, the macro that builds one, runs the body and halts it. `init-climit` starts the republisher daemon thread, so a test that builds a limiter without halting it leaks that thread for the rest of the JVM run: use `with-climit`. Log lines are capturable with `add-watch` on `app.common.logging/log-record` (it holds the last record; the watcher sees every one, but only of the levels the logger has enabled: a line the app writes at TRACE never gets there). +- `backend-tests.helpers` has `metrics-stub` (a metrics instance with no collectors, where every `run!` is a no-op), `init-climit` (a concurrency limiter built from an inline config map, with an optional second argument for the metrics instance to publish to) and `with-climit`, the macro that builds one, runs the body and halts it. `init-climit` starts the republisher daemon thread, so a test that builds a limiter without halting it leaks that thread for the rest of the JVM run: use `with-climit`. Log lines are capturable with `add-watch` on `app.common.logging/log-record` (it holds the last record; the watcher sees every one, but only of the levels the logger has enabled: a line the app writes at TRACE never gets there). The logger swaps the record on an executor thread, after the call that logged it returns: keep the watch installed until the record arrives (poll for it) and only then remove it, or the record lands on nobody under load. diff --git a/.serena/memories/frontend/testing.md b/.serena/memories/frontend/testing.md index 45e6bff9e4..e568292436 100644 --- a/.serena/memories/frontend/testing.md +++ b/.serena/memories/frontend/testing.md @@ -46,6 +46,7 @@ To assert over emitted event sequences, observe termination: subscribe through ` - The `:esm` test build cannot load the CommonJS `sax` module behind `tubax`, so SVG parsing fails in tests (`dwm/valid-svg-string?` answers false, `dwm/svg->clj` errors): mock both with the parsed data. - A hook-order violation in a mounted component reaches neither the root's `onUncaughtError`/`onCaughtError`/`onRecoverableError` nor the markup: React logs an internal error to `console.error` and recovers, so the callbacks stay empty and the tree repaints. Assert on a captured `console.error` too. It only fires when a render *adds* hooks (nil → uuid); a render that calls none at all slips through React's bookkeeping, so the regression test needs the "hooks arrive" direction. `frontend-tests.ui.team-container-test` does both, with a jsdom document. - `beicon.v2.core` has no `never`. A stream that must **not emit** is `(rx/empty)`: it completes at once, which is enough for `merge`, `filter` and `take` where only the emission matters. A stream that must **stay open** is a `(rx/subject)` nobody pushes to; `rx/empty` would complete the flow behind it. An undeclared `rx/never` compiles to an undefined var and the test dies as a rejected body, which `cljs.test` reports as a test with zero assertions instead of a failure. +- `set!` mocks are global and outlive the fixture, so a flow another module left running (a store's pending timer) can still reach the mocked transport mid-test; `with-persistence` records every command for that reason. Filter to the commands your layer issues — persistence only sends `update-file` — before counting or asserting emptiness, and never let a stray call release a `wait-for` on one. From `frontend/`: - Full unit test run (always builds, suppressed output): `pnpm run test:quiet`. diff --git a/.serena/memories/workflow/docker-images.md b/.serena/memories/workflow/docker-images.md index 28d42bc9e7..3415c8247d 100644 --- a/.serena/memories/workflow/docker-images.md +++ b/.serena/memories/workflow/docker-images.md @@ -2,5 +2,6 @@ Node and pnpm pins: `mem:workflow/updating-node` and `mem:workflow/updating-pnpm`. Only the parts the Dockerfiles cannot show: -- JDK: the image tracks a non-LTS line, so there is no minor to pick — the last build of the line is the ceiling; moving line is a major and needs a real build to validate the `jlink` module list. +- JDK: two pins that move together — `docker/devenv/Dockerfile` (`setup-jvm` stage, full JDK) and `docker/images/Dockerfile.backend` (JDK + `jlink` runtime). Same build, same sums in both. They compile and run the same backend: `manage.sh` builds the bundle inside the devenv image (`build-backend-bundle` → `build "backend"`) and `backend/scripts/run.template.sh` starts the runtime with `--enable-preview`, which requires the runtime major to match the compiler major. A runtime line behind the compiler line is a silent trap. +- JDK line: tracks a non-LTS line, so there is no minor to pick — the last build of the line is the ceiling; moving line is a major and needs a real build to validate the `jlink` module list (`--add-modules` in `Dockerfile.backend`). JDK 27 keeps all of them; check with `bin/jlink --add-modules ` against the downloaded JDK before bumping. Source of the URL and both sums: the Azul metadata API (`api.azul.com/metadata/v1/zulu/packages/?java_version=&os=linux&arch=&java_package_type=jdk&archive_type=tar.gz&latest=true&release_status=ga&availability_types=CA`), then confirm the sums by downloading the tarball and running `sha256sum`. - ImageMagick: publish `penpotapp/imagemagick:` **before** bumping the `COPY --from` refs in the backend, exporter and devenv Dockerfiles; otherwise both builds break on the missing tag. diff --git a/.serena/memories/workflow/updating-node.md b/.serena/memories/workflow/updating-node.md index f8b803d9b5..b50aba5539 100644 --- a/.serena/memories/workflow/updating-node.md +++ b/.serena/memories/workflow/updating-node.md @@ -19,6 +19,7 @@ No single source of truth: nothing reads `.nvmrc` at build time, and the version - Renovate also opens these bumps, on `renovate-*` branches and with its config living outside this repo; a manual bump and Renovate's must not diverge on any of the six sites. - A backport merge can deliver a newer Node into `docker/` and the plugins-deploy workflows while main's `.nvmrc` stays behind, because main receives partial backports of `.github/` and `docker/` from develop. Merging main into staging therefore conflicts on the pin lines: take main's set and finish the bump (`.nvmrc` plus the `packageManager` fields via `mem:workflow/updating-pnpm`), or the six sites drift. - The newer version wins in both directions. A maintenance→main merge (`main-2.18.x` into `main`) can carry the newer Node while `.nvmrc` and the `packageManager` fields stay on the older pair; then adopt the newer set and finish the bump on all six sites plus the 35 `packageManager` fields. +- Node stays on the 24.x line even when the rest of `.github/` moves on: `99db795966` (`update GitHub Actions`) took the two `plugins-deploy-*` `runtime:` pins to `node@26.13.1` on develop while `.nvmrc` stayed on `v24.22.3`. The project keeps every site on the `.nvmrc` value; resolve that conflict back to the 24.x pin instead of taking develop's. - Both workflows must stay valid YAML. The `python3` in the devenv has no `yaml` module, so validate with `uv run --with pyyaml python3 -c ...` instead of a bare import. ## Verification diff --git a/README.md b/README.md index ffd702aa31..831eaf8d8a 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,6 @@ Managed with Taiga.io - - Gitpod ready-to-code -

diff --git a/backend/test/backend_tests/rpc_file_test.clj b/backend/test/backend_tests/rpc_file_test.clj index e45794a739..6019839a59 100644 --- a/backend/test/backend_tests/rpc_file_test.clj +++ b/backend/test/backend_tests/rpc_file_test.clj @@ -13,6 +13,7 @@ [app.common.pprint :as pp] [app.common.thumbnails :as thc] [app.common.time :as ct] + [app.common.types.page :as ctp] [app.common.types.shape :as cts] [app.common.types.tokens-lib :as ctob] [app.common.types.tokens-status :as ctos] @@ -3433,3 +3434,35 @@ (t/is (= (into #{} (map :id) (:result miss)) (into #{} (map :id) (:result hit)))) (t/is (every? #(not (contains? % :migrations)) (:result hit)))))))) + +(t/deftest add-page-rejects-an-invalid-shape + ;; Duplicate page and the undo of a page deletion send the whole page as + ;; the client holds it. A tab that loaded the file before a migration + ;; ran holds the old format, here camelCase svg attrs (#13107), and the + ;; page must not reach the file: the next migrating read would reject + ;; the whole file. + (let [profile (th/create-profile* 1 {:is-active true}) + file (th/create-file* 1 {:profile-id (:id profile) + :project-id (:default-project-id profile) + :is-shared false}) + page-id (uuid/next) + shape-id (uuid/next) + shape (cts/setup-shape {:id shape-id :type :rect :name "rect" + :x 0 :y 0 :width 10 :height 10 + :parent-id uuid/zero :frame-id uuid/zero + :svg-attrs {:fillRule "nonzero"}}) + page (-> (ctp/make-empty-page {:id page-id :name "Copy"}) + (assoc-in [:objects shape-id] shape) + (update-in [:objects uuid/zero :shapes] (fnil conj []) shape-id)) + out (th/command! {::th/type :update-file + ::rpc/profile-id (:id profile) + :id (:id file) + :session-id (uuid/random) + :revn 0 + :vern 0 + :features cfeat/supported-features + :changes [{:type :add-page :id page-id :page page}]}) + stored (bfc/get-file th/*system* (:id file) :migrate? false :realize? true)] + (t/is (th/ex-of-type? (:error out) :assertion)) + (t/is (th/ex-of-code? (:error out) :data-validation)) + (t/is (not (contains? (get-in stored [:data :pages-index]) page-id))))) diff --git a/backend/test/backend_tests/rpc_file_update_test.clj b/backend/test/backend_tests/rpc_file_update_test.clj index c5a8ba9b6d..34e4fe8b00 100644 --- a/backend/test/backend_tests/rpc_file_update_test.clj +++ b/backend/test/backend_tests/rpc_file_update_test.clj @@ -282,18 +282,20 @@ (defn- update-file-logged "Updates the file and returns the response in `:out` and, in `:rejected`, - the props of the log record of the rejection, if any." + the props of the log record of the rejection, if any. Keeps the watch + until the record arrives: the logger writes it on another thread, so it + can land after the update returns." [ctx params] - (let [records (atom []) - out (try - (add-watch l/log-record ::capture - (fn [_ _ _ record] (swap! records conj record))) - (update-file ctx params) - (finally - (remove-watch l/log-record ::capture)))] - {:out out - :rejected (some-> (wait-for-record records "update-file commit rejected") - ::l/props)})) + (let [records (atom [])] + (try + (add-watch l/log-record ::capture + (fn [_ _ _ record] (swap! records conj record))) + (let [out (update-file ctx params)] + {:out out + :rejected (some-> (wait-for-record records "update-file commit rejected") + ::l/props)}) + (finally + (remove-watch l/log-record ::capture))))) (t/deftest bisects-the-commits-to-find-the-invalid-one (let [{:keys [page-id] :as ctx} (create-file) diff --git a/common/src/app/common/files/changes.cljc b/common/src/app/common/files/changes.cljc index b2b0e6de60..b81764e580 100644 --- a/common/src/app/common/files/changes.cljc +++ b/common/src/app/common/files/changes.cljc @@ -930,6 +930,13 @@ (when (and id name page) (ex/raise :type :conflict :hint "id+name or page should be provided, never both")) + + ;; NOTE: we only perform hard validation on backend. The page arrives + ;; whole (duplicate page, undo of a page deletion), as the client holds + ;; it, so each of its shapes is validated as `:add-obj` validates one. + #?(:clj (doseq [shape (vals (:objects page))] + (validate-shape shape (:id page)))) + (let [page (if (and (string? name) (uuid? id)) (ctp/make-empty-page {:id id :name name}) page)] diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc index 70e78627af..b930a88385 100644 --- a/common/src/app/common/files/migrations.cljc +++ b/common/src/app/common/files/migrations.cljc @@ -2345,19 +2345,22 @@ (update :pages-index d/update-vals update-container) (d/update-when :components d/update-vals update-container)))) -(defmethod migrate-data "0035-fix-shape-svg-attrs-and-defs" +(defmethod migrate-data "0037-fix-shape-svg-attrs-and-defs" ;; Stored svg attribute keys are kebab-case (issue #11947): the v3 reader ;; already outputs kebab and birth normalizes any outside spelling, so ;; export/import converges to the same state. Old birth and the cleaner ;; era stored camelCase React prop names instead, which the reader - ;; kebab-ized on import beyond repair. Convert once, with the same - ;; birth transforms: `:svg-attrs` and `:svg-defs` node attrs go through + ;; kebab-ized on import beyond repair. Convert with the same birth + ;; transforms: `:svg-attrs` and `:svg-defs` node attrs go through ;; the whitelist+kebab transform (unknown attrs drop, same as birth), ;; while svg-raw `:content` attrs are kebab-ized spelling-only (unknown ;; keys kept: the sidebar reads keys outside the whitelist). Kebab ;; input passes through unchanged, so re-running is safe. This replaces - ;; "0021-fix-shape-svg-attrs" (id withdrawn from `available-migrations` - ;; below): files that recorded it migrate again through this one. + ;; "0021-fix-shape-svg-attrs" and "0035-fix-shape-svg-attrs-and-defs" + ;; (ids withdrawn from `available-migrations` below): files that + ;; recorded either migrate again through this one. 0035 was withdrawn + ;; because a client that loaded a file before 0035 ran could still save + ;; camelCase keys into it afterwards (#13107). ;; Node tags in defs and svg-raw content are stored as keywords; files ;; that hold them as strings get them converted here, since the closed ;; node schemas reject strings. `:svg-transform` held as a plain map @@ -2502,5 +2505,5 @@ "0033-normalize-main-instance-names" "0034-fix-path-content-offset" "0035-fix-dangling-children" - "0035-fix-shape-svg-attrs-and-defs" - "0036-clear-nil-keys-in-objects"])) + "0036-clear-nil-keys-in-objects" + "0037-fix-shape-svg-attrs-and-defs"])) diff --git a/common/src/app/common/svg.cljc b/common/src/app/common/svg.cljc index 15a3bff12d..7349e7e1d8 100644 --- a/common/src/app/common/svg.cljc +++ b/common/src/app/common/svg.cljc @@ -673,15 +673,32 @@ {} attrs))) +(defn- drop-non-scalar-values + "Removes the entries whose value is not a string, a number or a + boolean: the stored schema admits nothing else." + [attrs] + (reduce-kv (fn [res k v] + (if (or (string? v) (number? v) (boolean? v)) + res + (dissoc res k))) + attrs + attrs)) + (defn attrs->kebab-props "Like `attrs->props` (same whitelist, trim and `:style` parsing) but with kebab-case keys, the stored convention for `:svg-attrs` and - `:svg-defs` node attrs. Kebab is a fixed point: running it twice - returns the same map." + `:svg-defs` node attrs. Values that are not scalars, at the top level + or inside `:style`, are dropped: files written by old versions hold + maps there, which no renderer can use and the closed schema rejects. + Kebab is a fixed point: running it twice returns the same map." [attrs] - (-> attrs - (attrs->props) - (d/kebab-keys))) + (let [props (attrs->props attrs) + style (some-> (:style props) (drop-non-scalar-values) (not-empty))] + (-> props + (dissoc :style) + (drop-non-scalar-values) + (cond-> (some? style) (assoc :style style)) + (d/kebab-keys)))) (defn- normalize-node-tree "Walks a svg node tree applying `attrs-fn` to every `:attrs` map. Tags diff --git a/common/test/common_tests/files_migrations_0035_test.cljc b/common/test/common_tests/files_migrations_0035_test.cljc index 350b669fed..c64ce69527 100644 --- a/common/test/common_tests/files_migrations_0035_test.cljc +++ b/common/test/common_tests/files_migrations_0035_test.cljc @@ -7,8 +7,6 @@ (ns common-tests.files-migrations-0035-test (:require [app.common.files.migrations :as cfm] - [app.common.geom.matrix :as gmt] - [app.common.geom.rect :as grc] [app.common.types.file :as ctf] [app.common.types.objects-map :as omap] [app.common.types.shape :as cts] @@ -189,308 +187,3 @@ (t/is (some? (get objects' frame-id)) "the frame that exists is kept")))) -;; ====================================================================== -;; 0035-fix-shape-svg-attrs-and-defs -;; Stored svg attribute keys are kebab-case (issue #11947). Old birth and -;; the cleaner era stored camelCase React prop names, which the v3 reader -;; kebab-ized on import beyond repair. This migration converts once, with -;; the same birth transforms: `:svg-attrs` and `:svg-defs` node attrs go -;; through the whitelist+kebab transform, svg-raw `:content` attrs are -;; kebab-ized spelling-only. It replaces "0021-fix-shape-svg-attrs" (id -;; withdrawn): files that recorded it migrate again through this one. -;; ====================================================================== - -(def ^:private migration-id - "0035-fix-shape-svg-attrs-and-defs") - -(defn- make-shape - [shape-id shape] - (assoc shape :id shape-id)) - -(defn- camel-shape - [shape-id] - (make-shape shape-id - {:type :rect - :svg-attrs {:fillRule "evenodd" - :stroke-width "2" - :stroke-style "dotted" - :data-foo "drop-me"}})) - -(defn- camel-defs - [] - {"g1" {:tag :linearGradient - :attrs {:id "g1" - :gradientUnits "userSpaceOnUse" - :xlink:href "#base" - :data-x "drop-me"} - :content [{:tag :stop - :attrs {:offset "0" - :stopColor "#ffffff"} - :content []}]}}) - -(t/deftest migration-0035-converts-camel-svg-attrs-to-kebab-in-pages - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (camel-shape shape-id)}}}} - data' (cfm/migrate-data data migration-id) - attrs (get-in data' [:pages-index page-id :objects shape-id :svg-attrs])] - (t/is (= "evenodd" (:fill-rule attrs))) - (t/is (= "2" (:stroke-width attrs))) - (t/is (= "dotted" (:stroke-style attrs)) "penpot-extra-attrs survive") - (t/is (not (contains? attrs :data-foo)) "unknown attrs are dropped") - (t/is (not (contains? attrs :fillRule)) "no camel keys survive"))) - -(t/deftest migration-0035-converts-camel-svg-attrs-to-kebab-in-components - (let [shape-id (uuid/next) - component-id (uuid/next) - data {:components - {component-id - {:objects - {shape-id (camel-shape shape-id)}}}} - data' (cfm/migrate-data data migration-id) - attrs (get-in data' [:components component-id :objects shape-id :svg-attrs])] - (t/is (= "evenodd" (:fill-rule attrs))) - (t/is (not (contains? attrs :fillRule)) "no camel keys survive"))) - -(t/deftest migration-0035-normalizes-def-node-attrs - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-defs (camel-defs)})}}}} - data' (cfm/migrate-data data migration-id) - grad (get-in data' [:pages-index page-id :objects shape-id :svg-defs "g1"])] - (t/is (= :linearGradient (:tag grad)) "tags are untouched") - (t/is (= "g1" (get-in grad [:attrs :id])) ":id survives") - (t/is (= "userSpaceOnUse" (get-in grad [:attrs :gradient-units]))) - (t/is (= "#base" (get-in grad [:attrs :xlink-href]))) - (t/is (not (contains? (:attrs grad) :data-x)) "unknown def attrs are dropped") - (t/is (= "#ffffff" (get-in grad [:content 0 :attrs :stop-color])) - "nested stops are normalized"))) - -(t/deftest migration-0035-kebabizes-content-spelling-only - (let [shape-id (uuid/next) - page-id (uuid/next) - raw-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :path - :content [{:marker "untouched"}]}) - raw-id (make-shape raw-id - {:type :svg-raw - :content {:tag :g - :attrs {:strokeWidth "2" - :data-foo "keep-me"} - :content [{:tag :path - :attrs {:strokeLinecap "round"} - :content []}]}})}}}} - data' (cfm/migrate-data data migration-id) - path (get-in data' [:pages-index page-id :objects shape-id]) - raw (get-in data' [:pages-index page-id :objects raw-id]) - content (:content raw)] - (t/is (= [{:marker "untouched"}] (:content path)) - "non-svg-raw content is untouched") - (t/is (= "2" (get-in content [:attrs :stroke-width]))) - (t/is (= "keep-me" (get-in content [:attrs :data-foo])) - "unknown content keys survive") - (t/is (= "round" (get-in content [:content 0 :attrs :stroke-linecap]))))) - -(defn- string-tag-defs - [] - {:a {:tag "mask" - :attrs {:id "a" :maskUnits "userSpaceOnUse"} - :content [{:tag "rect" - :attrs {:width "10" :height "10" :fill "#FFF"} - :content []}]}}) - -(defn- string-tag-content - [] - {:tag "g" - :attrs {} - :content [{:tag "text" - :attrs {:fontSize "12"} - :content ["Hi"]} - {:tag "style" - :attrs nil - :content [".a{fill:red}"]}]}) - -(t/deftest migration-0035-keywordizes-string-tags - (let [shape-id (uuid/next) - raw-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-defs (string-tag-defs)}) - raw-id (make-shape raw-id - {:type :svg-raw - :content (string-tag-content)})}}}} - data' (cfm/migrate-data data migration-id) - mask (get-in data' [:pages-index page-id :objects shape-id :svg-defs :a]) - content (get-in data' [:pages-index page-id :objects raw-id :content])] - (t/is (= :mask (:tag mask))) - (t/is (= :rect (get-in mask [:content 0 :tag])) "nested def tags too") - (t/is (= "userSpaceOnUse" (get-in mask [:attrs :mask-units]))) - (t/is (= :g (:tag content))) - (t/is (= :text (get-in content [:content 0 :tag])) "nested content tags too") - (t/is (= ["Hi"] (get-in content [:content 0 :content]))) - (t/is (= {} (get-in content [:content 1 :attrs])) "nil attrs become an empty map") - (t/is (= data' (cfm/migrate-data data' migration-id)) "re-running is stable"))) - -(t/deftest migration-0035-string-tag-file-passes-file-validation - ;; `migrate-file` validates the whole file data after migrating: a file - ;; with string node tags or nil node attrs must come out valid, or it - ;; cannot be opened. - (let [rect-id (uuid/next) - raw-id (uuid/next) - file (ctf/make-file {:name "String svg tags"}) - page-id (first (get-in file [:data :pages])) - rect (-> (cts/setup-shape {:id rect-id :type :rect :name "rect"}) - (assoc :svg-defs (string-tag-defs))) - raw (-> (cts/setup-shape {:id raw-id :type :svg-raw :name "raw"}) - (assoc :content (string-tag-content))) - file (-> file - (assoc :migrations (disj cfm/available-migrations migration-id)) - (update-in [:data :pages-index page-id :objects] assoc rect-id rect raw-id raw) - (update-in [:data :pages-index page-id :objects uuid/zero :shapes] conj rect-id raw-id)) - file' (cfm/migrate-file file {})] - (t/is (= :mask (get-in file' [:data :pages-index page-id :objects rect-id :svg-defs :a :tag]))) - (t/is (= :g (get-in file' [:data :pages-index page-id :objects raw-id :content :tag]))))) - -(t/deftest migration-0035-turns-plain-map-svg-transform-into-matrix - ;; The svg defs renderer multiplies `:svg-transform` as a matrix; a - ;; plain map there renders as `matrix(NaN, ...)`. - (let [plain-id (uuid/next) - matrix-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {plain-id (make-shape plain-id - {:type :path - :svg-transform {:a 1.0 :b 0.0 :c 0.0 :d 1.0 :e 10.0 :f 20.0}}) - matrix-id (make-shape matrix-id - {:type :path - :svg-transform (gmt/matrix 2 0 0 2 0 0)})}}}} - data' (cfm/migrate-data data migration-id) - plain' (get-in data' [:pages-index page-id :objects plain-id :svg-transform]) - matrix' (get-in data' [:pages-index page-id :objects matrix-id :svg-transform])] - (t/is (gmt/matrix? plain')) - (t/is (= (gmt/matrix 1 0 0 1 10 20) plain')) - (t/is (= (gmt/matrix 2 0 0 2 0 0) matrix') "matrices are left as they are") - (t/is (= data' (cfm/migrate-data data' migration-id)) "re-running is stable"))) - -(t/deftest migration-0035-leaves-kebab-files-equal - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-attrs {:fill-rule "evenodd" - :stroke-width "2"} - :svg-defs {"g1" {:tag :linearGradient - :attrs {:id "g1" - :gradient-units "userSpaceOnUse"} - :content []}}})}}}} - data' (cfm/migrate-data data migration-id)] - (t/is (= data data') "kebab is a fixed point"))) - -(t/deftest migration-0035-is-idempotent - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (camel-shape shape-id)}}}} - data' (cfm/migrate-data data migration-id)] - (t/is (= data' (cfm/migrate-data data' migration-id))))) - -(t/deftest migration-0035-normalizes-flat-svg-viewbox-to-rect - ;; Carried over from the withdrawn 0021: legacy files hold - ;; `:svg-viewbox` as a plain map instead of a rect record. - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-viewbox {:x 1 :y 2 :width 3 :height 4}})}}}} - data' (cfm/migrate-data data migration-id) - viewbox (get-in data' [:pages-index page-id :objects shape-id :svg-viewbox])] - (t/is (grc/rect? viewbox) "flat viewbox becomes a rect record") - (t/is (= 1 (:x viewbox))) - (t/is (= 2 (:y viewbox))) - (t/is (= 3 (:width viewbox))) - (t/is (= 4 (:height viewbox))) - (t/is (= data' (cfm/migrate-data data' migration-id)) - "re-running is stable"))) - -(t/deftest migration-0035-passes-non-maps-through - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-attrs "junk" - :svg-defs "junk"})}}}} - data' (cfm/migrate-data data migration-id) - shape (get-in data' [:pages-index page-id :objects shape-id])] - (t/is (= "junk" (:svg-attrs shape)) "non-maps reach validation untouched") - (t/is (= "junk" (:svg-defs shape))))) - -(t/deftest migration-0035-junk-viewbox-becomes-default-rect - ;; Unlike `:svg-attrs`/`:svg-defs` (passed through to validation), - ;; `:svg-viewbox` goes through `make-rect`, which does not throw on - ;; junk: it falls back to the default rect. Inherited from 0021. - (let [shape-id (uuid/next) - page-id (uuid/next) - data {:pages-index - {page-id - {:objects - {shape-id (make-shape shape-id - {:type :rect - :svg-viewbox "junk"})}}}} - data' (cfm/migrate-data data migration-id) - viewbox (get-in data' [:pages-index page-id :objects shape-id :svg-viewbox])] - (t/is (grc/rect? viewbox) "junk viewbox becomes a rect, not an error") - (t/is (= 0 (:x viewbox))) - (t/is (= 0.01 (:width viewbox))))) - -(t/deftest migration-0035-runs-through-file-migration - ;; A file that recorded the withdrawn "0021-fix-shape-svg-attrs" (and - ;; everything else current) still needs migration: 0021 left - ;; `available-migrations`, which re-arms it for 0035. - (let [shape-id (uuid/next) - file (ctf/make-file {:name "Legacy camel svg attrs"}) - page-id (first (get-in file [:data :pages])) - shape (-> (cts/setup-shape {:id shape-id :type :rect}) - (assoc :svg-attrs {:fillRule "evenodd"})) - file (-> file - (assoc :migrations (-> cfm/available-migrations - (disj migration-id) - (conj "0021-fix-shape-svg-attrs"))) - (assoc-in [:data :pages-index page-id :objects shape-id] shape)) - file' (cfm/migrate-file file {})] - (t/is (cfm/need-migration? file) "new migration detected") - (t/is (not (cfm/need-migration? file')) "new migration recorded") - (t/is (contains? (:migrations file') migration-id) "migration id persisted") - (t/is (not (contains? cfm/available-migrations "0021-fix-shape-svg-attrs")) - "the withdrawn 0021 id stays out: its camel-restoring transform must never run again") - (t/is (= "evenodd" - (get-in file' [:data :pages-index page-id :objects shape-id :svg-attrs :fill-rule])) - "migration repaired file data before schema validation"))) diff --git a/common/test/common_tests/files_migrations_0037_test.cljc b/common/test/common_tests/files_migrations_0037_test.cljc new file mode 100644 index 0000000000..eff0afb82a --- /dev/null +++ b/common/test/common_tests/files_migrations_0037_test.cljc @@ -0,0 +1,371 @@ +;; 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 SUBSIDIARY SL + +(ns common-tests.files-migrations-0037-test + (:require + [app.common.files.migrations :as cfm] + [app.common.geom.matrix :as gmt] + [app.common.geom.rect :as grc] + [app.common.types.file :as ctf] + [app.common.types.shape :as cts] + [app.common.uuid :as uuid] + [clojure.test :as t])) + +;; ====================================================================== +;; 0037-fix-shape-svg-attrs-and-defs +;; Stored svg attribute keys are kebab-case (issue #11947). Old birth and +;; the cleaner era stored camelCase React prop names, which the v3 reader +;; kebab-ized on import beyond repair. This migration converts them with +;; the same birth transforms: `:svg-attrs` and `:svg-defs` node attrs go +;; through the whitelist+kebab transform, svg-raw `:content` attrs are +;; kebab-ized spelling-only. It replaces "0021-fix-shape-svg-attrs" and +;; "0035-fix-shape-svg-attrs-and-defs" (ids withdrawn): files that +;; recorded either migrate again through this one. +;; ====================================================================== + +(def ^:private migration-id + "0037-fix-shape-svg-attrs-and-defs") + +(defn- make-shape + [shape-id shape] + (assoc shape :id shape-id)) + +(defn- camel-shape + [shape-id] + (make-shape shape-id + {:type :rect + :svg-attrs {:fillRule "evenodd" + :stroke-width "2" + :stroke-style "dotted" + :data-foo "drop-me"}})) + +(defn- camel-defs + [] + {"g1" {:tag :linearGradient + :attrs {:id "g1" + :gradientUnits "userSpaceOnUse" + :xlink:href "#base" + :data-x "drop-me"} + :content [{:tag :stop + :attrs {:offset "0" + :stopColor "#ffffff"} + :content []}]}}) + +(t/deftest migration-0037-converts-camel-svg-attrs-to-kebab-in-pages + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (camel-shape shape-id)}}}} + data' (cfm/migrate-data data migration-id) + attrs (get-in data' [:pages-index page-id :objects shape-id :svg-attrs])] + (t/is (= "evenodd" (:fill-rule attrs))) + (t/is (= "2" (:stroke-width attrs))) + (t/is (= "dotted" (:stroke-style attrs)) "penpot-extra-attrs survive") + (t/is (not (contains? attrs :data-foo)) "unknown attrs are dropped") + (t/is (not (contains? attrs :fillRule)) "no camel keys survive"))) + +(t/deftest migration-0037-converts-camel-svg-attrs-to-kebab-in-components + (let [shape-id (uuid/next) + component-id (uuid/next) + data {:components + {component-id + {:objects + {shape-id (camel-shape shape-id)}}}} + data' (cfm/migrate-data data migration-id) + attrs (get-in data' [:components component-id :objects shape-id :svg-attrs])] + (t/is (= "evenodd" (:fill-rule attrs))) + (t/is (not (contains? attrs :fillRule)) "no camel keys survive"))) + +(t/deftest migration-0037-normalizes-def-node-attrs + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-defs (camel-defs)})}}}} + data' (cfm/migrate-data data migration-id) + grad (get-in data' [:pages-index page-id :objects shape-id :svg-defs "g1"])] + (t/is (= :linearGradient (:tag grad)) "tags are untouched") + (t/is (= "g1" (get-in grad [:attrs :id])) ":id survives") + (t/is (= "userSpaceOnUse" (get-in grad [:attrs :gradient-units]))) + (t/is (= "#base" (get-in grad [:attrs :xlink-href]))) + (t/is (not (contains? (:attrs grad) :data-x)) "unknown def attrs are dropped") + (t/is (= "#ffffff" (get-in grad [:content 0 :attrs :stop-color])) + "nested stops are normalized"))) + +(t/deftest migration-0037-kebabizes-content-spelling-only + (let [shape-id (uuid/next) + page-id (uuid/next) + raw-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :path + :content [{:marker "untouched"}]}) + raw-id (make-shape raw-id + {:type :svg-raw + :content {:tag :g + :attrs {:strokeWidth "2" + :data-foo "keep-me"} + :content [{:tag :path + :attrs {:strokeLinecap "round"} + :content []}]}})}}}} + data' (cfm/migrate-data data migration-id) + path (get-in data' [:pages-index page-id :objects shape-id]) + raw (get-in data' [:pages-index page-id :objects raw-id]) + content (:content raw)] + (t/is (= [{:marker "untouched"}] (:content path)) + "non-svg-raw content is untouched") + (t/is (= "2" (get-in content [:attrs :stroke-width]))) + (t/is (= "keep-me" (get-in content [:attrs :data-foo])) + "unknown content keys survive") + (t/is (= "round" (get-in content [:content 0 :attrs :stroke-linecap]))))) + +(defn- string-tag-defs + [] + {:a {:tag "mask" + :attrs {:id "a" :maskUnits "userSpaceOnUse"} + :content [{:tag "rect" + :attrs {:width "10" :height "10" :fill "#FFF"} + :content []}]}}) + +(defn- string-tag-content + [] + {:tag "g" + :attrs {} + :content [{:tag "text" + :attrs {:fontSize "12"} + :content ["Hi"]} + {:tag "style" + :attrs nil + :content [".a{fill:red}"]}]}) + +(t/deftest migration-0037-keywordizes-string-tags + (let [shape-id (uuid/next) + raw-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-defs (string-tag-defs)}) + raw-id (make-shape raw-id + {:type :svg-raw + :content (string-tag-content)})}}}} + data' (cfm/migrate-data data migration-id) + mask (get-in data' [:pages-index page-id :objects shape-id :svg-defs :a]) + content (get-in data' [:pages-index page-id :objects raw-id :content])] + (t/is (= :mask (:tag mask))) + (t/is (= :rect (get-in mask [:content 0 :tag])) "nested def tags too") + (t/is (= "userSpaceOnUse" (get-in mask [:attrs :mask-units]))) + (t/is (= :g (:tag content))) + (t/is (= :text (get-in content [:content 0 :tag])) "nested content tags too") + (t/is (= ["Hi"] (get-in content [:content 0 :content]))) + (t/is (= {} (get-in content [:content 1 :attrs])) "nil attrs become an empty map") + (t/is (= data' (cfm/migrate-data data' migration-id)) "re-running is stable"))) + +(t/deftest migration-0037-string-tag-file-passes-file-validation + ;; `migrate-file` validates the whole file data after migrating: a file + ;; with string node tags or nil node attrs must come out valid, or it + ;; cannot be opened. + (let [rect-id (uuid/next) + raw-id (uuid/next) + file (ctf/make-file {:name "String svg tags"}) + page-id (first (get-in file [:data :pages])) + rect (-> (cts/setup-shape {:id rect-id :type :rect :name "rect"}) + (assoc :svg-defs (string-tag-defs))) + raw (-> (cts/setup-shape {:id raw-id :type :svg-raw :name "raw"}) + (assoc :content (string-tag-content))) + file (-> file + (assoc :migrations (disj cfm/available-migrations migration-id)) + (update-in [:data :pages-index page-id :objects] assoc rect-id rect raw-id raw) + (update-in [:data :pages-index page-id :objects uuid/zero :shapes] conj rect-id raw-id)) + file' (cfm/migrate-file file {})] + (t/is (= :mask (get-in file' [:data :pages-index page-id :objects rect-id :svg-defs :a :tag]))) + (t/is (= :g (get-in file' [:data :pages-index page-id :objects raw-id :content :tag]))))) + +(t/deftest migration-0037-drops-map-valued-svg-attrs + ;; Files exported by old Penpot versions hold maps where an svg attr + ;; value should be, such as a `:filter` that once read + ;; `url(#filter_2)`. The closed `:svg-attrs` schema admits scalars + ;; only, so `migrate-file` must drop them or the file cannot be + ;; imported or opened. The values below are copied from the + ;; "Avataaars" and "Tutorial for beginners" templates. + (let [shape-id (uuid/next) + file (ctf/make-file {:name "Map-valued svg attrs"}) + page-id (first (get-in file [:data :pages])) + shape (-> (cts/setup-shape {:id shape-id :type :rect :name "rect"}) + (assoc :svg-attrs {:fillRule "evenodd" + :filter {(keyword "{") "{ \"url(#filter_2) nil}\""} + :mask {(keyword "url(-filter0-d-16837-160)") nil} + :style {:fill "red" + :filter {:a "b"}}})) + file (-> file + (assoc :migrations (disj cfm/available-migrations migration-id)) + (update-in [:data :pages-index page-id :objects] assoc shape-id shape) + (update-in [:data :pages-index page-id :objects uuid/zero :shapes] conj shape-id)) + file' (cfm/migrate-file file {}) + attrs (get-in file' [:data :pages-index page-id :objects shape-id :svg-attrs])] + (t/is (= {:fill-rule "evenodd" :style {:fill "red"}} attrs) + "map values are dropped, scalars are kept"))) + +(t/deftest migration-0037-turns-plain-map-svg-transform-into-matrix + ;; The svg defs renderer multiplies `:svg-transform` as a matrix; a + ;; plain map there renders as `matrix(NaN, ...)`. + (let [plain-id (uuid/next) + matrix-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {plain-id (make-shape plain-id + {:type :path + :svg-transform {:a 1.0 :b 0.0 :c 0.0 :d 1.0 :e 10.0 :f 20.0}}) + matrix-id (make-shape matrix-id + {:type :path + :svg-transform (gmt/matrix 2 0 0 2 0 0)})}}}} + data' (cfm/migrate-data data migration-id) + plain' (get-in data' [:pages-index page-id :objects plain-id :svg-transform]) + matrix' (get-in data' [:pages-index page-id :objects matrix-id :svg-transform])] + (t/is (gmt/matrix? plain')) + (t/is (= (gmt/matrix 1 0 0 1 10 20) plain')) + (t/is (= (gmt/matrix 2 0 0 2 0 0) matrix') "matrices are left as they are") + (t/is (= data' (cfm/migrate-data data' migration-id)) "re-running is stable"))) + +(t/deftest migration-0037-leaves-kebab-files-equal + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-attrs {:fill-rule "evenodd" + :stroke-width "2"} + :svg-defs {"g1" {:tag :linearGradient + :attrs {:id "g1" + :gradient-units "userSpaceOnUse"} + :content []}}})}}}} + data' (cfm/migrate-data data migration-id)] + (t/is (= data data') "kebab is a fixed point"))) + +(t/deftest migration-0037-is-idempotent + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (camel-shape shape-id)}}}} + data' (cfm/migrate-data data migration-id)] + (t/is (= data' (cfm/migrate-data data' migration-id))))) + +(t/deftest migration-0037-normalizes-flat-svg-viewbox-to-rect + ;; Carried over from the withdrawn 0021: legacy files hold + ;; `:svg-viewbox` as a plain map instead of a rect record. + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-viewbox {:x 1 :y 2 :width 3 :height 4}})}}}} + data' (cfm/migrate-data data migration-id) + viewbox (get-in data' [:pages-index page-id :objects shape-id :svg-viewbox])] + (t/is (grc/rect? viewbox) "flat viewbox becomes a rect record") + (t/is (= 1 (:x viewbox))) + (t/is (= 2 (:y viewbox))) + (t/is (= 3 (:width viewbox))) + (t/is (= 4 (:height viewbox))) + (t/is (= data' (cfm/migrate-data data' migration-id)) + "re-running is stable"))) + +(t/deftest migration-0037-passes-non-maps-through + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-attrs "junk" + :svg-defs "junk"})}}}} + data' (cfm/migrate-data data migration-id) + shape (get-in data' [:pages-index page-id :objects shape-id])] + (t/is (= "junk" (:svg-attrs shape)) "non-maps reach validation untouched") + (t/is (= "junk" (:svg-defs shape))))) + +(t/deftest migration-0037-junk-viewbox-becomes-default-rect + ;; Unlike `:svg-attrs`/`:svg-defs` (passed through to validation), + ;; `:svg-viewbox` goes through `make-rect`, which does not throw on + ;; junk: it falls back to the default rect. Inherited from 0021. + (let [shape-id (uuid/next) + page-id (uuid/next) + data {:pages-index + {page-id + {:objects + {shape-id (make-shape shape-id + {:type :rect + :svg-viewbox "junk"})}}}} + data' (cfm/migrate-data data migration-id) + viewbox (get-in data' [:pages-index page-id :objects shape-id :svg-viewbox])] + (t/is (grc/rect? viewbox) "junk viewbox becomes a rect, not an error") + (t/is (= 0 (:x viewbox))) + (t/is (= 0.01 (:width viewbox))))) + +(t/deftest migration-0037-reruns-for-files-that-recorded-withdrawn-0021 + ;; A file that recorded the withdrawn "0021-fix-shape-svg-attrs" (and + ;; everything else current) still needs migration: 0021 left + ;; `available-migrations`, which re-arms it for 0037. + (let [shape-id (uuid/next) + file (ctf/make-file {:name "Legacy camel svg attrs"}) + page-id (first (get-in file [:data :pages])) + shape (-> (cts/setup-shape {:id shape-id :type :rect}) + (assoc :svg-attrs {:fillRule "evenodd"})) + file (-> file + (assoc :migrations (-> cfm/available-migrations + (disj migration-id) + (conj "0021-fix-shape-svg-attrs"))) + (assoc-in [:data :pages-index page-id :objects shape-id] shape)) + file' (cfm/migrate-file file {})] + (t/is (cfm/need-migration? file) "new migration detected") + (t/is (not (cfm/need-migration? file')) "new migration recorded") + (t/is (contains? (:migrations file') migration-id) "migration id persisted") + (t/is (not (contains? cfm/available-migrations "0021-fix-shape-svg-attrs")) + "the withdrawn 0021 id stays out of available-migrations") + (t/is (= "evenodd" + (get-in file' [:data :pages-index page-id :objects shape-id :svg-attrs :fill-rule])) + "migration repaired file data before schema validation"))) + +(t/deftest migration-0037-reruns-for-files-that-recorded-withdrawn-0035 + ;; A file that recorded 0035 holds camelCase keys when a client that + ;; loaded it before 0035 ran saved them afterwards (#13107). 0035 also + ;; left `available-migrations`, so 0037 must run on it again. + (let [shape-id (uuid/next) + file (ctf/make-file {:name "Legacy camel svg attrs"}) + page-id (first (get-in file [:data :pages])) + shape (-> (cts/setup-shape {:id shape-id :type :rect}) + (assoc :svg-attrs {:fillRule "evenodd"})) + file (-> file + (assoc :migrations (-> cfm/available-migrations + (disj migration-id) + (conj "0035-fix-shape-svg-attrs-and-defs"))) + (assoc-in [:data :pages-index page-id :objects shape-id] shape)) + file' (cfm/migrate-file file {})] + (t/is (cfm/need-migration? file) "new migration detected") + (t/is (not (cfm/need-migration? file')) "new migration recorded") + (t/is (contains? (:migrations file') migration-id) "migration id persisted") + (t/is (not (contains? cfm/available-migrations "0035-fix-shape-svg-attrs-and-defs")) + "the withdrawn 0035 id stays out of available-migrations") + (t/is (= "evenodd" + (get-in file' [:data :pages-index page-id :objects shape-id :svg-attrs :fill-rule])) + "migration repaired file data before schema validation"))) diff --git a/common/test/common_tests/runner.cljc b/common/test/common_tests/runner.cljc index 5bed751efb..7c517f2129 100644 --- a/common/test/common_tests/runner.cljc +++ b/common/test/common_tests/runner.cljc @@ -28,6 +28,7 @@ [common-tests.files-migrations-0034-test] [common-tests.files-migrations-0035-test] [common-tests.files-migrations-0036-test] + [common-tests.files-migrations-0037-test] [common-tests.files-migrations-test] [common-tests.files.comp-processors-test] [common-tests.files.helpers-test] @@ -149,6 +150,7 @@ 'common-tests.files-migrations-0034-test 'common-tests.files-migrations-0035-test 'common-tests.files-migrations-0036-test + 'common-tests.files-migrations-0037-test 'common-tests.files-migrations-test 'common-tests.files.comp-processors-test 'common-tests.files.helpers-test diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 55540a934f..6cd9b8cdfe 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -150,12 +150,12 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9fa5bf865783c43840101fcdc3a5222b60daf4fe11f26806247bf807c08aba38'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.28.101-ca-jdk27.0.0-linux_aarch64.tar.gz'; \ + ESUM='18875b92ad2535230a13175f718933f7cc0593b4affa2dab442815ec245dacbb'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_aarch64.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ccbc15c4edbedfdcc03c2d29a2aa2c6daf9e6ffb4cda7dd5ece0fcbb37350267'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.28.101-ca-jdk27.0.0-linux_x64.tar.gz'; \ + ESUM='c4d7bf4c80a21e935187ecdcb111e4b2f14e1fdd18364974fe7f7da54b12bea0'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_x64.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/docker/devenv/files/tmux.conf b/docker/devenv/files/tmux.conf index 062c1622c7..349aa43fc7 100644 --- a/docker/devenv/files/tmux.conf +++ b/docker/devenv/files/tmux.conf @@ -6,5 +6,8 @@ set -g mouse off set -g history-limit 50000 setw -g mode-keys emacs +set -g set-clipboard on +set -g allow-passthrough on + bind-key -r C-n resize-pane -U bind-key -r C-m resize-pane -D diff --git a/docker/gitpod/Dockerfile b/docker/gitpod/Dockerfile deleted file mode 100644 index 30ec7da8fe..0000000000 --- a/docker/gitpod/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -FROM gitpod/workspace-postgres - -# Install custom tools, runtimes, etc. -# For example "bastet", a command-line tetris clone: -# RUN brew install bastet -# -# More information: https://www.gitpod.io/docs/config-docker/ - -RUN set -ex; \ - brew install redis; \ - brew install imagemagick; \ - brew install ghostscript; \ - brew install mailhog; \ - brew install openldap; \ - brew install poppler; \ - sudo mkdir -p /var/log/nginx; \ - sudo chown gitpod:gitpod /var/log/nginx - -COPY files/nginx.conf /etc/nginx/nginx.conf -COPY files/nginx-mime.types /etc/nginx/mime.types - -USER root - -ENV NODE_VERSION=v16.17.0 \ - CLOJURE_VERSION=1.11.1.1165 \ - CLJKONDO_VERSION=2022.09.08 \ - BABASHKA_VERSION=0.9.162 \ - LANG=en_US.UTF-8 \ - LC_ALL=en_US.UTF-8 - -RUN set -ex; \ - useradd -m -g users -s /bin/bash penpot; \ - passwd penpot -d; \ - echo "penpot ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -RUN set -ex; \ - apt-get -qq update; \ - apt-get -qqy install \ - gconf-service \ - libasound2 \ - libatk1.0-0 \ - libatk-bridge2.0-0 \ - libcairo2 \ - libcups2 \ - libdbus-1-3 \ - libexpat1 \ - libfontconfig1 \ - libgcc1 \ - libgconf-2-4 \ - libgdk-pixbuf2.0-0 \ - libglib2.0-0 \ - libgtk-3-0 \ - libnspr4 \ - libpango-1.0-0 \ - libpangocairo-1.0-0 \ - libx11-6 \ - libx11-xcb1 \ - libxcb1 \ - libxcomposite1 \ - libxcursor1 \ - libxdamage1 \ - libxext6 \ - libxfixes3 \ - libxi6 \ - libxrandr2 \ - libxrender1 \ - libxshmfence1 \ - libxss1 \ - libxtst6 \ - fonts-liberation \ - libappindicator1 \ - libnss3 \ - libgbm1 \ - ; \ - rm -rf /var/lib/apt/lists/*; - -RUN set -ex; \ - curl -LfsSo /tmp/openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz; \ - mkdir -p /usr/lib/jvm/openjdk16; \ - cd /usr/lib/jvm/openjdk16; \ - tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ - rm -rf /tmp/openjdk.tar.gz; - -# Install clojure cli -RUN set -ex; \ - curl -LfsSo /tmp/clojure.sh https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh; \ - chmod +x /tmp/clojure.sh; \ - /tmp/clojure.sh; \ - rm -rf /tmp/clojure.sh; - -# Install clj-kondo -RUN set -ex; \ - curl -LfsSo /tmp/clj-kondo.zip https://github.com/borkdude/clj-kondo/releases/download/v$CLJKONDO_VERSION/clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip; \ - cd /usr/local/bin; \ - unzip /tmp/clj-kondo.zip; \ - rm /tmp/clj-kondo.zip; - -# Install babashka -RUN set -ex; \ - cd /tmp; \ - curl -LfsSo /tmp/babashka.tar.gz https://github.com/babashka/babashka/releases/download/v$BABASHKA_VERSION/babashka-$BABASHKA_VERSION-linux-amd64.tar.gz; \ - cd /usr/local/bin; \ - tar -xf /tmp/babashka.tar.gz; \ - rm -rf /tmp/babashka.tar.gz; - -USER gitpod - -ENV PATH="/usr/lib/jvm/openjdk16/bin:/usr/local/nodejs/bin:$PATH" \ - JAVA_HOME=/usr/lib/jvm/openjdk16 \ - PENPOT_SMTP_ENABLED=true \ - PENPOT_SMTP_HOST=localhost \ - PENPOT_SMTP_PORT=1025 \ - PENPOT_SMTP_USER= \ - PENPOT_SMTP_PASSWORD= \ - PENPOT_SMTP_SSL=false \ - PENPOT_SMTP_TLS=false \ - PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com \ - PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com \ - PENPOT_DATABASE_URI="postgresql://localhost/penpot" \ - PENPOT_REDIS_URI="redis://localhost/0" - -# TODO Retrieve OpenLDAP from rroemhild/docker-test-openldap diff --git a/docker/gitpod/files/nginx-mime.types b/docker/gitpod/files/nginx-mime.types deleted file mode 100644 index 91f6aba0ac..0000000000 --- a/docker/gitpod/files/nginx-mime.types +++ /dev/null @@ -1,100 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/javascript mjs; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/docker/gitpod/files/nginx.conf b/docker/gitpod/files/nginx.conf deleted file mode 100644 index ca403adfd2..0000000000 --- a/docker/gitpod/files/nginx.conf +++ /dev/null @@ -1,145 +0,0 @@ -# This Nginx config file is optional. -# If you don't have this file, the Nginx config from the workspace-full docker image will be taken. - -worker_processes auto; -pid /var/run/nginx/nginx.pid; -include /etc/nginx/modules-enabled/*.conf; - -env GITPOD_REPO_ROOT; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - - gzip on; - - gzip_vary on; - gzip_proxied any; - gzip_comp_level 3; - gzip_buffers 16 8k; - gzip_http_version 1.1; - - gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - # include /etc/nginx/sites-enabled/*; - - server { - set_by_lua $gitpod_repo_root 'return os.getenv("GITPOD_REPO_ROOT")'; - - listen 0.0.0.0:3449 default_server; - server_name _; - - client_max_body_size 5M; - charset utf-8; - - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - resolver 8.8.8.8; - - etag off; - - root $gitpod_repo_root/frontend/resources/public; - - location @handle_redirect { - set $redirect_uri "$upstream_http_location"; - set $redirect_host "$upstream_http_x_host"; - set $redirect_cache_control "$upstream_http_cache_control"; - - proxy_buffering off; - - proxy_set_header Host "$redirect_host"; - proxy_hide_header etag; - proxy_hide_header x-amz-id-2; - proxy_hide_header x-amz-request-id; - proxy_hide_header x-amz-meta-server-side-encryption; - proxy_hide_header x-amz-server-side-encryption; - proxy_pass $redirect_uri; - - add_header x-internal-redirect "$redirect_uri"; - add_header x-cache-control "$redirect_cache_control"; - add_header cache-control "$redirect_cache_control"; - } - - location /assets { - proxy_pass http://127.0.0.1:6060/assets; - recursive_error_pages on; - proxy_intercept_errors on; - error_page 301 302 307 = @handle_redirect; - } - - location /internal/assets { - internal; - alias $gitpod_repo_root/backend/assets; - add_header x-internal-redirect "$upstream_http_x_accel_redirect"; - } - - location /api { - proxy_pass http://127.0.0.1:6060/api; - } - - location /webhooks { - proxy_pass http://127.0.0.1:6060/webhooks; - } - - location /dbg { - proxy_pass http://127.0.0.1:6060/dbg; - } - - location /export { - proxy_pass http://127.0.0.1:6061; - } - - location /playground { - alias $gitpod_repo_root/experiments/; - add_header Cache-Control "no-cache, max-age=0"; - autoindex on; - } - - location /ws/notifications { - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_pass http://127.0.0.1:6060/ws/notifications; - } - - location / { - add_header Cache-Control "no-cache, max-age=0"; - - location ~ ^/(/|css|fonts|images|js|wasm) { - } - - location ~ ^/[^/]+/(.*)$ { - return 301 " /404"; - } - - try_files $uri /index.html$is_args$args =404; - } - } -} diff --git a/docker/gitpod/files/postgresql_init.sql b/docker/gitpod/files/postgresql_init.sql deleted file mode 100644 index 1766a643d2..0000000000 --- a/docker/gitpod/files/postgresql_init.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE DATABASE penpot; -CREATE USER penpot PASSWORD 'penpot'; -ALTER ROLE penpot SUPERUSER; diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend index 1e287b7080..c2f4c5e6b7 100644 --- a/docker/images/Dockerfile.backend +++ b/docker/images/Dockerfile.backend @@ -27,12 +27,12 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8ff07320636ef5b30f0d7e16687932df52255c3ef3ffd920a6aae3723511ce7f'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.203-ca-jdk26.0.2.1-linux_aarch64.tar.gz'; \ + ESUM='18875b92ad2535230a13175f718933f7cc0593b4affa2dab442815ec245dacbb'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_aarch64.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='c6b810ca659e3293205444f47ac4af163396fd6d025c51fd5f767e628b2ceede'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.203-ca-jdk26.0.2.1-linux_x64.tar.gz'; \ + ESUM='c4d7bf4c80a21e935187ecdcb111e4b2f14e1fdd18364974fe7f7da54b12bea0'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_x64.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/frontend/src/app/main/data/workspace/notifications.cljs b/frontend/src/app/main/data/workspace/notifications.cljs index 459e4e70b9..480c8c9d55 100644 --- a/frontend/src/app/main/data/workspace/notifications.cljs +++ b/frontend/src/app/main/data/workspace/notifications.cljs @@ -359,7 +359,7 @@ (modal/show :file-restored {:fullname (restorer-fullname state profile-id session-id) :label label - :created-at created-at + :date created-at ;; Made on the replaced version, so the reload drops them :unsaved (boolean (seq (dps/pending-file-changes state file)))})) (rx/empty)))))) diff --git a/frontend/src/app/main/ui/workspace/file_restored_modal.cljs b/frontend/src/app/main/ui/workspace/file_restored_modal.cljs index badadb4957..c4aee1305f 100644 --- a/frontend/src/app/main/ui/workspace/file_restored_modal.cljs +++ b/frontend/src/app/main/ui/workspace/file_restored_modal.cljs @@ -36,7 +36,9 @@ which was reloaded, and whether their edits not saved yet were lost." {::mf/register modal/components ::mf/register-as :file-restored} - [{:keys [fullname label created-at unsaved]}] + ;; The modal wrapper passes the props map without camelCasing its keys, + ;; so every prop of this component must be a one-word name. + [{:keys [fullname label date unsaved]}] (let [on-close (mf/use-fn #(st/emit! (modal/hide)))] [:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css :modal-dialog) @@ -49,7 +51,7 @@ :class (stl/css :modal-title)} (tr "workspace.file-restored.title")] [:> text* {:as "p" :typography t/body-large} - (restored-message fullname label created-at)] + (restored-message fullname label date)] (when unsaved [:> text* {:as "p" :typography t/body-large} (tr "workspace.file-restored.unsaved-changes")]) diff --git a/frontend/test/frontend_tests/data/workspace_notifications_test.cljs b/frontend/test/frontend_tests/data/workspace_notifications_test.cljs index 0ad8a12697..c6b4d721b4 100644 --- a/frontend/test/frontend_tests/data/workspace_notifications_test.cljs +++ b/frontend/test/frontend_tests/data/workspace_notifications_test.cljs @@ -140,7 +140,7 @@ props (:props (shown-modal events))] (t/is (= "Ada" (:fullname props))) (t/is (= "Hand-off v2" (:label props))) - (t/is (= created-at (:created-at props))) + (t/is (= created-at (:date props))) (t/is (true? (:unsaved props))))) ;; Scenario: the restoring session left before its message arrived, so it diff --git a/frontend/test/frontend_tests/plugins/wait_for_save_test.cljs b/frontend/test/frontend_tests/plugins/wait_for_save_test.cljs index e214d301ad..c9951aa657 100644 --- a/frontend/test/frontend_tests/plugins/wait_for_save_test.cljs +++ b/frontend/test/frontend_tests/plugins/wait_for_save_test.cljs @@ -40,6 +40,14 @@ [outcome] (some-> (:error outcome) .-code)) +(defn- saves + "The `update-file` commands the transport received. Every flow of the + editor shares the mocked transport and a lingering one can still reach + it, so a stray call must neither pass for a save nor release a wait on + one." + [requests] + (filterv #(= :update-file (first %)) @requests)) + (t/deftest ^:async empty-persistence-resolves-after-intake (await (with-persistence @@ -50,7 +58,7 @@ (let [outcome (await (await-outcome (persist/wait-for-save 2000)))] (t/is (contains? outcome :ok) "empty buffer and queue resolve after intake") - (t/is (empty? @requests) + (t/is (empty? (saves requests)) "nothing to save sends no update-file"))))))))) (t/deftest ^:async context-wait-for-save-resolves @@ -133,7 +141,7 @@ (await (async/wait-for #(seq (get-in @store [:persistence :buffer])) "commit is buffered")) (let [p (persist/wait-for-save 5000)] - (await (async/wait-for #(seq @requests) + (await (async/wait-for #(seq (saves requests)) "force-persist flushed the buffer")) (rx/error! response (ex-info "rejected" {:type :validation :code :invalid-data})) (let [outcome (await (await-outcome p))] @@ -189,7 +197,8 @@ (js/setTimeout (fn [] (ptk/emit! store (local-commit file-id))) 0) - (await (async/wait-for #(seq @requests) "force-persist sent the edit")) + (await (async/wait-for #(seq (saves requests)) + "force-persist sent the edit")) (rx/push! response {:revn 1}) (let [outcome (await (await-outcome p))] (t/is (contains? outcome :ok) @@ -206,7 +215,8 @@ (await (async/wait-for #(seq (get-in @store [:persistence :buffer])) "commit is buffered")) (let [p (persist/wait-for-save 5000)] - (await (async/wait-for #(seq @requests) "force-persist flushed the buffer")) + (await (async/wait-for #(seq (saves requests)) + "force-persist flushed the buffer")) (rx/push! response {:revn 1}) (let [outcome (await (await-outcome p))] (t/is (contains? outcome :ok) @@ -255,7 +265,7 @@ (await (async/wait-for #(seq (get-in @store [:persistence :buffer])) "commit is buffered")) (let [p (persist/wait-for-save 5000)] - (await (async/wait-for #(seq @requests) + (await (async/wait-for #(seq (saves requests)) "force-persist flushed the buffer")) (rx/push! response (thp/rejection (:id @commit))) (let [outcome (await (await-outcome p))] @@ -276,7 +286,7 @@ (await (async/wait-for #(seq (get-in @store [:persistence :buffer])) "commit is buffered")) (let [p (persist/wait-for-save 5000)] - (await (async/wait-for #(seq @requests) + (await (async/wait-for #(seq (saves requests)) "force-persist flushed the buffer")) ;; Rollback starts before settle can publish empty :saved; ;; never emit ::rolled-back (reload-delay case). diff --git a/frontend/test/frontend_tests/ui/file_restored_modal_test.cljs b/frontend/test/frontend_tests/ui/file_restored_modal_test.cljs index 169baa4573..983f88ab39 100644 --- a/frontend/test/frontend_tests/ui/file_restored_modal_test.cljs +++ b/frontend/test/frontend_tests/ui/file_restored_modal_test.cljs @@ -6,10 +6,14 @@ (ns frontend-tests.ui.file-restored-modal-test (:require + ["react-dom/server" :as rds] [app.common.time :as ct] + [app.main.data.modal :as modal] [app.main.ui.workspace.file-restored-modal :as frm] [app.util.i18n :as i18n] - [cljs.test :as t :include-macros true])) + [cljs.test :as t :include-macros true] + [cuerdas.core :as str] + [rumext.v2 :as mf])) (defn- message "The translation key and arguments of the restore message." @@ -32,3 +36,17 @@ (message "Ada" nil nil))) (t/is (= ["workspace.file-restored.message-anonymous"] (message nil nil nil))))) + +(defn- render-modal + "Markup of the registered `:file-restored` modal for the `props` map, + rendered the way the modal wrapper does it (`mf/element` with the map)." + [props] + (with-redefs [i18n/tr (fn ([key] key) ([key & args] (str/join "|" (into [key] args))))] + (rds/renderToStaticMarkup + (mf/element (get @modal/components :file-restored) props)))) + +(t/deftest the-modal-shows-the-date-of-an-unnamed-version + (let [created-at (ct/now) + markup (render-modal {:fullname "Ada" :date created-at :unsaved false})] + (t/is (str/includes? markup (str "workspace.file-restored.message-date|Ada|" + (ct/format-inst created-at "PPp"))))))