From 5ec1272d6806156ad00229de81db8c7f1ca85e6f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Jan 2024 14:26:39 +0100 Subject: [PATCH 1/4] :bug: Update rumext that fixes issue with :htmlFor prop --- frontend/deps.edn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/deps.edn b/frontend/deps.edn index 6c57b02a68..61ca3089d1 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -19,8 +19,8 @@ :git/url "https://github.com/funcool/beicon.git"} funcool/rumext - {:git/tag "v2.9.2" - :git/sha "faa6e6c" + {:git/tag "v2.9.3" + :git/sha "9047337" :git/url "https://github.com/funcool/rumext.git"} instaparse/instaparse {:mvn/version "1.4.12"} From e8563872924d00b0dda0dd9ebbcc749d154a6c49 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Jan 2024 14:26:58 +0100 Subject: [PATCH 2/4] :paperclip: Add better key formatting on radio-buttons react component --- frontend/src/app/main/ui/components/forms.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/components/forms.cljs b/frontend/src/app/main/ui/components/forms.cljs index 88cd4fd425..9ce9ae13d3 100644 --- a/frontend/src/app/main/ui/components/forms.cljs +++ b/frontend/src/app/main/ui/components/forms.cljs @@ -268,7 +268,7 @@ (let [image? (some? image) value' (encode-fn value) checked? (= value current-value) - key (str/ffmt "%-%" name value')] + key (str/ffmt "%-%" (d/name name) (d/name value'))] [:label {:for key :key key :style {:background-image (when image? (str/ffmt "url(%)" image))} From 3d66a4b7be2f6311e59784c6e08b4a3b7c2690e6 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Jan 2024 14:27:41 +0100 Subject: [PATCH 3/4] :lipstick: Split large lines on onboarding questions compomponent --- .../src/app/main/ui/onboarding/questions.cljs | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/ui/onboarding/questions.cljs b/frontend/src/app/main/ui/onboarding/questions.cljs index cead11ff45..fd3fcca94c 100644 --- a/frontend/src/app/main/ui/onboarding/questions.cljs +++ b/frontend/src/app/main/ui/onboarding/questions.cljs @@ -47,19 +47,38 @@ [:h1 {:class (stl/css :modal-title)} (tr "questions.lets-get-started")] [:p {:class (stl/css :modal-text)} (tr "questions.your-feedback-will-help-us")] [:h3 {:class (stl/css :modal-subtitle)} (tr "questions.questions-how-are-you-planning-to-use-penpot")] - [:& fm/select {:options [{:label (tr "questions.select-option") :value "" :key "questions-how-are-you-planning-to-use-penpot" :disabled true} - {:label (tr "questions.discover-more-about-penpot") :value "discover-more-about-penpot" :key "discover-more-about-penpot"} - {:label (tr "questions.test-penpot-to-see-if-its-a-fit-for-team") :value "test-penpot-to-see-if-its-a-fit-for-team" :key "test-penpot-to-see-if-its-a-fit-for-team"} - {:label (tr "questions.start-to-work-on-my-project") :value "start-to-work-on-my-project" :key "start-to-work-on-my-project"} - {:label (tr "questions.get-the-code-from-my-team-project") :value "get-the-code-from-my-team-project" :key "get-the-code-from-my-team-project"} - {:label (tr "questions.leave-feedback-for-my-team-project") :value "leave-feedback-for-my-team-project" :key "leave-feedback-for-my-team-project"} - {:label (tr "questions.work-in-concept-ideas") :value "work-in-concept-ideas" :key "work-in-concept-ideas"} - {:label (tr "questions.try-out-before-using-penpot-on-premise") :value "try-out-before-using-penpot-on-premise" :key "try-out-before-using-penpot-on-premise"}] - :default "" - :name :planning}]]) + [:& fm/select + {:options [{:label (tr "questions.select-option") + :value "" :key "questions-how-are-you-planning-to-use-penpot" + :disabled true} + {:label (tr "questions.discover-more-about-penpot") + :value "discover-more-about-penpot" + :key "discover-more-about-penpot"} + {:label (tr "questions.test-penpot-to-see-if-its-a-fit-for-team") + :value "test-penpot-to-see-if-its-a-fit-for-team" + :key "test-penpot-to-see-if-its-a-fit-for-team"} + {:label (tr "questions.start-to-work-on-my-project") + :value "start-to-work-on-my-project" + :key "start-to-work-on-my-project"} + {:label (tr "questions.get-the-code-from-my-team-project") + :value "get-the-code-from-my-team-project" + :key "get-the-code-from-my-team-project"} + {:label (tr "questions.leave-feedback-for-my-team-project") + :value "leave-feedback-for-my-team-project" + :key "leave-feedback-for-my-team-project"} + {:label (tr "questions.work-in-concept-ideas") + :value "work-in-concept-ideas" + :key "work-in-concept-ideas"} + {:label (tr "questions.try-out-before-using-penpot-on-premise") + :value "try-out-before-using-penpot-on-premise" + :key "try-out-before-using-penpot-on-premise"}] + :default "" + :name :planning}]]) (s/def ::questions-form-step-2 - (s/keys :req-un [::experience-branding-illustrations-marketing-pieces ::experience-interface-design-visual-assets-design-systems ::experience-interface-wireframes-user-journeys-flows-navigation-trees])) + (s/keys :req-un [::experience-branding-illustrations-marketing-pieces + ::experience-interface-design-visual-assets-design-systems + ::experience-interface-wireframes-user-journeys-flows-navigation-trees])) (mf/defc step-2 [{:keys [on-next on-prev form] :as props}] From b63a8d34b5416237cf006b2240f7c58f221a3846 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Jan 2024 14:36:30 +0100 Subject: [PATCH 4/4] :bug: Fix debug reset file version method --- backend/src/app/http/debug.clj | 14 +++++++------- backend/src/app/srepl/helpers.clj | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/app/http/debug.clj b/backend/src/app/http/debug.clj index 19d6529fcd..1630289046 100644 --- a/backend/src/app/http/debug.clj +++ b/backend/src/app/http/debug.clj @@ -412,13 +412,13 @@ :code :invalid-version :hint "provided invalid version")) - (srepl/update-file! cfg - :id file-id - :update-fn (fn [file] - (update file :data assoc :version version)) - :migrate? false - :inc-revn? false - :save? true) + (binding [srepl/*system* cfg] + (srepl/update-file! :id file-id + :update-fn (fn [file] + (update file :data assoc :version version)) + :migrate? false + :inc-revn? false + :save? true)) {::rres/status 200 ::rres/headers {"content-type" "text/plain"} ::rres/body "OK"})) diff --git a/backend/src/app/srepl/helpers.clj b/backend/src/app/srepl/helpers.clj index f42fcf26c6..f1a267e48d 100644 --- a/backend/src/app/srepl/helpers.clj +++ b/backend/src/app/srepl/helpers.clj @@ -154,7 +154,7 @@ (dissoc file :data)))] - (db/tx-run! main/system + (db/tx-run! (or *system* main/system) (fn [system] (binding [*system* system] (try