Merge pull request #7154 from penpot/niwinz-staging-bug-1

🐛 Fix incorrect show request-access dialog on not-found on viewer

CHANGES.md

@@ -28,6 +28,8 @@
 - Add the ability to show login dialog on profile settings [Github #6871](https://github.com/penpot/penpot/pull/6871)
 - Improve the application of tokens with object specific tokens [Taiga #10209](https://tree.taiga.io/project/penpot/us/10209)
 - Add info to apply-token event [Taiga #11710](https://tree.taiga.io/project/penpot/task/11710)
+- Fix double click on set name input [Taiga #11747](https://tree.taiga.io/project/penpot/issue/11747)
+
 
 ### :bug: Bugs fixed
 

docs/technical-guide/getting-started/kubernetes.md

@@ -103,6 +103,11 @@ If you are deploying Penpot on OpenShift, we recommend following the specific gu
 
 Make sure to review the section **OpenShift Requirements** for important security and compatibility considerations.
 
+### Using Rancher?
+
+If you are deploying Penpot on Rancher, we recommend following the specific guidelines provided in the official documentation:
+<a href="https://docs.apps.rancher.io/reference-guides/penpot/" target="_blank">Reference guides / Penpot</a>.
+
 ## Upgrade Penpot
 
 When a new version of Penpot's chart is released, or when you want to change the

frontend/src/app/main/ui/static.cljs

@@ -501,16 +501,16 @@
         profile     (mf/deref refs/profile)
 
         auth-error? (= type :authentication)
+        not-found?  (= type :not-found)
 
         authenticated?
         (is-authenticated? profile)
 
         request-access?
         (and
-         (or (= type :not-found) auth-error?)
          (or workspace? dashboard? view?)
-         (or (:file-id info)
-             (:team-id info)))]
+         (or (some? (:file-id info))
+             (some? (:team-id info))))]
 
     (mf/with-effect [params info]
       (when-not (:loaded info)
@@ -518,25 +518,26 @@
              (rx/subs! (partial reset! info*)
                        (partial reset! info* {:loaded true})))))
 
-    (if (and auth-error? (not authenticated?))
-      [:> context-wrapper*
-       {:is-workspace workspace?
-        :is-dashboard dashboard?
-        :is-viewer view?
-        :profile profile}
-       [:> login-dialog* {}]]
 
-      (when (get info :loaded false)
-        (if request-access?
-          [:> context-wrapper* {:is-workspace workspace?
-                                :is-dashboard dashboard?
-                                :is-viewer view?
-                                :profile profile}
-           [:> request-access* {:file-id (:file-id info)
-                                :team-id  (:team-id info)
-                                :is-default (:team-default info)
-                                :profile profile
-                                :is-workspace workspace?}]]
-
-          [:> exception-section* props])))))
+    (if (or auth-error? not-found?)
+      (if (not authenticated?)
+        [:> context-wrapper*
+         {:is-workspace workspace?
+          :is-dashboard dashboard?
+          :is-viewer view?
+          :profile profile}
+         [:> login-dialog* {}]]
+        (when (get info :loaded false)
+          (if request-access?
+            [:> context-wrapper* {:is-workspace workspace?
+                                  :is-dashboard dashboard?
+                                  :is-viewer view?
+                                  :profile profile}
+             [:> request-access* {:file-id (:file-id info)
+                                  :team-id  (:team-id info)
+                                  :is-default (:team-default info)
+                                  :profile profile
+                                  :is-workspace workspace?}]]
+            [:> exception-section* props])))
 
+      [:> exception-section* props])))

frontend/src/app/main/ui/workspace/tokens/sets/lists.cljs

@@ -59,7 +59,7 @@
       :type "text"
       :on-blur on-submit
       :on-key-down on-key-down
-      :maxlength "256"
+      :max-length "256"
       :auto-focus true
       :placeholder (tr "workspace.tokens.set-edit-placeholder")
       :default-value default-value}]))
@@ -210,7 +210,7 @@
 
 (mf/defc sets-tree-set*
   [{:keys [id set label tree-depth tree-path tree-index is-selected is-active is-draggable is-editing
-           on-select on-drop on-toggle on-start-edition on-reset-edition on-edit-submit]}]
+           on-select on-drop on-toggle on-start-edition on-reset-edition on-edit-submit is-new]}]
 
   (let [set-name  (ctob/get-name set)
         can-edit? (mf/use-ctx ctx/can-edit?)
@@ -239,7 +239,11 @@
                          :path tree-path})))))
 
         on-double-click
-        (mf/use-fn (mf/deps id) #(on-start-edition id))
+        (mf/use-fn
+         (mf/deps id is-new)
+         (fn []
+           (when-not is-new
+             (on-start-edition id))))
 
         on-checkbox-click
         (mf/use-fn
@@ -392,7 +396,7 @@
           :is-editing true
           :is-active true
           :is-selected true
-
+          :is-new true
           :tree-path path
           :tree-depth depth
           :tree-index index
@@ -416,6 +420,7 @@
           :tree-path path
           :tree-depth depth
           :tree-index index
+          :is-new false
           :tree-parent-path parent-path
           :on-toggle on-toggle-set
           :edition-id edition-id