Merge remote-tracking branch 'origin/staging' into develop

CHANGES.md

@@ -27,6 +27,8 @@
 
 - Fix detach when top copy is dangling and nested copy is not [Taiga #9699](https://tree.taiga.io/project/penpot/issue/9699)
 - Fix problem in plugins with `replaceColor` method [#174](https://github.com/penpot/penpot-plugins/issues/174)
+- Fix missing methods reference on API Docs
+
 
 ## 2.4.1
 

backend/src/app/rpc/doc.clj

@@ -87,6 +87,7 @@
       (let [params  (:query-params request)
             pstyle  (:type params "js")
             context (assoc context :param-style pstyle)]
+
         {::yres/status 200
          ::yres/body (-> (io/resource "app/templates/api-doc.tmpl")
                          (tmpl/render context))}))
@@ -207,7 +208,7 @@
   (assert (sm/valid? ::rpc/methods (::rpc/methods params)) "expected valid methods"))
 
 (defmethod ig/init-key ::routes
-  [_ {:keys [methods] :as cfg}]
+  [_ {:keys [::rpc/methods] :as cfg}]
   [(let [context (prepare-doc-context methods)]
      [["/_doc"
        {:handler (doc-handler context)

frontend/src/app/main.cljs

@@ -30,20 +30,21 @@
    [app.util.i18n :as i18n]
    [app.util.theme :as theme]
    [beicon.v2.core :as rx]
-   [cuerdas.core :as str]
    [debug]
    [features]
    [potok.v2.core :as ptk]
    [rumext.v2 :as mf]))
 
 (log/setup! {:app :info})
+(log/set-level! :debug)
 
 (when (= :browser cf/target)
-  (log/info :version (:full cf/version)
+  (log/inf :version (:full cf/version)
            :asserts *assert*
            :build-date cf/build-date
            :public-uri (dm/str cf/public-uri))
-  (log/info :flags (str/join "," (map name cf/flags))))
+  (doseq [flag cf/flags]
+    (log/dbg :hint "flag enabled" :flag (name flag))))
 
 (declare reinit)
 

frontend/src/app/main/ui/dashboard/placeholder.cljs

@@ -7,6 +7,7 @@
 (ns app.main.ui.dashboard.placeholder
   (:require-macros [app.main.style :as stl])
   (:require
+   [app.config :as cf]
    [app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]]
    [app.main.ui.ds.product.loader :refer [loader*]]
    [app.main.ui.icons :as i]
@@ -44,7 +45,7 @@
       [:div {:class (stl/css :grid-empty-placeholder)}
        [:button {:class (stl/css :create-new)
                  :on-click on-click}
-        i/add]])))
+        (if (cf/external-feature-flag "add-file-01" "test") (tr "dashboard.add-file") i/add)]])))
 
 (mf/defc loading-placeholder
   []

frontend/src/app/main/ui/dashboard/placeholder.scss

@@ -48,7 +48,6 @@
     cursor: pointer;
     height: $s-160;
     margin: $s-8;
-    text-transform: uppercase;
     border: $s-2 solid transparent;
     width: var(--th-width, #{g.$thumbnail-default-width});
     height: var(--th-height, #{g.$thumbnail-default-height});

frontend/translations/en.po

@@ -6945,3 +6945,7 @@ msgstr "Notifications"
 
 msgid "comments.mentions.not-found"
 msgstr "No people found for @%s"
+
+#: src/app/main/ui/dashboard/placeholder.cljs:48
+msgid "dashboard.add-file"
+msgstr "Add file"

frontend/translations/es.po

@@ -394,6 +394,10 @@ msgstr "El token expirará el %s"
 msgid "dashboard.access-tokens.token-will-not-expire"
 msgstr "El token no tiene fecha de expiración"
 
+#: src/app/main/ui/dashboard/placeholder.cljs:48
+msgid "dashboard.add-file"
+msgstr "Añadir archivo"
+
 #: src/app/main/ui/dashboard/file_menu.cljs:311, src/app/main/ui/workspace/main_menu.cljs:585
 msgid "dashboard.add-shared"
 msgstr "Añadir como Biblioteca Compartida"