From 73d42c03d5c6b2c90f91c98a533267c8845e74af Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 19 Jun 2023 07:38:05 +0200 Subject: [PATCH 1/4] :sparkles: Allow override the default nginx resolver using the PENPOT_INTERNAL_RESOLVER environment variable --- CHANGES.md | 8 ++++++++ docker/images/files/nginx-entrypoint.sh | 3 ++- docker/images/files/nginx.conf | 2 +- manage.sh | 6 +++--- version.txt | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 990a8b2c99..8aec40f778 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,12 @@ # CHANGELOG +## 1.18.6 (Unreleased) + +### :sparkles: Enhancements + +- Add the ability to overwrite internal resolver with `PENPOT_INTERNAL_RESOLVER` environment + variable [GH #3310](https://github.com/penpot/penpot/issues/3310) + ## 1.18.5 ## 1.18.4 @@ -40,6 +47,7 @@ ## 1.18.0 ### :sparkles: New features + - Adds more accessibility improvements in dashboard [Taiga #4577](https://tree.taiga.io/project/penpot/us/4577) - Adds paddings and gaps prediction on layout creation [Taiga #4838](https://tree.taiga.io/project/penpot/task/4838) - Add visual feedback when proportionally scaling text elements with **K** [Taiga #3415](https://tree.taiga.io/project/penpot/us/3415) diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh index 00d8fddc94..c342452307 100644 --- a/docker/images/files/nginx-entrypoint.sh +++ b/docker/images/files/nginx-entrypoint.sh @@ -21,7 +21,8 @@ update_flags /var/www/app/js/config.js export PENPOT_BACKEND_URI=${PENPOT_BACKEND_URI:-http://penpot-backend:6060}; export PENPOT_EXPORTER_URI=${PENPOT_EXPORTER_URI:-http://penpot-exporter:6061}; +export PENPOT_INTERNAL_RESOLVER=${PENPOT_INTERNAL_RESOLVER:-127.0.0.11}; -envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI" < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf +envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_INTERNAL_RESOLVER" < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf exec "$@"; diff --git a/docker/images/files/nginx.conf b/docker/images/files/nginx.conf index 34b01a2efc..35b06e7312 100644 --- a/docker/images/files/nginx.conf +++ b/docker/images/files/nginx.conf @@ -38,7 +38,7 @@ http { gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json; - resolver 127.0.0.11; + resolver $PENPOT_INTERNAL_RESOLVER; map $http_upgrade $connection_upgrade { default upgrade; diff --git a/manage.sh b/manage.sh index 79d1e568f8..d724fef53a 100755 --- a/manage.sh +++ b/manage.sh @@ -181,9 +181,9 @@ function build-docker-images { pushd ./docker/images; - docker build -t penpotapp/frontend:$CURRENT_BRANCH -f Dockerfile.frontend .; - docker build -t penpotapp/backend:$CURRENT_BRANCH -f Dockerfile.backend .; - docker build -t penpotapp/exporter:$CURRENT_BRANCH -f Dockerfile.exporter .; + docker build -t penpotapp/frontend:$CURRENT_BRANCH -t penpotapp/frontend:latest -f Dockerfile.frontend .; + docker build -t penpotapp/backend:$CURRENT_BRANCH -t penpotapp/backend:latest -f Dockerfile.backend .; + docker build -t penpotapp/exporter:$CURRENT_BRANCH -t penpotapp/exporter:latest -f Dockerfile.exporter .; popd; } diff --git a/version.txt b/version.txt index 8e8b0a9335..04a8bc26d1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.18.5 +1.18.6 From ecedf46c2a7de1fa965e35126eaf1b0260257a82 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 19 Jun 2023 10:27:43 +0200 Subject: [PATCH 2/4] :paperclip: Add missing changelog entries for the 1.18.5 --- CHANGES.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 8aec40f778..bfad13cefe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,13 @@ ## 1.18.5 +### :bug: Bugs fixed + +- Fix add flow option in contextual menu for frames +- Fix issues related with invitations +- Fix problem with undefined gaps +- Add deleted fonts auto match mechanism + ## 1.18.4 ### :bug: Bugs fixed From d2bfd98a050c00c2b74c0d795764f46311d7ca82 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 20 Jun 2023 13:28:31 +0200 Subject: [PATCH 3/4] :bug: Fix right click options over layer or shape --- frontend/src/app/main/data/workspace.cljs | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index 4ce4dc2ee7..200b29695d 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1258,17 +1258,18 @@ not-group-like? (and (= (count selected) 1) (not (contains? #{:group :bool} (:type head)))) no-bool-shapes? (->> all-selected (some (comp #{:frame :text} :type)))] - - (rx/concat - (when (and (some? shape) (not (contains? selected (:id shape)))) - (rx/of (dws/select-shape (:id shape)))) - (rx/of (show-context-menu - (-> params - (assoc - :kind :shape - :disable-booleans? (or no-bool-shapes? not-group-like?) - :disable-flatten? no-bool-shapes? - :selected (conj selected (:id shape))))))))))) + + (if (and (some? shape) (not (contains? selected (:id shape)))) + (rx/concat + (rx/of (dws/select-shape (:id shape))) + (rx/of (show-shape-context-menu params))) + (rx/of (show-context-menu + (-> params + (assoc + :kind :shape + :disable-booleans? (or no-bool-shapes? not-group-like?) + :disable-flatten? no-bool-shapes? + :selected (conj selected (:id shape))))))))))) (defn show-page-item-context-menu [{:keys [position page] :as params}] From 9a45ce80a67aa16587c02c430a6c8f5019f5dcde Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 21 Jun 2023 07:36:42 +0200 Subject: [PATCH 4/4] :bug: Fix comments navigation --- CHANGES.md | 4 ++++ frontend/src/app/main/ui/workspace/comments.cljs | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index bfad13cefe..21f6f99fa4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,10 @@ ## 1.18.6 (Unreleased) +### :bug: Bugs fixed + +- Fix comments navigation from workspace [Taiga #5504](https://tree.taiga.io/project/penpot/issue/5504) + ### :sparkles: Enhancements - Add the ability to overwrite internal resolver with `PENPOT_INTERNAL_RESOLVER` environment diff --git a/frontend/src/app/main/ui/workspace/comments.cljs b/frontend/src/app/main/ui/workspace/comments.cljs index 3ff73b80da..02ac964b01 100644 --- a/frontend/src/app/main/ui/workspace/comments.cljs +++ b/frontend/src/app/main/ui/workspace/comments.cljs @@ -77,6 +77,7 @@ on-thread-click (mf/use-callback + (mf/deps page-id) (fn [thread] (when (not= page-id (:page-id thread)) (st/emit! (dw/go-to-page (:page-id thread))))