🐛 Add resolved value to tokens in plugins API

Because of regression introduced on undertow-core 2.3.19

.github/workflows/build-develop.yml

@@ -1,7 +1,6 @@
 name: _DEVELOP
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '16 5-20 * * 1-5'
 

.github/workflows/build-staging-render.yml

@@ -1,7 +1,6 @@
 name: _STAGING RENDER
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '36 5-20 * * 1-5'
 

.github/workflows/build-staging.yml

@@ -1,7 +1,6 @@
 name: _STAGING
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '36 5-20 * * 1-5'
 

.github/workflows/build-tag.yml

@@ -1,7 +1,6 @@
 name: _TAG
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - '*'

CHANGES.md

@@ -8,9 +8,6 @@
 
 ### :heart: Community contributions (Thank you!)
 
-- Option to download custom fonts (by @dfelinto) [Github #8320](https://github.com/penpot/penpot/issues/8320)
-- Add copy as image to clipboard option to workspace context menu (by @dfelinto) [Github #8313](https://github.com/penpot/penpot/pull/8313)
-
 ### :sparkles: New features & Enhancements
 
 - Access to design tokens in Penpot Plugins [Taiga #8990](https://tree.taiga.io/project/penpot/us/8990)
@@ -20,8 +17,6 @@
 - Optimize sidebar performance for deeply nested shapes [Taiga #13017](https://tree.taiga.io/project/penpot/task/13017)
 - Remove tokens path node and bulk remove tokens [Taiga #13007](https://tree.taiga.io/project/penpot/us/13007)
 - Replace themes management modal radio buttons for switches [Taiga #9215](https://tree.taiga.io/project/penpot/us/9215)
-- [MCP server] Integrations section [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
-- [Access Tokens] Look & feel refinement [Taiga #13114](https://tree.taiga.io/project/penpot/us/13114)
 
 ### :bug: Bugs fixed
 
@@ -39,14 +34,19 @@
 - Fix boolean operators in menu for boards [Taiga #13174](https://tree.taiga.io/project/penpot/issue/13174)
 - Fix viewer can update library [Taiga #13186](https://tree.taiga.io/project/penpot/issue/13186)
 - Fix remove fill affects different element than selected [Taiga #13128](https://tree.taiga.io/project/penpot/issue/13128)
-- Fix unable to finish the create account form using keyboard [Taiga #11333](https://tree.taiga.io/project/penpot/issue/11333)
+
+## 2.13.3
+
+### :bug: Bugs fixed
+
+- Revert yetti (http server) update, because that caused a regression on multipart uploads
 
 ## 2.13.2
 
 ### :bug: Bugs fixed
 
 - Fix modifying shapes by apply negative tokens to border radius [Taiga #13317](https://tree.taiga.io/project/penpot/issue/13317)
-- Fix security issue (Path Traversal Vulnerability) on fonts related RPC method
+- Fix arbitrary file read security issue on create-font-variant rpc method (https://github.com/penpot/penpot/security/advisories/GHSA-xp3f-g8rq-9px2)
 
 
 ## 2.13.1

backend/deps.edn

@@ -28,8 +28,8 @@
   com.google.guava/guava {:mvn/version "33.4.8-jre"}
 
   funcool/yetti
-  {:git/tag "v11.9"
-   :git/sha "5fad7a9"
+  {:git/tag "v11.8"
+   :git/sha "1d1b33f"
    :git/url "https://github.com/funcool/yetti.git"
    :exclusions [org.slf4j/slf4j-api]}
 

backend/src/app/http/sse.clj

@@ -53,7 +53,6 @@
      ::yres/status 200
      ::yres/body (yres/stream-body
                   (fn [_ output]
-
                     (let [channel  (sp/chan :buf buf :xf (keep encode))
                           listener (events/spawn-listener
                                     channel

backend/src/app/media.clj

@@ -54,7 +54,7 @@
    [:path ::fs/path]
    [:mtype {:optional true} ::sm/text]])
 
-(def check-input
+(def ^:private check-input
   (sm/check-fn schema:input))
 
 (defn validate-media-type!

backend/src/app/migrations.clj

@@ -463,10 +463,8 @@
     :fn (mg/resource "app/migrations/sql/0144-mod-server-error-report-table.sql")}
 
    {:name "0145-fix-plugins-uri-on-profile"
-    :fn mg0145/migrate}
+    :fn mg0145/migrate}])
 
-   {:name "0146-mod-access-token-table"
-    :fn (mg/resource "app/migrations/sql/0146-mod-access-token-table.sql")}])
 
 (defn apply-migrations!
   [pool name migrations]

backend/src/app/migrations/sql/0146-mod-access-token-table.sql

@@ -1,2 +0,0 @@
-ALTER TABLE access_token
- ADD COLUMN type text NULL;

backend/src/app/rpc.clj

@@ -73,13 +73,9 @@
                                      (if (nil? result)
                                        204
                                        200))
-
-                         headers (::http/headers mdata {})
-                         headers (cond-> headers
-                                   (and (yres/stream-body? result)
-                                        (not (contains? headers "content-type")))
+                         headers (cond-> (::http/headers mdata {})
+                                   (yres/stream-body? result)
                                    (assoc "content-type" "application/octet-stream"))]
-
                      {::yres/status  status
                       ::yres/headers headers
                       ::yres/body    result}))]

backend/src/app/rpc/commands/access_token.clj

@@ -23,7 +23,7 @@
   (dissoc row :perms))
 
 (defn create-access-token
-  [{:keys [::db/conn] :as cfg} profile-id name expiration type]
+  [{:keys [::db/conn] :as cfg} profile-id name expiration]
   (let [token-id   (uuid/next)
         expires-at (some-> expiration (ct/in-future))
         created-at (ct/now)
@@ -36,7 +36,6 @@
                                {:id token-id
                                 :name name
                                 :token token
-                                :type type
                                 :profile-id profile-id
                                 :created-at created-at
                                 :updated-at created-at
@@ -51,18 +50,17 @@
 (def ^:private schema:create-access-token
   [:map {:title "create-access-token"}
    [:name [:string {:max 250 :min 1}]]
-   [:expiration {:optional true} ::ct/duration]
-   [:type {:optional true} :string]])
+   [:expiration {:optional true} ::ct/duration]])
 
 (sv/defmethod ::create-access-token
   {::doc/added "1.18"
    ::sm/params schema:create-access-token}
-  [cfg {:keys [::rpc/profile-id name expiration type]}]
+  [cfg {:keys [::rpc/profile-id name expiration]}]
 
   (quotes/check! cfg {::quotes/id ::quotes/access-tokens-per-profile
                       ::quotes/profile-id profile-id})
 
-  (db/tx-run! cfg create-access-token profile-id name expiration type))
+  (db/tx-run! cfg create-access-token profile-id name expiration))
 
 (def ^:private schema:delete-access-token
   [:map {:title "delete-access-token"}
@@ -85,5 +83,5 @@
   (->> (db/query pool :access-token
                  {:profile-id profile-id}
                  {:order-by [[:expires-at :asc] [:created-at :asc]]
-                  :columns [:id :name :perms :type :created-at :updated-at :expires-at]})
+                  :columns [:id :name :perms :created-at :updated-at :expires-at]})
        (mapv decode-row)))

backend/src/app/rpc/commands/fonts.clj

@@ -9,14 +9,12 @@
    [app.binfile.common :as bfc]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
-   [app.common.media :as cmedia]
    [app.common.schema :as sm]
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.db.sql :as-alias sql]
    [app.features.logical-deletion :as ldel]
-   [app.http :as-alias http]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
    [app.media :as media]
@@ -36,9 +34,7 @@
    java.io.InputStream
    java.io.OutputStream
    java.io.SequenceInputStream
-   java.util.Collections
-   java.util.zip.ZipEntry
-   java.util.zip.ZipOutputStream))
+   java.util.Collections))
 
 (set! *warn-on-reflection* true)
 
@@ -300,98 +296,3 @@
     (rph/with-meta (rph/wrap)
       {::audit/props {:font-family (:font-family variant)
                       :font-id (:font-id variant)}})))
-
-;; --- DOWNLOAD FONT
-
-(defn- make-temporal-storage-object
-  [cfg profile-id content]
-  (let [storage (sto/resolve cfg)
-        content (media/check-input content)
-        hash    (sto/calculate-hash (:path content))
-        data    (-> (sto/content (:path content))
-                    (sto/wrap-with-hash hash))
-        mtype   (:mtype content "application/octet-stream")
-        content {::sto/content data
-                 ::sto/deduplicate? true
-                 ::sto/touched-at (ct/in-future {:minutes 30})
-                 :profile-id profile-id
-                 :content-type mtype
-                 :bucket "tempfile"}]
-
-    (sto/put-object! storage content)))
-
-(defn- make-variant-filename
-  [v mtype]
-  (str (:font-family v) "-" (:font-weight v)
-       (when-not (= "normal" (:font-style v)) (str "-" (:font-style v)))
-       (cmedia/mtype->extension mtype)))
-
-(def ^:private schema:download-font
-  [:map {:title "download-font"}
-   [:id ::sm/uuid]])
-
-(sv/defmethod ::download-font
-  "Download the font file. Returns a http redirect to the asset resource uri."
-  {::doc/added "2.15"
-   ::sm/params schema:download-font}
-  [{:keys [::sto/storage ::db/pool] :as cfg} {:keys [::rpc/profile-id id]}]
-  (let [variant (db/get pool :team-font-variant {:id id})]
-    (teams/check-read-permissions! pool profile-id (:team-id variant))
-
-    ;; Try to get the best available font format (prefer TTF for broader compatibility).
-    (let [media-id (or (:ttf-file-id variant)
-                       (:otf-file-id variant)
-                       (:woff2-file-id variant)
-                       (:woff1-file-id variant))
-          sobj     (sto/get-object storage media-id)
-          mtype    (-> sobj meta :content-type)]
-
-      {:id (:id sobj)
-       :uri (files/resolve-public-uri (:id sobj))
-       :name (make-variant-filename variant mtype)})))
-
-(def ^:private schema:download-font-family
-  [:map {:title "download-font-family"}
-   [:font-id ::sm/uuid]])
-
-(sv/defmethod ::download-font-family
-  "Download the entire font family as a zip file. Returns the zip
-  bytes on the body, without encoding it on transit or json."
-  {::doc/added "2.15"
-   ::sm/params schema:download-font-family}
-  [{:keys [::sto/storage ::db/pool] :as cfg} {:keys [::rpc/profile-id font-id]}]
-  (let [variants (db/query pool :team-font-variant
-                           {:font-id font-id
-                            :deleted-at nil})]
-
-    (when-not (seq variants)
-      (ex/raise :type :not-found
-                :code :object-not-found))
-
-    (teams/check-read-permissions! pool profile-id (:team-id (first variants)))
-
-    (let [tempfile (tmp/tempfile :suffix ".zip")
-          ffamily  (-> variants first :font-family)]
-
-      (with-open [^OutputStream output (io/output-stream tempfile)
-                  ^OutputStream output (ZipOutputStream. output)]
-        (doseq [v variants]
-          (let [media-id (or (:ttf-file-id v)
-                             (:otf-file-id v)
-                             (:woff2-file-id v)
-                             (:woff1-file-id v))
-                sobj     (sto/get-object storage media-id)
-                mtype    (-> sobj meta :content-type)
-                name     (make-variant-filename v mtype)]
-
-            (with-open [input (sto/get-object-data storage sobj)]
-              (.putNextEntry ^ZipOutputStream output (ZipEntry. ^String name))
-              (io/copy input output :size (:size sobj))
-              (.closeEntry ^ZipOutputStream output)))))
-
-      (let [{:keys [id] :as sobj} (make-temporal-storage-object cfg profile-id
-                                                                {:mtype "application/zip"
-                                                                 :path tempfile})]
-        {:id id
-         :uri (files/resolve-public-uri id)
-         :name (str ffamily ".zip")}))))

backend/src/app/rpc/commands/profile.clj

@@ -48,7 +48,6 @@
 (def schema:props
   [:map {:title "ProfileProps"}
    [:plugins {:optional true} schema:plugin-registry]
-   [:mcp-status {:optional true} ::sm/boolean]
    [:newsletter-updates {:optional true} ::sm/boolean]
    [:newsletter-news {:optional true} ::sm/boolean]
    [:onboarding-team-id {:optional true} ::sm/uuid]

backend/test/backend_tests/http_middleware_test.clj

@@ -102,7 +102,7 @@
 
 (t/deftest access-token-authz
   (let [profile (th/create-profile* 1)
-        token   (db/tx-run! th/*system* app.rpc.commands.access-token/create-access-token (:id profile) "test" nil nil)
+        token   (db/tx-run! th/*system* app.rpc.commands.access-token/create-access-token (:id profile) "test" nil)
         handler (#'app.http.access-token/wrap-authz identity th/*system*)]
 
     (let [response (handler nil)]

common/src/app/common/flags.cljc

@@ -152,9 +152,7 @@
     :redis-cache
 
     ;; Activates the nitrate module
-    :nitrate
-
-    :mcp})
+    :nitrate})
 
 (def all-flags
   (set/union email login varia))

frontend/src/app/config.cljs

@@ -147,9 +147,6 @@
   (let [f (obj/get global "initializeExternalConfigInfo")]
     (when (fn? f) (f))))
 
-(def mcp-server-url (-> public-uri u/ensure-path-slash (u/join "mcp") str))
-(def mcp-help-center-uri "https://help.penpot.app/technical-guide/")
-
 ;; --- Helper Functions
 
 (defn ^boolean check-browser? [candidate]

frontend/src/app/main/data/profile.cljs

@@ -498,3 +498,4 @@
         (->> (rp/cmd! :delete-access-token params)
              (rx/tap on-success)
              (rx/catch on-error))))))
+

frontend/src/app/main/data/workspace.cljs

@@ -1434,7 +1434,6 @@
 (dm/export dwcp/paste-shapes)
 (dm/export dwcp/paste-data-valid?)
 (dm/export dwcp/copy-link-to-clipboard)
-(dm/export dwcp/copy-as-image)
 
 ;; Drawing
 (dm/export dwd/select-for-drawing)

frontend/src/app/main/data/workspace/clipboard.cljs

@@ -1039,55 +1039,3 @@
     ptk/WatchEvent
     (watch [_ _ _]
       (clipboard/to-clipboard (rt/get-current-href)))))
-
-(defn copy-as-image
-  []
-  (ptk/reify ::copy-as-image
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [file-id  (:current-file-id state)
-            page-id  (:current-page-id state)
-            selected (first (dsh/lookup-selected state))
-
-            export {:file-id file-id
-                    :page-id page-id
-                    :object-id selected
-                    ;; webp would be preferrable, but PNG is the most supported image MIME type by clipboard APIs.
-                    :type :png
-                    ;; Always use 2 to ensure good enough quality for wireframes.
-                    :scale 2
-                    :suffix ""
-                    :enabled true
-                    :name ""}
-
-            params {:exports [export]
-                    :profile-id (:profile-id state)
-                    :cmd :export-shapes
-                    :wait true}]
-
-        (rx/concat
-         ;; Ensure current state persisted before exporting.
-         (rx/of ::dps/force-persist)
-         (->> (rx/from-atom refs/persistence-state {:emit-current-value? true})
-              (rx/filter #(or (nil? %) (= :saved %)))
-              (rx/first)
-              (rx/timeout 400 (rx/empty)))
-
-         ;; Exporting itself can time its time, better to notify that we are busy.
-         (rx/of (ntf/info (tr "workspace.clipboard.copying")))
-
-         ;; Call exporter to get image URI, then fetch and copy blob.
-         (->> (rp/cmd! :export params)
-              (rx/mapcat (fn [{:keys [uri]}]
-                           (http/send! {:method :get
-                                        :uri uri
-                                        :response-type :blob})))
-              (rx/map :body)
-              (rx/tap (fn [blob]
-                        (clipboard/to-clipboard-promise "image/png" (p/resolved blob))))
-              (rx/map (fn [_]
-                        (ntf/success (tr "workspace.clipboard.image-copied"))))
-              (rx/catch (fn [e]
-                          (js/console.error "clipboard blocked:" e)
-                          (ntf/error (tr "workspace.clipboard.image-copy-failed"))
-                          (rx/empty)))))))))

frontend/src/app/main/ui.cljs

@@ -197,7 +197,7 @@
         :settings-options
         :settings-feedback
         :settings-subscription
-        :settings-integrations
+        :settings-access-tokens
         :settings-notifications)
        (let [params (get params :query)
              error-report-id (some-> params :error-report-id uuid/parse*)]

frontend/src/app/main/ui/components/dropdown_menu.cljs

@@ -78,7 +78,7 @@
                 (kbd/enter? event)
                 (let [selected (dom/get-active)]
                   (dom/prevent-default event)
-                  (dom/click selected))
+                  (dom/click! selected))
 
                 (kbd/tab? event)
                 (on-close)))))]

frontend/src/app/main/ui/components/forms.cljs

@@ -32,7 +32,6 @@
         input-name   (get props :name)
         more-classes (get props :class)
         auto-focus?  (get props :auto-focus? false)
-        input-ref    (mf/use-ref nil)
 
         data-testid  (d/nilv data-testid input-name)
 
@@ -83,6 +82,7 @@
                       (swap! form assoc-in [:touched input-name] true)
                       (fm/on-input-change form input-name value trim)
                       (on-change-value name value)))
+
         on-blur
         (fn [_]
           (reset! focus? false))
@@ -92,18 +92,9 @@
           (when-not (get-in @form [:touched input-name])
             (swap! form assoc-in [:touched input-name] true)))
 
-        on-key-press
-        (mf/use-fn
-         (mf/deps input-ref)
-         (fn [e]
-           (dom/prevent-default e)
-           (when (kbd/space? e)
-             (dom/click (mf/ref-val input-ref)))))
-
         props (-> props
                   (dissoc :help-icon :form :trim :children :show-success? :auto-focus? :label)
                   (assoc :id (name input-name)
-                         :ref input-ref
                          :value value
                          :auto-focus auto-focus?
                          :on-click (when (or is-radio? is-checkbox?) on-click)
@@ -140,7 +131,7 @@
                  :for (name input-name)} label
 
          (when is-checkbox?
-           [:span {:class (stl/css-case :global/checked checked?) :tab-index "0" :on-key-press on-key-press} (when checked? deprecated-icon/status-tick)])
+           [:span {:class (stl/css-case :global/checked checked?)} (when checked? deprecated-icon/status-tick)])
 
          (if is-checkbox?
            [:> :input props]

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

@@ -9,17 +9,14 @@
   (:require
    [app.main.data.modal :as modal]
    [app.main.store :as st]
-   [app.main.ui.ds.buttons.button :refer [button*]]
-   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
-   [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
    [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
+   [app.main.ui.icons :as deprecated-icon]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.keyboard :as k]
    [goog.events :as events]
    [rumext.v2 :as mf])
-  (:import
-   goog.events.EventType))
+  (:import goog.events.EventType))
 
 (mf/defc confirm-dialog
   {::mf/register modal/components
@@ -71,11 +68,8 @@
      [:div {:class (stl/css :modal-container)}
       [:div {:class (stl/css :modal-header)}
        [:h2 {:class (stl/css :modal-title)} title]
-       [:div {:class (stl/css :modal-close-btn)}
-        [:> icon-button* {:variant "ghost"
-                          :aria-label (tr "labels.close")
-                          :on-click cancel-fn
-                          :icon i/close}]]]
+       [:button {:class (stl/css :modal-close-btn)
+                 :on-click cancel-fn} deprecated-icon/close]]
 
       [:div {:class (stl/css :modal-content)}
        (when (and (string? message) (not= message ""))
@@ -93,19 +87,24 @@
           [:ul {:class (stl/css :component-list)}
            (for [item items]
              [:li {:class (stl/css :modal-item-element)}
-              [:> icon* {:icon-id i/component
-                         :class (stl/css :modal-component-icon)
-                         :size "s"}]
+              [:span {:class (stl/css :modal-component-icon)}
+               deprecated-icon/component]
               [:span {:class (stl/css :modal-component-name)}
                (:name item)]])]])]
 
       [:div {:class (stl/css :modal-footer)}
        [:div {:class (stl/css :action-buttons)}
         (when-not (= cancel-label :omit)
-          [:> button* {:variant "secondary"
-                       :on-click cancel-fn}
-           cancel-label])
-        [:> button* {:variant (cond (= accept-style :danger)  "destructive"
-                                    (= accept-style :primary) "primary")
-                     :on-click accept-fn}
-         accept-label]]]]]))
+          [:input
+           {:class (stl/css :cancel-button)
+            :type "button"
+            :value cancel-label
+            :on-click cancel-fn}])
+
+        [:input
+         {:class (stl/css-case :accept-btn true
+                               :danger (= accept-style :danger)
+                               :primary (= accept-style :primary))
+          :type "button"
+          :value accept-label
+          :on-click accept-fn}]]]]]))

frontend/src/app/main/ui/confirm.scss

@@ -15,9 +15,10 @@
 
 .modal-container {
   @extend .modal-container-base;
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-xxl);
+}
+
+.modal-header {
+  margin-bottom: deprecated.$s-24;
 }
 
 .modal-title {
@@ -26,13 +27,12 @@
 }
 
 .modal-close-btn {
-  position: absolute;
-  top: var(--sp-m);
-  right: var(--sp-m);
+  @extend .modal-close-btn-base;
 }
 
 .modal-content {
   @include deprecated.bodyLargeTypography;
+  margin-bottom: deprecated.$s-24;
 }
 
 .modal-item-element {
@@ -41,18 +41,32 @@
 
 .modal-component-icon {
   @include deprecated.flexCenter;
-  color: var(--color-foreground-secondary);
+  height: deprecated.$s-16;
+  width: deprecated.$s-16;
+  svg {
+    @extend .button-icon-small;
+    stroke: var(--color);
+  }
 }
-
 .modal-component-name {
   @include deprecated.bodyLargeTypography;
-  color: var(--color-foreground-secondary);
 }
 
 .action-buttons {
   @extend .modal-action-btns;
 }
 
+.cancel-button {
+  @extend .modal-cancel-btn;
+}
+
+.accept-btn {
+  @extend .modal-accept-btn;
+  &.danger {
+    @extend .modal-danger-btn;
+  }
+}
+
 .modal-scd-msg,
 .modal-subtitle,
 .modal-msg {

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

@@ -7,7 +7,6 @@
 (ns app.main.ui.dashboard.fonts
   (:require-macros [app.main.style :as stl])
   (:require
-   [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.media :as cm]
    [app.common.uuid :as uuid]
@@ -23,7 +22,6 @@
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.notifications.context-notification :refer [context-notification]]
    [app.util.dom :as dom]
-   [app.util.http :as http]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.keyboard :as kbd]
    [beicon.v2.core :as rx]
@@ -261,14 +259,11 @@
 (mf/defc installed-font-context-menu
   {::mf/props :obj
    ::mf/private true}
-  [{:keys [is-open on-close on-edit on-download on-delete]}]
-  (let [options (mf/with-memo [on-edit on-download on-delete]
+  [{:keys [is-open on-close on-edit on-delete]}]
+  (let [options (mf/with-memo [on-edit on-delete]
                   [{:name    (tr "labels.edit")
                     :id      "font-edit"
                     :handler on-edit}
-                   {:name    (tr "labels.download-simple")
-                    :id      "font-download"
-                    :handler on-download}
                    {:name    (tr "labels.delete")
                     :id      "font-delete"
                     :handler on-delete}])]
@@ -350,26 +345,6 @@
                                          (st/emit! (df/delete-font font-id)))}]
              (st/emit! (modal/show options)))))
 
-        on-download
-        (mf/use-fn
-         (mf/deps variants)
-         (fn [_event]
-           (let [variant    (first variants)
-                 variant-id (:id variant)
-                 multiple?  (> (count variants) 1)
-                 cmd        (if multiple? :download-font-family :download-font)
-                 params     (if multiple? {:font-id font-id} {:id variant-id})]
-             (->> (rp/cmd! cmd params)
-                  (rx/mapcat (fn [{:keys [name uri]}]
-                               (->> (http/send! {:uri uri :method :get :response-type :blob})
-                                    (rx/map :body)
-                                    (rx/map (fn [blob] (d/vec2 name blob))))))
-                  (rx/subs! (fn [[filename blob]]
-                              (dom/trigger-download filename blob))
-                            (fn [error]
-                              (js/console.error "error downloading font" error)
-                              (st/emit! (ntf/error (tr "errors.download-font")))))))))
-
         on-delete-variant
         (mf/use-fn
          (fn [event]
@@ -432,7 +407,6 @@
            {:on-close on-menu-close
             :is-open menu-open?
             :on-delete on-delete-font
-            :on-download on-download
             :on-edit on-edit}]]))]))
 
 (mf/defc installed-fonts*

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

@@ -77,7 +77,7 @@
         (mf/use-ref nil)
 
         on-import-files
-        (fn [] (dom/click (mf/ref-val file-input)))
+        (fn [] (dom/click! (mf/ref-val file-input)))
 
         on-finish-import
         (mf/use-fn

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

@@ -30,13 +30,10 @@
    [app.main.ui.dashboard.subscription :refer [dashboard-cta*
                                                get-subscription-type
                                                menu-team-icon*
-                                               nitrate-sidebar*
                                                show-subscription-dashboard-banner?
                                                subscription-sidebar*]]
    [app.main.ui.dashboard.team-form]
-   [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
-   [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*]]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.nitrate.nitrate-form]
    [app.util.dom :as dom]
@@ -77,8 +74,6 @@
 (def ^:private exit-icon
   (deprecated-icon/icon-xref :exit (stl/css :exit-icon)))
 
-(def ^:private ^:svg-id penpot-logo-icon "penpot-logo-icon")
-
 (mf/defc sidebar-project*
   {::mf/private true}
   [{:keys [item is-selected]}]
@@ -502,23 +497,18 @@
 
 (mf/defc sidebar-org-switch*
   [{:keys [team profile]}]
-  (let [teams (mf/deref refs/teams)
-        orgs  (mf/with-memo [teams]
-                (let [orgs (->> teams
-                                vals
-                                (group-by :organization-id)
-                                (map (fn [[_group entries]] (first entries)))
-                                vec
-                                (d/index-by :id))]
-                  (update-vals orgs
-                               (fn [t]
-                                 (assoc t :name (str "ORG: " (:organization-name t)))))))
+  (let [teams (->> (mf/deref refs/teams)
+                   vals
+                   (group-by :organization-id)
+                   (map (fn [[_group entries]] (first entries)))
+                   vec
+                   (d/index-by :id))
 
-        empty? (= (count orgs) 1)
+        teams (update-vals teams
+                           (fn [t]
+                             (assoc t :name (str "ORG: " (:organization-name t)))))
 
-
-        current-org (mf/with-memo [team]
-                      (assoc team :name (str "ORG: " (:organization-name team))))
+        team (assoc team :name (str "ORG: " (:organization-name team)))
 
         show-teams-menu*
         (mf/use-state false)
@@ -540,53 +530,36 @@
              (dom/prevent-default event)
              (dom/stop-propagation event)
              (some-> (dom/get-current-target event)
-                     (dom/click)))))
+                     (dom/click!)))))
         close-teams-menu
-        (mf/use-fn #(reset! show-teams-menu* false))
+        (mf/use-fn #(reset! show-teams-menu* false))]
 
-        on-create-org-click
-        (mf/use-fn
-         (fn []
-           (if (:nitrate-licence profile)
-             ;; TODO update when org creation route is ready
-             (dom/open-new-window "/control-center/org/create")
-             (st/emit! (modal/show :nitrate-form {})))))]
-    (if empty?
-      [:div {:class (stl/css :nitrate-orgs-empty)}
-       [:span {:class (stl/css :nitrate-penpot-icon)}
-        [:> raw-svg* {:id penpot-logo-icon}]]
-       "Penpot"
-       [:> button* {:variant "ghost"
-                    :type "button"
-                    :class (stl/css :nitrate-create-org)
-                    :on-click on-create-org-click} (tr "dashboard.create-new-org")]]
+    [:div {:class (stl/css :sidebar-team-switch)}
+     [:div {:class (stl/css :switch-content)}
+      [:button {:class (stl/css :current-team)
+                :on-click on-show-teams-click
+                :on-key-down on-show-teams-keydown}
 
-      [:div {:class (stl/css :sidebar-team-switch)}
-       [:div {:class (stl/css :switch-content)}
-        [:button {:class (stl/css :current-team)
-                  :on-click on-show-teams-click
-                  :on-key-down on-show-teams-keydown}
+       [:div {:class (stl/css :team-name)}
+        [:img {:src (cf/resolve-team-photo-url team)
+               :class (stl/css :team-picture)
+               :alt (:name team)}]
+        [:span {:class (stl/css :team-text) :title (:name team)} (:name team)]]
 
-         [:div {:class (stl/css :team-name)}
-          [:img {:src (cf/resolve-team-photo-url current-org)
-                 :class (stl/css :team-picture)
-                 :alt (:name current-org)}]
-          [:span {:class (stl/css :team-text) :title (:name current-org)} (:name current-org)]]
+       arrow-icon]]
 
-         arrow-icon]]
+     ;; Teams Dropdown
 
-       ;; Teams Dropdown
-
-       [:> teams-selector-dropdown* {:show show-teams-menu?
-                                     :on-close close-teams-menu
-                                     :id "organizations-list"
-                                     :class (stl/css :dropdown :teams-dropdown)
-                                     :team current-org
-                                     :profile profile
-                                     :teams orgs
-                                     :show-default-team false
-                                     :allow-create-teams false
-                                     :allow-create-org true}]])))
+     [:> teams-selector-dropdown* {:show show-teams-menu?
+                                   :on-close close-teams-menu
+                                   :id "organizations-list"
+                                   :class (stl/css :dropdown :teams-dropdown)
+                                   :team team
+                                   :profile profile
+                                   :teams teams
+                                   :show-default-team false
+                                   :allow-create-teams false
+                                   :allow-create-org true}]]))
 
 (mf/defc sidebar-team-switch*
   [{:keys [team profile]}]
@@ -628,7 +601,7 @@
              (dom/prevent-default event)
              (dom/stop-propagation event)
              (some-> (dom/get-current-target event)
-                     (dom/click)))))
+                     (dom/click!)))))
 
         close-team-options-menu
         (mf/use-fn #(reset! show-team-options-menu* false))
@@ -648,7 +621,7 @@
              (dom/stop-propagation event)
 
              (some-> (dom/get-current-target event)
-                     (dom/click)))))
+                     (dom/click!)))))
 
         close-teams-menu
         (mf/use-fn #(reset! show-teams-menu* false))]
@@ -732,8 +705,6 @@
         overflow*   (mf/use-state false)
         overflow?   (deref overflow*)
 
-        nitrate?    (contains? cf/flags :nitrate)
-
         go-projects
         (mf/use-fn #(st/emit! (dcm/go-to-dashboard-recent)))
 
@@ -822,71 +793,70 @@
         (reset! overflow* (> scroll-height client-height))))
 
     [:*
-     [:div {:ref container}
-      (when nitrate?
-        [:div {:class (stl/css :nitrate-orgs-container)}
-         [:> sidebar-org-switch* {:team team :profile profile}]])
-      [:div {:class (stl/css-case :sidebar-content true :sidebar-content-nitrate nitrate?)}
-       [:> sidebar-team-switch* {:team team :profile profile}]
+     [:div {:class (stl/css-case :sidebar-content true)
+            :ref container}
+      (when (contains? cf/flags :nitrate)
+        [:> sidebar-org-switch* {:team team :profile profile}])
+      [:> sidebar-team-switch* {:team team :profile profile}]
 
-       [:> sidebar-search* {:search-term search-term
-                            :team-id (:id team)}]
+      [:> sidebar-search* {:search-term search-term
+                           :team-id (:id team)}]
 
-       [:div {:class (stl/css :sidebar-content-section)}
-        [:ul {:class (stl/css :sidebar-nav)}
-         [:li {:class (stl/css-case :recent-projects true
-                                    :sidebar-nav-item true
-                                    :current projects?)}
-          [:& link {:action go-projects
-                    :class (stl/css :sidebar-link)
-                    :keyboard-action go-projects-with-key}
-           [:span {:class (stl/css :element-title)} (tr "labels.projects")]]]
+      [:div {:class (stl/css :sidebar-content-section)}
+       [:ul {:class (stl/css :sidebar-nav)}
+        [:li {:class (stl/css-case :recent-projects true
+                                   :sidebar-nav-item true
+                                   :current projects?)}
+         [:& link {:action go-projects
+                   :class (stl/css :sidebar-link)
+                   :keyboard-action go-projects-with-key}
+          [:span {:class (stl/css :element-title)} (tr "labels.projects")]]]
 
-         [:li {:class (stl/css-case :current drafts?
-                                    :sidebar-nav-item true)}
-          [:& link {:action go-drafts
-                    :class (stl/css :sidebar-link)
-                    :keyboard-action go-drafts-with-key}
-           [:span {:class (stl/css :element-title)} (tr "labels.drafts")]]]]]
+        [:li {:class (stl/css-case :current drafts?
+                                   :sidebar-nav-item true)}
+         [:& link {:action go-drafts
+                   :class (stl/css :sidebar-link)
+                   :keyboard-action go-drafts-with-key}
+          [:span {:class (stl/css :element-title)} (tr "labels.drafts")]]]]]
 
 
-       [:div {:class (stl/css :sidebar-content-section)}
-        [:div {:class (stl/css :sidebar-section-title)}
-         (tr "labels.sources")]
-        [:ul {:class (stl/css :sidebar-nav)}
-         [:li {:class (stl/css-case :sidebar-nav-item true
-                                    :current fonts?)}
-          [:& link {:action go-fonts
-                    :class (stl/css :sidebar-link)
-                    :keyboard-action go-fonts-with-key
-                    :data-testid "fonts"}
-           [:span {:class (stl/css :element-title)} (tr "labels.fonts")]]]
-         [:li {:class (stl/css-case :current libs?
-                                    :sidebar-nav-item true)}
-          [:& link {:action go-libs
-                    :data-testid "libs-link-sidebar"
-                    :class (stl/css :sidebar-link)
-                    :keyboard-action go-libs-with-key}
-           [:span {:class (stl/css :element-title)} (tr "labels.shared-libraries")]]]]]
+      [:div {:class (stl/css :sidebar-content-section)}
+       [:div {:class (stl/css :sidebar-section-title)}
+        (tr "labels.sources")]
+       [:ul {:class (stl/css :sidebar-nav)}
+        [:li {:class (stl/css-case :sidebar-nav-item true
+                                   :current fonts?)}
+         [:& link {:action go-fonts
+                   :class (stl/css :sidebar-link)
+                   :keyboard-action go-fonts-with-key
+                   :data-testid "fonts"}
+          [:span {:class (stl/css :element-title)} (tr "labels.fonts")]]]
+        [:li {:class (stl/css-case :current libs?
+                                   :sidebar-nav-item true)}
+         [:& link {:action go-libs
+                   :data-testid "libs-link-sidebar"
+                   :class (stl/css :sidebar-link)
+                   :keyboard-action go-libs-with-key}
+          [:span {:class (stl/css :element-title)} (tr "labels.shared-libraries")]]]]]
 
 
-       [:div {:class (stl/css :sidebar-content-section)
-              :data-testid "pinned-projects"}
-        [:div {:class (stl/css :sidebar-section-title)}
-         (tr "labels.pinned-projects")]
-        (if (some? pinned-projects)
-          [:ul {:class (stl/css :sidebar-nav :pinned-projects)}
-           (for [item pinned-projects]
-             [:> sidebar-project*
-              {:item item
-               :key (dm/str (:id item))
-               :id (:id item)
-               :team-id (:id team)
-               :is-selected (= (:id item) (:id project))}])]
-          [:div {:class (stl/css :sidebar-empty-placeholder)}
-           pin-icon
-           [:span {:class (stl/css :empty-text)} (tr "dashboard.no-projects-placeholder")]])]]
-      [:div {:class (stl/css-case :separator true :overflow-separator overflow?)}]]]))
+      [:div {:class (stl/css :sidebar-content-section)
+             :data-testid "pinned-projects"}
+       [:div {:class (stl/css :sidebar-section-title)}
+        (tr "labels.pinned-projects")]
+       (if (some? pinned-projects)
+         [:ul {:class (stl/css :sidebar-nav :pinned-projects)}
+          (for [item pinned-projects]
+            [:> sidebar-project*
+             {:item item
+              :key (dm/str (:id item))
+              :id (:id item)
+              :team-id (:id team)
+              :is-selected (= (:id item) (:id project))}])]
+         [:div {:class (stl/css :sidebar-empty-placeholder)}
+          pin-icon
+          [:span {:class (stl/css :empty-text)} (tr "dashboard.no-projects-placeholder")]])]]
+     [:div {:class (stl/css-case :separator true :overflow-separator overflow?)}]]))
 
 (mf/defc help-learning-menu*
   {::mf/props :obj
@@ -1086,13 +1056,10 @@
            (dom/open-new-window "https://penpot.app/pricing")))]
 
     [:*
-     (if (contains? cf/flags :nitrate)
-       (when-not (:nitrate-licence profile)
-         [:> nitrate-sidebar* {:profile profile}])
-       (when (contains? cf/flags :subscriptions)
-         (if (show-subscription-dashboard-banner? profile)
-           [:> dashboard-cta* {:profile profile}]
-           [:> subscription-sidebar* {:profile profile}])))
+     (when (contains? cf/flags :subscriptions)
+       (if (show-subscription-dashboard-banner? profile)
+         [:> dashboard-cta* {:profile profile}]
+         [:> subscription-sidebar* {:profile profile}]))
 
      ;; TODO remove this block when subscriptions is full implemented
      (when (contains? cf/flags :subscriptions-old)

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

@@ -40,11 +40,6 @@
   overflow-y: auto;
 }
 
-.sidebar-content-nitrate {
-  padding: var(--sp-m) 0 0 0;
-  border-block-start: $b-1 solid var(--color-background-quaternary);
-}
-
 .separator {
   height: var(--sp-xxs);
   width: 94%;
@@ -519,44 +514,3 @@
   @include t.use-typography("body-small");
   color: var(--color-accent-tertiary);
 }
-
-.nitrate-orgs-container {
-  align-items: center;
-  display: flex;
-  height: calc(2 * var(--sp-xxxl));
-  max-height: calc(2 * var(--sp-xxxl));
-  justify-content: space-between;
-  padding: var(--sp-xs) var(--sp-l) var(--sp-xs) var(--sp-s);
-  // border-block-end: $b-1 solid var(--color-background-quaternary);
-}
-
-.nitrate-orgs-empty {
-  @include t.use-typography("body-medium");
-  color: var(--color-foreground-primary);
-  width: 100%;
-  margin: var(--sp-xs) var(--sp-l);
-  display: flex;
-  align-items: center;
-  gap: var(--sp-s);
-}
-
-.nitrate-create-org {
-  margin-inline-start: auto;
-  text-transform: uppercase;
-}
-
-.nitrate-penpot-icon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 50%;
-  height: var(--sp-xxxl);
-  width: var(--sp-xxxl);
-  background-color: var(--color-foreground-primary);
-
-  svg {
-    fill: var(--icon-stroke-color);
-    width: var(--sp-xxl);
-    height: var(--sp-xxl);
-  }
-}

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

@@ -6,7 +6,6 @@
    [app.common.data.macros :as dm]
    [app.config :as cf]
    [app.main.data.event :as ev]
-   [app.main.data.modal :as modal]
    [app.main.router :as rt]
    [app.main.store :as st]
    [app.main.ui.components.dropdown-menu :refer [dropdown-menu-item*]]
@@ -116,26 +115,6 @@
           :has-dropdown false
           :is-highlighted false}]))))
 
-(mf/defc nitrate-sidebar*
-  []
-  (let [handle-click
-        (mf/use-fn
-         (fn []
-           (st/emit! (modal/show :nitrate-form {}))))]
-
-    ;; TODO add translations for this texts when we have the definitive ones
-    [:div {:class (stl/css :nitrate-banner :highlighted)}
-
-     [:div {:class (stl/css :nitrate-content)}
-      [:span {:class (stl/css :nitrate-title)} "Unlock Nitrate features"]]
-     [:div {:class (stl/css :nitrate-content)}
-
-      [:span {:class (stl/css :nitrate-info)} "Some further information and explanation."]
-      [:> button* {:variant "primary"
-                   :type "button"
-                   :class (stl/css :cta-bottom-button)
-                   :on-click handle-click} "UPGRADE TO NITRATE"]]]))
-
 (mf/defc team*
   [{:keys [is-owner team]}]
   (let [subscription          (:subscription team)

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

@@ -205,28 +205,3 @@
     overflow-wrap: break-word;
   }
 }
-
-.nitrate-banner {
-  display: flex;
-  border-radius: var(--sp-s);
-  flex-direction: column;
-  margin: var(--sp-m);
-  background: var(--color-background-quaternary);
-  border: $b-1 solid var(--color-accent-primary-muted);
-  padding: var(--sp-l);
-}
-
-.nitrate-title {
-  @include t.use-typography("body-large");
-  color: var(--color-foreground-primary);
-}
-
-.nitrate-info {
-  @include t.use-typography("body-medium");
-  color: var(--color-foreground-secondary);
-}
-
-.nitrate-content {
-  display: flex;
-  flex-direction: column;
-}

frontend/src/app/main/ui/ds/_sizes.scss

@@ -18,7 +18,6 @@ $sz-32: px2rem(32);
 $sz-36: px2rem(36);
 $sz-40: px2rem(40);
 $sz-48: px2rem(48);
-$sz-64: px2rem(64);
 $sz-88: px2rem(88);
 $sz-96: px2rem(96);
 $sz-120: px2rem(120);

frontend/src/app/main/ui/ds/controls/input.cljs

@@ -8,6 +8,7 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.main.constants :refer [max-input-length]]
    [app.main.ui.ds.controls.utilities.hint-message :refer [hint-message*]]
    [app.main.ui.ds.controls.utilities.input-field :refer [input-field*]]
@@ -51,11 +52,10 @@
                                       :has-hint has-hint
                                       :hint-type hint-type
                                       :variant variant})]
-
-    [:div {:class [class (stl/css-case :input-wrapper true
-                                       :variant-dense (= variant "dense")
-                                       :variant-comfortable (= variant "comfortable")
-                                       :has-hint has-hint)]}
+    [:div {:class (dm/str class " " (stl/css-case :input-wrapper true
+                                                  :variant-dense (= variant "dense")
+                                                  :variant-comfortable (= variant "comfortable")
+                                                  :has-hint has-hint))}
      (when has-label
        [:> label* {:for id :is-optional is-optional} label])
      [:> input-field* props]
@@ -64,3 +64,4 @@
                           :class hint-class
                           :message hint-message
                           :type hint-type}])]))
+

frontend/src/app/main/ui/ds/controls/utilities/input_field.cljs

@@ -84,7 +84,6 @@
                   :on-click on-icon-click}])
      (if aria-label
        [:> tooltip* {:content aria-label
-                     :class (stl/css :tooltip-wrapper)
                      :id tooltip-id}
         [:> "input" props]]
        [:> "input" props])

frontend/src/app/main/ui/ds/controls/utilities/input_field.scss

@@ -120,7 +120,3 @@
   color: var(--color-foreground-secondary);
   min-inline-size: var(--sp-l);
 }
-
-.tooltip-wrapper {
-  inline-size: 100%;
-}

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

@@ -8,7 +8,6 @@
   (:require
    [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.controls.input :refer [input*]]
-   [app.main.ui.ds.controls.select :refer [select*]]
    [app.util.dom :as dom]
    [app.util.forms :as fm]
    [app.util.keyboard :as k]
@@ -48,23 +47,6 @@
 
     [:> input* props]))
 
-(mf/defc form-select*
-  [{:keys [name] :as props}]
-  (let [select-name name
-        form        (mf/use-ctx context)
-        value       (get-in @form [:data select-name] "")
-
-        handle-change
-        (fn [event]
-          (let [value (if (string? event) event (dom/get-target-val event))]
-            (fm/on-input-change form select-name value)))
-
-        props
-        (mf/spread-props props {:on-change handle-change
-                                :value value})]
-
-    [:> select* props]))
-
 (mf/defc form-submit*
   [{:keys [disabled on-submit] :rest props}]
   (let [form      (mf/use-ctx context)
@@ -97,4 +79,4 @@
                       (when (fn? on-submit)
                         (on-submit form event))))]
     [:> (mf/provider context) {:value form}
-     [:form {:class class :on-submit on-submit'} children]]))
+     [:form {:class class :on-submit on-submit'} children]]))

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

@@ -36,7 +36,7 @@
     ["/feedback"      :settings-feedback]
     ["/options"       :settings-options]
     ["/subscriptions" :settings-subscription]
-    ["/integrations"  :settings-integrations]
+    ["/access-tokens" :settings-access-tokens]
     ["/notifications" :settings-notifications]]
 
    ["/frame-preview" :frame-preview]

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

@@ -13,10 +13,10 @@
    [app.main.store :as st]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.modal :refer [modal-container*]]
+   [app.main.ui.settings.access-tokens :refer [access-tokens-page]]
    [app.main.ui.settings.change-email]
    [app.main.ui.settings.delete-account]
    [app.main.ui.settings.feedback :refer [feedback-page*]]
-   [app.main.ui.settings.integrations :refer [integrations-page*]]
    [app.main.ui.settings.notifications :refer [notifications-page*]]
    [app.main.ui.settings.options :refer [options-page]]
    [app.main.ui.settings.password :refer [password-page]]
@@ -73,8 +73,8 @@
           :settings-subscription
           [:> subscription-page* {:profile profile}]
 
-          :settings-integrations
-          [:> integrations-page*]
+          :settings-access-tokens
+          [:& access-tokens-page]
 
           :settings-notifications
           [:& notifications-page* {:profile profile}])]]]]))

frontend/src/app/main/ui/settings/access_tokens.cljs

@@ -0,0 +1,291 @@
+;; 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 INC
+
+(ns app.main.ui.settings.access-tokens
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.schema :as sm]
+   [app.common.time :as ct]
+   [app.main.data.modal :as modal]
+   [app.main.data.notifications :as ntf]
+   [app.main.data.profile :as du]
+   [app.main.store :as st]
+   [app.main.ui.components.context-menu-a11y :refer [context-menu*]]
+   [app.main.ui.components.forms :as fm]
+   [app.main.ui.icons :as deprecated-icon]
+   [app.util.clipboard :as clipboard]
+   [app.util.dom :as dom]
+   [app.util.i18n :as i18n :refer [tr]]
+   [app.util.keyboard :as kbd]
+   [okulary.core :as l]
+   [rumext.v2 :as mf]))
+
+(def ^:private clipboard-icon
+  (deprecated-icon/icon-xref :clipboard (stl/css :clipboard-icon)))
+
+(def ^:private close-icon
+  (deprecated-icon/icon-xref :close (stl/css :close-icon)))
+
+(def ^:private menu-icon
+  (deprecated-icon/icon-xref :menu (stl/css :menu-icon)))
+
+(def tokens-ref
+  (l/derived :access-tokens st/state))
+
+(def token-created-ref
+  (l/derived :access-token-created st/state))
+
+(def ^:private schema:form
+  [:map {:title "AccessTokenForm"}
+   [:name [::sm/text {:max 250}]]
+   [:expiration-date [::sm/text {:max 250}]]])
+
+(def initial-data
+  {:name "" :expiration-date "never"})
+
+(mf/defc access-token-modal
+  {::mf/register modal/components
+   ::mf/register-as :access-token}
+  []
+  (let [form    (fm/use-form
+                 :initial initial-data
+                 :schema schema:form)
+
+        created  (mf/deref token-created-ref)
+        created? (mf/use-state false)
+
+        on-success
+        (mf/use-fn
+         (mf/deps created)
+         (fn [_]
+           (let [message (tr "dashboard.access-tokens.create.success")]
+             (st/emit! (du/fetch-access-tokens)
+                       (ntf/success message)
+                       (reset! created? true)))))
+
+        on-close
+        (mf/use-fn
+         (mf/deps created)
+         (fn [_]
+           (reset! created? false)
+           (st/emit! (modal/hide))))
+
+        on-error
+        (mf/use-fn
+         (fn [_]
+           (st/emit! (ntf/error (tr "errors.generic"))
+                     (modal/hide))))
+
+        on-submit
+        (mf/use-fn
+         (fn [form]
+           (let [cdata      (:clean-data @form)
+                 mdata      {:on-success (partial on-success form)
+                             :on-error   (partial on-error form)}
+                 expiration (:expiration-date cdata)
+                 params     (cond-> {:name       (:name cdata)
+                                     :perms      (:perms cdata)}
+                              (not= "never" expiration) (assoc :expiration expiration))]
+             (st/emit! (du/create-access-token
+                        (with-meta params mdata))))))
+
+        copy-token
+        (mf/use-fn
+         (mf/deps created)
+         (fn [event]
+           (dom/prevent-default event)
+           (clipboard/to-clipboard (:token created))
+           (st/emit! (ntf/show {:level :info
+                                :type :toast
+                                :content (tr "dashboard.access-tokens.copied-success")
+                                :timeout 7000}))))]
+
+    [:div {:class (stl/css :modal-overlay)}
+     [:div {:class (stl/css :modal-container)}
+      [:& fm/form {:form form :on-submit on-submit}
+
+       [:div {:class (stl/css :modal-header)}
+        [:h2 {:class (stl/css :modal-title)} (tr "modals.create-access-token.title")]
+
+        [:button {:class (stl/css :modal-close-btn)
+                  :on-click on-close}
+         close-icon]]
+
+       [:div {:class (stl/css :modal-content)}
+        [:div {:class (stl/css :fields-row)}
+         [:& fm/input {:type "text"
+                       :auto-focus? true
+                       :form form
+                       :name :name
+                       :disabled @created?
+                       :label (tr "modals.create-access-token.name.label")
+                       :show-success? true
+                       :placeholder (tr "modals.create-access-token.name.placeholder")}]]
+
+        [:div {:class (stl/css :fields-row)}
+         [:div {:class (stl/css :select-title)}
+          (tr "modals.create-access-token.expiration-date.label")]
+         [:& fm/select {:options [{:label (tr "dashboard.access-tokens.expiration-never")    :value "never" :key "never"}
+                                  {:label (tr "dashboard.access-tokens.expiration-30-days")  :value "720h"  :key "720h"}
+                                  {:label (tr "dashboard.access-tokens.expiration-60-days")  :value "1440h" :key "1440h"}
+                                  {:label (tr "dashboard.access-tokens.expiration-90-days")  :value "2160h" :key "2160h"}
+                                  {:label (tr "dashboard.access-tokens.expiration-180-days") :value "4320h" :key "4320h"}]
+                        :default "never"
+                        :disabled @created?
+                        :name :expiration-date}]
+         (when @created?
+           [:span {:class (stl/css :token-created-info)}
+            (if (:expires-at created)
+              (tr "dashboard.access-tokens.token-will-expire" (ct/format-inst (:expires-at created) "PPP"))
+              (tr "dashboard.access-tokens.token-will-not-expire"))])]
+
+        [:div {:class (stl/css :fields-row)}
+         (when @created?
+           [:div {:class (stl/css :custon-input-wrapper)}
+            [:input {:type "text"
+                     :value (:token created "")
+                     :class (stl/css :custom-input-token)
+                     :read-only true}]
+            [:button {:title (tr "modals.create-access-token.copy-token")
+                      :class (stl/css :copy-btn)
+                      :on-click copy-token}
+             clipboard-icon]])
+         #_(when @created?
+             [:button {:class (stl/css :copy-btn)
+                       :title (tr "modals.create-access-token.copy-token")
+                       :on-click copy-token}
+              [:span {:class (stl/css :token-value)} (:token created "")]
+              [:span {:class (stl/css :icon)}
+               i/clipboard]])]]
+
+       [:div {:class (stl/css :modal-footer)}
+        [:div {:class (stl/css :action-buttons)}
+
+         (if @created?
+           [:input {:class (stl/css :cancel-button)
+                    :type "button"
+                    :value (tr "labels.close")
+                    :on-click modal/hide!}]
+           [:*
+            [:input {:class (stl/css :cancel-button)
+                     :type "button"
+                     :value (tr "labels.cancel")
+                     :on-click modal/hide!}]
+            [:> fm/submit-button*
+             {:large? false :label (tr "modals.create-access-token.submit-label")}]])]]]]]))
+
+(mf/defc access-tokens-hero
+  []
+  (let [on-click (mf/use-fn #(st/emit! (modal/show :access-token {})))]
+    [:div {:class (stl/css :access-tokens-hero)}
+     [:h2 {:class (stl/css :hero-title)} (tr "dashboard.access-tokens.personal")]
+     [:p {:class (stl/css :hero-desc)} (tr "dashboard.access-tokens.personal.description")]
+
+     [:button {:class (stl/css :hero-btn)
+               :on-click on-click}
+      (tr "dashboard.access-tokens.create")]]))
+
+(mf/defc access-token-actions
+  [{:keys [on-delete]}]
+  (let [local    (mf/use-state {:menu-open false})
+        show?    (:menu-open @local)
+        options  (mf/with-memo [on-delete]
+                   [{:name    (tr "labels.delete")
+                     :id      "access-token-delete"
+                     :handler on-delete}])
+
+        menu-ref (mf/use-ref)
+
+        on-menu-close
+        (mf/use-fn #(swap! local assoc :menu-open false))
+
+        on-menu-click
+        (mf/use-fn
+         (fn [event]
+           (dom/prevent-default event)
+           (swap! local assoc :menu-open true)))
+
+        on-keydown
+        (mf/use-fn
+         (mf/deps on-menu-click)
+         (fn [event]
+           (when (kbd/enter? event)
+             (dom/stop-propagation event)
+             (on-menu-click event))))]
+
+    [:button {:class (stl/css :menu-btn)
+              :tab-index "0"
+              :ref menu-ref
+              :on-click on-menu-click
+              :on-key-down on-keydown}
+     menu-icon
+     [:> context-menu*
+      {:on-close on-menu-close
+       :show show?
+       :fixed true
+       :min-width true
+       :top "auto"
+       :left "auto"
+       :options options}]]))
+
+(mf/defc access-token-item
+  {::mf/wrap [mf/memo]}
+  [{:keys [token] :as props}]
+  (let [expires-at  (:expires-at token)
+        expires-txt (some-> expires-at (ct/format-inst "PPP"))
+        expired?    (and (some? expires-at) (> (ct/now) expires-at))
+
+        delete-fn
+        (mf/use-fn
+         (mf/deps token)
+         (fn []
+           (let [params {:id (:id token)}
+                 mdata  {:on-success #(st/emit! (du/fetch-access-tokens))}]
+             (st/emit! (du/delete-access-token (with-meta params mdata))))))
+
+        on-delete
+        (mf/use-fn
+         (mf/deps delete-fn)
+         (fn []
+           (st/emit! (modal/show
+                      {:type :confirm
+                       :title (tr "modals.delete-acces-token.title")
+                       :message (tr "modals.delete-acces-token.message")
+                       :accept-label (tr "modals.delete-acces-token.accept")
+                       :on-accept delete-fn}))))]
+
+    [:div {:class (stl/css :table-row)}
+     [:div {:class (stl/css :table-field :field-name)}
+      (str (:name token))]
+
+     [:div {:class (stl/css-case :expiration-date true
+                                 :expired expired?)}
+      (cond
+        (nil? expires-at) (tr "dashboard.access-tokens.no-expiration")
+        expired? (tr "dashboard.access-tokens.expired-on" expires-txt)
+        :else (tr "dashboard.access-tokens.expires-on" expires-txt))]
+     [:div {:class (stl/css :table-field :actions)}
+      [:& access-token-actions
+       {:on-delete on-delete}]]]))
+
+(mf/defc access-tokens-page
+  []
+  (let [tokens (mf/deref tokens-ref)]
+    (mf/with-effect []
+      (dom/set-html-title (tr "title.settings.access-tokens"))
+      (st/emit! (du/fetch-access-tokens)))
+
+    [:div {:class (stl/css :dashboard-access-tokens)}
+     [:& access-tokens-hero]
+     (if (empty? tokens)
+       [:div {:class (stl/css :access-tokens-empty)}
+        [:div (tr "dashboard.access-tokens.empty.no-access-tokens")]
+        [:div (tr "dashboard.access-tokens.empty.add-one")]]
+       [:div {:class (stl/css :dashboard-table)}
+        [:div {:class (stl/css :table-rows)}
+         (for [token tokens]
+           [:& access-token-item {:token token :key (:id token)}])]])]))
+

frontend/src/app/main/ui/settings/access_tokens.scss

@@ -0,0 +1,202 @@
+// 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 INC
+
+@use "refactor/common-refactor.scss" as deprecated;
+
+// ACCESS TOKENS PAGE
+.dashboard-access-tokens {
+  display: grid;
+  grid-template-rows: auto 1fr;
+  margin: deprecated.$s-80 auto deprecated.$s-120 auto;
+  gap: deprecated.$s-32;
+  width: deprecated.$s-800;
+}
+
+// hero
+.access-tokens-hero {
+  display: grid;
+  grid-template-rows: auto auto 1fr;
+  gap: deprecated.$s-32;
+  width: deprecated.$s-500;
+  font-size: deprecated.$fs-14;
+  margin: deprecated.$s-16 auto 0 auto;
+}
+
+.hero-title {
+  @include deprecated.bigTitleTipography;
+  color: var(--title-foreground-color-hover);
+}
+
+.hero-desc {
+  color: var(--title-foreground-color);
+  margin-bottom: 0;
+  font-size: deprecated.$fs-14;
+}
+
+.hero-btn {
+  @extend .button-primary;
+}
+
+// table empty
+.access-tokens-empty {
+  display: grid;
+  place-items: center;
+  align-content: center;
+  height: deprecated.$s-156;
+  max-width: deprecated.$s-1000;
+  width: 100%;
+  padding: deprecated.$s-32;
+  border: deprecated.$s-1 solid var(--panel-border-color);
+  border-radius: deprecated.$br-8;
+  color: var(--dashboard-list-text-foreground-color);
+}
+
+// Access tokens table
+.dashboard-table {
+  height: fit-content;
+}
+
+.table-rows {
+  display: grid;
+  grid-auto-rows: deprecated.$s-64;
+  gap: deprecated.$s-16;
+  width: 100%;
+  height: 100%;
+  max-width: deprecated.$s-1000;
+  margin-top: deprecated.$s-16;
+  color: var(--title-foreground-color);
+}
+
+.table-row {
+  display: grid;
+  grid-template-columns: 43% 1fr auto;
+  align-items: center;
+  height: deprecated.$s-64;
+  width: 100%;
+  padding: 0 deprecated.$s-16;
+  border-radius: deprecated.$br-8;
+  background-color: var(--dashboard-list-background-color);
+  color: var(--dashboard-list-foreground-color);
+}
+
+.field-name {
+  @include deprecated.textEllipsis;
+  display: grid;
+  width: 43%;
+  min-width: deprecated.$s-300;
+}
+
+.expiration-date {
+  @include deprecated.flexCenter;
+  min-width: deprecated.$s-76;
+  width: fit-content;
+  height: deprecated.$s-24;
+  border-radius: deprecated.$br-8;
+  color: var(--dashboard-list-text-foreground-color);
+}
+
+.expired {
+  @include deprecated.headlineSmallTypography;
+  padding: 0 deprecated.$s-6;
+  color: var(--pill-foreground-color);
+  background-color: var(--status-widget-background-color-warning);
+}
+
+.actions {
+  position: relative;
+}
+.menu-icon {
+  @extend .button-icon;
+  stroke: var(--icon-foreground);
+}
+
+.menu-btn {
+  @include deprecated.buttonStyle;
+}
+
+// Create access token modal
+.modal-overlay {
+  @extend .modal-overlay-base;
+}
+
+.modal-container {
+  @extend .modal-container-base;
+  min-width: deprecated.$s-408;
+}
+
+.modal-header {
+  margin-bottom: deprecated.$s-24;
+}
+
+.modal-title {
+  @include deprecated.uppercaseTitleTipography;
+  color: var(--modal-title-foreground-color);
+}
+.modal-close-btn {
+  @extend .modal-close-btn-base;
+}
+
+.modal-content {
+  @include deprecated.flexColumn;
+  gap: deprecated.$s-24;
+  @include deprecated.bodySmallTypography;
+  margin-bottom: deprecated.$s-24;
+}
+
+.select-title {
+  @include deprecated.bodySmallTypography;
+  color: var(--modal-title-foreground-color);
+}
+
+.custon-input-wrapper {
+  @include deprecated.flexRow;
+  border-radius: deprecated.$br-8;
+  height: deprecated.$s-32;
+  background-color: var(--input-background-color);
+}
+
+.custom-input-token {
+  @extend .input-element;
+  @include deprecated.bodySmallTypography;
+  margin: 0;
+  flex-grow: 1;
+  &:focus {
+    outline: none;
+    border: deprecated.$s-1 solid var(--input-border-color-active);
+  }
+}
+
+.token-value {
+  @include deprecated.textEllipsis;
+  @include deprecated.bodySmallTypography;
+  flex-grow: 1;
+}
+
+.copy-btn {
+  @include deprecated.flexCenter;
+  @extend .button-secondary;
+  height: deprecated.$s-28;
+  width: deprecated.$s-28;
+}
+
+.clipboard-icon {
+  @extend .button-icon-small;
+}
+
+.token-created-info {
+  color: var(--modal-text-foreground-color);
+}
+
+.action-buttons {
+  @extend .modal-action-btns;
+  button {
+    @extend .modal-accept-btn;
+  }
+}
+
+.cancel-button {
+  @extend .modal-cancel-btn;
+}

frontend/src/app/main/ui/settings/integrations.cljs

@@ -1,573 +0,0 @@
-;; 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 INC
-
-(ns app.main.ui.settings.integrations
-  (:require-macros [app.main.style :as stl])
-  (:require
-   [app.common.data :as d]
-   [app.common.schema :as sm]
-   [app.common.time :as ct]
-   [app.config :as cf]
-   [app.main.data.event :as ev]
-   [app.main.data.modal :as modal]
-   [app.main.data.notifications :as ntf]
-   [app.main.data.profile :as du]
-   [app.main.refs :as refs]
-   [app.main.store :as st]
-   [app.main.ui.components.context-menu-a11y :refer [context-menu*]]
-   [app.main.ui.ds.buttons.button :refer [button*]]
-   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
-   [app.main.ui.ds.controls.input :refer [input*]]
-   [app.main.ui.ds.controls.switch :refer [switch*]]
-   [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
-   [app.main.ui.ds.foundations.typography :as t]
-   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
-   [app.main.ui.ds.foundations.typography.text :refer [text*]]
-   [app.main.ui.ds.notifications.shared.notification-pill :refer [notification-pill*]]
-   [app.main.ui.ds.tooltip :refer [tooltip*]]
-   [app.main.ui.forms :as fc]
-   [app.util.clipboard :as clipboard]
-   [app.util.dom :as dom]
-   [app.util.forms :as fm]
-   [app.util.i18n :as i18n :refer [tr]]
-   [okulary.core :as l]
-   [rumext.v2 :as mf]))
-
-(def tokens-ref
-  (l/derived :access-tokens st/state))
-
-(def token-created-ref
-  (l/derived :access-token-created st/state))
-
-(def notification-timeout 7000)
-
-(def ^:private schema:form
-  [:map
-   [:name [::sm/text {:max 250}]]
-   [:expiration-date [::sm/text {:max 250}]]])
-
-(def form-initial-data
-  {:name ""
-   :expiration-date "never"})
-
-(mf/defc token-created*
-  {::mf/private true}
-  [{:keys [title]}]
-  (let [token-created (mf/deref token-created-ref)
-
-        on-copy-to-clipboard
-        (mf/use-fn
-         (mf/deps token-created)
-         (fn [event]
-           (dom/prevent-default event)
-           (clipboard/to-clipboard (:token token-created))
-           (st/emit! (ntf/show {:level :info
-                                :type :toast
-                                :content (tr "integrations.notification.success.copied")
-                                :timeout notification-timeout}))))]
-
-    [:div {:class (stl/css :modal-form)}
-     [:> text* {:as "h2"
-                :typography t/headline-large
-                :class (stl/css :color-primary)}
-      title]
-
-     [:> notification-pill* {:level :info
-                             :type :context}
-      (tr "integrations.info.non-recuperable")]
-
-     [:div {:class (stl/css :modal-content)}
-      [:div {:class (stl/css :modal-token)}
-       [:> input* {:type "text"
-                   :default-value (:token token-created "")
-                   :read-only true}]
-       [:div {:class (stl/css :modal-token-button)}
-        [:> icon-button* {:variant "secondary"
-                          :aria-label (tr "integrations.copy-token")
-                          :on-click on-copy-to-clipboard
-                          :icon i/clipboard}]]]
-
-      [:> text* {:as "div"
-                 :typography t/body-small
-                 :class (stl/css :color-secondary)}
-       (if (:expires-at token-created)
-         (tr "integrations.token-will-expire" (ct/format-inst (:expires-at token-created) "PPP"))
-         (tr "integrations.token-will-not-expire"))]]
-
-     [:div {:class (stl/css :modal-footer)}
-      [:> button* {:variant "secondary"
-                   :on-click modal/hide!}
-       (tr "labels.close")]]]))
-
-
-(mf/defc create-token*
-  {::mf/private true}
-  [{:keys [title info mcp-key? on-created]}]
-  (let [form (fm/use-form
-              :initial form-initial-data
-              :schema schema:form)
-
-        on-error
-        (mf/use-fn
-         #(st/emit! (ntf/error (tr "errors.generic"))
-                    (modal/hide)))
-
-        on-success
-        (mf/use-fn
-         #(st/emit! (du/fetch-access-tokens)
-                    (ntf/success (tr "integrations.notification.success.created"))
-                    (on-created)))
-
-        on-submit
-        (mf/use-fn
-         (fn [form]
-           (let [cdata      (:clean-data @form)
-                 mdata      {:on-success (partial on-success form)
-                             :on-error   (partial on-error form)}
-                 expiration (:expiration-date cdata)
-                 params     (cond-> {:name  (:name cdata)
-                                     :perms (:perms cdata)}
-                              (not= "never" expiration) (assoc :expiration expiration)
-                              (true? mcp-key?)          (assoc :type "mcp"))]
-             (st/emit! (du/create-access-token (with-meta params mdata))))))]
-
-    [:> fc/form* {:form form
-                  :class (stl/css :modal-form)
-                  :on-submit on-submit}
-
-     [:> text* {:as "h2"
-                :typography t/headline-large
-                :class (stl/css :color-primary)}
-      title]
-
-     (when (some? info)
-       [:> notification-pill* {:level :info
-                               :type :context}
-        info])
-
-     [:div {:class (stl/css :modal-content)}
-      [:> fc/form-input* {:type "text"
-                          :auto-focus? true
-                          :form form
-                          :name :name
-                          :label (tr "integrations.name.label")
-                          :placeholder (tr "integrations.name.placeholder")}]]
-
-     [:div {:class (stl/css :modal-content)}
-      [:> text* {:as "label"
-                 :typography t/body-small
-                 :for :expiration-date
-                 :class (stl/css :color-primary)}
-       (tr "integrations.expiration-date.label")]
-      [:> fc/form-select* {:options [{:label (tr "integrations.expiration-never")    :value "never" :id "never"}
-                                     {:label (tr "integrations.expiration-30-days")  :value "720h"  :id "720h"}
-                                     {:label (tr "integrations.expiration-60-days")  :value "1440h" :id "1440h"}
-                                     {:label (tr "integrations.expiration-90-days")  :value "2160h" :id "2160h"}
-                                     {:label (tr "integrations.expiration-180-days") :value "4320h" :id "4320h"}]
-                           :default-selected "never"
-                           :name :expiration-date}]]
-
-     [:div {:class (stl/css :modal-footer)}
-      [:> button* {:variant "secondary"
-                   :on-click modal/hide!}
-       (tr "labels.cancel")]
-      [:> fc/form-submit* {:variant "primary"}
-       title]]]))
-
-(mf/defc create-access-token-modal
-  {::mf/register modal/components
-   ::mf/register-as :create-access-token}
-  []
-  (let [created? (mf/use-state false)
-
-        on-close
-        (mf/use-fn
-         (fn []
-           (reset! created? false)
-           (st/emit! (modal/hide))))
-
-        on-created
-        (mf/use-fn
-         #(reset! created? true))]
-
-    [:div {:class (stl/css :modal-overlay)}
-     [:div {:class (stl/css :modal-container)}
-      [:div {:class (stl/css :modal-close-button)}
-       [:> icon-button* {:variant "ghost"
-                         :aria-label (tr "labels.close")
-                         :on-click on-close
-                         :icon i/close}]]
-
-      (if @created?
-        [:> token-created* {:title (tr "integrations.create-access-token.title.created")}]
-        [:> create-token* {:title (tr "integrations.create-access-token.title")
-                           :on-created on-created}])]]))
-
-(mf/defc create-mcp-key-modal
-  {::mf/register modal/components
-   ::mf/register-as :create-mcp-key}
-  []
-  (let [created? (mf/use-state false)
-
-        on-close
-        (mf/use-fn
-         (fn []
-           (reset! created? false)
-           (st/emit! (modal/hide))))
-
-        on-created
-        (mf/use-fn
-         (fn []
-           (st/emit! (du/update-profile-props {:mcp-status true})
-                     (ev/event {::ev/name "create-mcp-key"
-                                ::ev/origin "integrations"})
-                     (ev/event {::ev/name "enable-mcp"
-                                ::ev/origin "integrations"
-                                :source "key-creation"}))
-           (reset! created? true)))]
-
-    [:div {:class (stl/css :modal-overlay)}
-     [:div {:class (stl/css :modal-container)}
-      [:div {:class (stl/css :modal-close-button)}
-       [:> icon-button* {:variant "ghost"
-                         :aria-label (tr "labels.close")
-                         :on-click on-close
-                         :icon i/close}]]
-
-      (if @created?
-        [:> token-created* {:title (tr "integrations.create-mcp-key.title.created")}]
-        [:> create-token* {:title (tr "integrations.create-mcp-key.title")
-                           :mcp-key? true
-                           :on-created on-created}])]]))
-
-(mf/defc regenerate-mcp-key-modal
-  {::mf/register modal/components
-   ::mf/register-as :regenerate-mcp-key}
-  []
-  (let [created?   (mf/use-state false)
-
-        tokens     (mf/deref tokens-ref)
-        mcp-key    (some #(when (= (:type %) "mcp") %) tokens)
-        mcp-key-id (:id mcp-key)
-
-        on-close
-        (mf/use-fn
-         (fn []
-           (reset! created? false)
-           (st/emit! (modal/hide))))
-
-        on-created
-        (mf/use-fn
-         (fn []
-           (st/emit! (du/delete-access-token {:id mcp-key-id})
-                     (du/update-profile-props {:mcp-status true})
-                     (ev/event {::ev/name "regenerate-mcp-key"
-                                ::ev/origin "integrations"}))
-           (reset! created? true)))]
-
-    [:div {:class (stl/css :modal-overlay)}
-     [:div {:class (stl/css :modal-container)}
-      [:div {:class (stl/css :modal-close-button)}
-       [:> icon-button* {:variant "ghost"
-                         :aria-label (tr "labels.close")
-                         :on-click on-close
-                         :icon i/close}]]
-
-      (if @created?
-        [:> token-created* {:title (tr "integrations.regenerate-mcp-key.title.created")}]
-        [:> create-token* {:title (tr "integrations.regenerate-mcp-key.title")
-                           :info (tr "integrations.regenerate-mcp-key.info")
-                           :mcp-key? true
-                           :on-created on-created}])]]))
-
-(mf/defc token-item*
-  {::mf/private true
-   ::mf/wrap [mf/memo]}
-  [{:keys [name expires-at on-delete]}]
-  (let [expires-txt (some-> expires-at (ct/format-inst "PPP"))
-        expired?    (and (some? expires-at) (> (ct/now) expires-at))
-
-        menu-open*  (mf/use-state false)
-        menu-open?  (deref menu-open*)
-
-        handle-menu-close
-        (mf/use-fn
-         #(reset! menu-open* false))
-
-        handle-menu-click
-        (mf/use-fn
-         #(reset! menu-open* (not menu-open?)))
-
-        handle-open-confirm-modal
-        (mf/use-fn
-         (mf/deps on-delete)
-         (fn []
-           (st/emit! (modal/show {:type :confirm
-                                  :title (tr "integrations.delete-token.title")
-                                  :message (tr "integrations.delete-token.message")
-                                  :accept-label (tr "integrations.delete-token.accept")
-                                  :on-accept on-delete}))))
-
-        options
-        (mf/with-memo [on-delete]
-          [{:name    (tr "labels.delete")
-            :id      "token-delete"
-            :handler handle-open-confirm-modal}])]
-
-    [:div {:class (stl/css :item)}
-     [:> text* {:as "div"
-                :typography t/body-medium
-                :title name
-                :class (stl/css :item-title)}
-      name]
-
-     [:> text* {:as "div"
-                :typography t/body-small
-                :class (stl/css-case :item-subtitle true
-                                     :warning expired?)}
-      (cond
-        (nil? expires-at) (tr "integrations.no-expiration")
-        expired?          (tr "integrations.expired-on" expires-txt)
-        :else             (tr "integrations.expires-on" expires-txt))]
-
-     [:div {:class (stl/css :item-actions)}
-      [:> icon-button* {:variant "ghost"
-                        :class (stl/css :item-button)
-                        :aria-pressed menu-open?
-                        :aria-label (tr "labels.options")
-                        :on-click handle-menu-click
-                        :icon i/menu}]
-      [:> context-menu* {:on-close handle-menu-close
-                         :show menu-open?
-                         :min-width true
-                         :top -10
-                         :left -138
-                         :options options}]]]))
-
-(mf/defc mcp-server-section*
-  {::mf/private true}
-  []
-  (let [tokens  (mf/deref tokens-ref)
-        profile (mf/deref refs/profile)
-
-        mcp-key     (some #(when (= (:type %) "mcp") %) tokens)
-        mcp-active? (d/nilv (-> profile :props :mcp-status) false)
-
-        expires-at  (:expires-at mcp-key)
-        expired?    (and (some? expires-at) (> (ct/now) expires-at))
-
-        tooltip-id
-        (mf/use-id)
-
-        handle-mcp-status-change
-        (mf/use-fn
-         (fn [mcp-status]
-           (st/emit! (du/update-profile-props {:mcp-status mcp-status})
-                     (ntf/show {:level :info
-                                :type :toast
-                                :content (if (true? mcp-status)
-                                           (tr "integrations.notification.success.mcp-server-enabled")
-                                           (tr "integrations.notification.success.mcp-server-disabled"))
-                                :timeout notification-timeout})
-                     (ev/event {::ev/name (if (true? mcp-status) "enable-mcp" "disable-mcp")
-                                ::ev/origin "integrations"
-                                :source "toggle"}))))
-
-        handle-initial-mcp-status
-        (mf/use-fn
-         #(st/emit! (modal/show {:type :create-mcp-key})))
-
-        handle-regenerate-mcp-key
-        (mf/use-fn
-         #(st/emit! (modal/show {:type :regenerate-mcp-key})))
-
-        handle-delete
-        (mf/use-fn
-         (mf/deps mcp-key)
-         (fn []
-           (let [params {:id (:id mcp-key)}
-                 mdata  {:on-success #(st/emit! (du/fetch-access-tokens))}]
-             (st/emit! (du/delete-access-token (with-meta params mdata))
-                       (du/update-profile-props {:mcp-status false})))))
-
-        on-copy-to-clipboard
-        (mf/use-fn
-         (fn [event]
-           (dom/prevent-default event)
-           (clipboard/to-clipboard cf/mcp-server-url)
-           (st/emit! (ntf/show {:level :info
-                                :type :toast
-                                :content (tr "integrations.notification.success.copied-link")
-                                :timeout notification-timeout})
-                     (ev/event {::ev/name "copy-mcp-url"
-                                ::ev/origin "integrations"}))))]
-
-    [:section {:class (stl/css :mcp-server-section)}
-     [:div
-      [:div {:class (stl/css :title)}
-       [:> heading* {:level 2
-                     :typography t/title-medium
-                     :class (stl/css :color-primary :mcp-server-title)}
-        (tr "integrations.mcp-server.title")]
-       [:> text* {:as "span"
-                  :typography t/body-small
-                  :class (stl/css :beta)}
-        (tr "integrations.mcp-server.title.beta")]]
-
-      [:> text* {:as "div"
-                 :typography t/body-medium
-                 :class (stl/css :color-secondary)}
-       (tr "integrations.mcp-server.description")]]
-
-     [:div
-      [:> text* {:as "h3"
-                 :typography t/headline-small
-                 :class (stl/css :color-primary)}
-       (tr "integrations.mcp-server.status")]
-
-      [:div {:class (stl/css :mcp-server-block)}
-       (when expired?
-         [:> notification-pill* {:level :error
-                                 :type :context}
-          [:div {:class (stl/css :mcp-server-notification)}
-           [:> text* {:as "div"
-                      :typography t/body-medium
-                      :class (stl/css :color-primary)}
-            (tr "integrations.mcp-server.status.expired.0")]
-
-           [:> text* {:as "div"
-                      :typography t/body-medium
-                      :class (stl/css :color-primary)}
-            (tr "integrations.mcp-server.status.expired.1")]]])
-
-       [:div {:class (stl/css :mcp-server-switch)}
-        [:> switch* {:label (if mcp-active?
-                              (tr "integrations.mcp-server.status.enabled")
-                              (tr "integrations.mcp-server.status.disabled"))
-                     :default-checked mcp-active?
-                     :on-change handle-mcp-status-change}]
-        (when (and (false? mcp-active?) (nil? mcp-key))
-          [:div {:class (stl/css :mcp-server-switch-cover)
-                 :on-click handle-initial-mcp-status}])]]]
-
-     (when (some? mcp-key)
-       [:div {:class (stl/css :mcp-server-key)}
-        [:> text* {:as "h3"
-                   :typography t/headline-small
-                   :class (stl/css :color-primary)}
-         (tr "integrations.mcp-server.mcp-keys.title")]
-
-        [:div {:class (stl/css :mcp-server-block)}
-         [:div {:class (stl/css :mcp-server-regenerate)}
-          [:> button* {:variant "primary"
-                       :class (stl/css :fit-content)
-                       :on-click handle-regenerate-mcp-key}
-           (tr "integrations.mcp-server.mcp-keys.regenerate")]
-          [:> tooltip* {:content (tr "integrations.mcp-server.mcp-keys.tootip")
-                        :id tooltip-id}
-           [:> icon* {:icon-id i/info
-                      :class (stl/css :color-secondary)}]]]
-
-         [:div {:class (stl/css :list)}
-          [:> token-item* {:key (:id mcp-key)
-                           :name (:name mcp-key)
-                           :expires-at (:expires-at mcp-key)
-                           :on-delete handle-delete}]]]])
-
-     [:> notification-pill* {:level :default
-                             :type :context}
-      [:div {:class (stl/css :mcp-server-notification)}
-       [:> text* {:as "div"
-                  :typography t/body-medium
-                  :class (stl/css :color-secondary)}
-        (tr "integrations.mcp-server.mcp-keys.info")]
-       [:div {:class (stl/css :mcp-server-notification-line)}
-        [:> text* {:as "div"
-                   :typography t/body-medium
-                   :class (stl/css :color-primary)}
-         cf/mcp-server-url]
-        [:> text* {:as "div"
-                   :typography t/body-medium
-                   :on-click on-copy-to-clipboard
-                   :class (stl/css :mcp-server-notification-link)}
-         [:> icon* {:icon-id i/clipboard}] (tr "integrations.mcp-server.mcp-keys.copy")]]
-
-       [:> text* {:as "div"
-                  :typography t/body-medium
-                  :class (stl/css :color-secondary)}
-        [:a {:href cf/mcp-help-center-uri
-             :class (stl/css :mcp-server-notification-link)}
-         (tr "integrations.mcp-server.mcp-keys.help") [:> icon* {:icon-id i/open-link}]]]]]]))
-
-(mf/defc access-tokens-section*
-  {::mf/private true}
-  []
-  (let [tokens (mf/deref tokens-ref)
-
-        handle-click
-        (mf/use-fn
-         #(st/emit! (modal/show {:type :create-access-token})))
-
-        handle-delete
-        (mf/use-fn
-         (fn [token-id]
-           (let [params {:id token-id}
-                 mdata  {:on-success #(st/emit! (du/fetch-access-tokens))}]
-             (st/emit! (du/delete-access-token (with-meta params mdata))))))]
-
-    [:section {:class (stl/css :access-tokens-section)}
-     [:> heading* {:level 2
-                   :typography t/title-medium
-                   :class (stl/css :color-primary)}
-      (tr "integrations.access-tokens.personal")]
-
-     [:> text* {:as "div"
-                :typography t/body-medium
-                :class (stl/css :color-secondary)}
-      (tr "integrations.access-tokens.personal.description")]
-
-     [:> button* {:variant "primary"
-                  :class (stl/css :fit-content)
-                  :on-click handle-click}
-      (tr "integrations.access-tokens.create")]
-
-     (if (empty? tokens)
-       [:div {:class (stl/css :frame)}
-        [:> text* {:as "div"
-                   :typography t/body-medium
-                   :class (stl/css :color-secondary :text-center)}
-         [:div (tr "integrations.access-tokens.empty.no-access-tokens")]
-         [:div (tr "integrations.access-tokens.empty.add-one")]]]
-
-       [:div {:class (stl/css :list)}
-        (for [token tokens]
-          (when (nil? (:type token))
-            [:> token-item* {:key (:id token)
-                             :name (:name token)
-                             :expires-at (:expires-at token)
-                             :on-delete (partial handle-delete (:id token))}]))])]))
-
-(mf/defc integrations-page*
-  []
-  (mf/with-effect []
-    (dom/set-html-title (tr "title.settings.integrations"))
-    (st/emit! (du/fetch-access-tokens)))
-
-  [:div {:class (stl/css :integrations)}
-   [:> heading* {:level 1
-                 :typography t/title-large
-                 :class (stl/css :color-primary)}
-    (tr "integrations.title")]
-
-   (when (contains? cf/flags :mcp)
-     [:> mcp-server-section*])
-
-   (when (and (contains? cf/flags :mcp)
-              (contains? cf/flags :access-tokens))
-     [:hr {:class (stl/css :separator)}])
-
-   (when (contains? cf/flags :access-tokens)
-     [:> access-tokens-section*])])

frontend/src/app/main/ui/settings/integrations.scss

@@ -1,221 +0,0 @@
-// 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 INC
-
-@use "refactor/common-refactor.scss" as deprecated;
-
-@use "ds/_borders.scss" as *;
-@use "ds/_sizes.scss" as *;
-@use "ds/spacing.scss" as *;
-@use "ds/mixins.scss" as *;
-
-.color-primary {
-  color: var(--color-foreground-primary);
-}
-
-.color-secondary {
-  color: var(--color-foreground-secondary);
-}
-
-.text-center {
-  text-align: center;
-}
-
-.fit-content {
-  inline-size: fit-content;
-}
-
-.beta {
-  color: var(--color-accent-primary);
-  border: $b-1 solid var(--color-accent-primary);
-  inline-size: fit-content;
-  padding: var(--sp-xxs) var(--sp-s);
-  border-radius: $br-4;
-}
-
-.title {
-  display: flex;
-  flex-direction: row;
-  align-items: baseline;
-  gap: var(--sp-s);
-}
-
-.modal-overlay {
-  @extend .modal-overlay-base;
-}
-
-.modal-container {
-  @extend .modal-container-base;
-  inline-size: $sz-400;
-  position: relative;
-}
-
-.modal-content {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-xs);
-}
-
-.modal-form {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-xxxl);
-}
-
-.modal-close-button {
-  position: absolute;
-  top: var(--sp-s);
-  right: var(--sp-s);
-}
-
-.modal-footer {
-  display: flex;
-  justify-content: right;
-  gap: var(--sp-s);
-}
-
-.modal-token {
-  position: relative;
-}
-
-.modal-token-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  border-start-start-radius: 0;
-  border-end-start-radius: 0;
-}
-
-.integrations {
-  display: grid;
-  grid-template-rows: auto 1fr;
-  margin: $sz-88 auto $sz-120 auto;
-  gap: $sz-32;
-  inline-size: $sz-500;
-}
-
-.access-tokens-section {
-  display: grid;
-  grid-template-rows: auto auto 1fr;
-  gap: var(--sp-m);
-}
-
-.mcp-server-section {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-l);
-}
-
-.mcp-server-key {
-  display: flex;
-  flex-direction: column;
-}
-
-.mcp-server-notification {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-s);
-}
-
-.mcp-server-notification-line {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: var(--sp-m);
-}
-
-.mcp-server-notification-link {
-  cursor: pointer;
-  color: var(--color-accent-primary);
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: var(--sp-xs);
-}
-
-.mcp-server-title {
-  margin: var(--sp-s) 0;
-}
-
-.mcp-server-block {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-l);
-}
-
-.mcp-server-regenerate {
-  display: flex;
-  align-items: center;
-  gap: var(--sp-s);
-}
-
-.mcp-server-switch {
-  position: relative;
-}
-
-.mcp-server-switch-cover {
-  position: absolute;
-  inset-block: 0;
-  inset-inline: 0;
-}
-
-.separator {
-  border: $b-1 solid var(--color-background-quaternary);
-  margin: var(--sp-s) 0;
-}
-
-.frame {
-  border: $b-1 solid var(--color-background-quaternary);
-  padding: var(--sp-m);
-  border-radius: $br-8;
-}
-
-.list {
-  display: grid;
-  grid-auto-rows: $sz-64;
-  gap: var(--sp-m);
-}
-
-.item {
-  display: grid;
-  grid-template-columns: 45% 1fr auto;
-  align-items: center;
-  background-color: var(--color-background-tertiary);
-  border-radius: $br-8;
-}
-
-.item-title {
-  @include textEllipsis;
-  align-content: center;
-  block-size: $sz-64;
-  padding: 0 var(--sp-l);
-  color: var(--color-foreground-primary);
-}
-
-.item-subtitle {
-  align-content: center;
-  block-size: $sz-64;
-  color: var(--color-foreground-secondary);
-
-  &.warning {
-    padding: var(--sp-s) var(--sp-m);
-    block-size: fit-content;
-    inline-size: fit-content;
-    color: var(--color-foreground-primary);
-    background-color: var(--color-background-warning);
-    border: $b-1 solid var(--color-accent-warning);
-    border-radius: $br-8;
-  }
-}
-
-.item-actions {
-  position: relative;
-}
-
-.item-button {
-  block-size: $sz-64;
-  inline-size: $sz-48;
-  border-radius: 0 var(--sp-s) var(--sp-s) 0;
-}

frontend/src/app/main/ui/settings/sidebar.cljs

@@ -43,8 +43,8 @@
 (def ^:private go-settings-subscription
   #(st/emit! (rt/nav :settings-subscription)))
 
-(def ^:private go-settings-integrations
-  #(st/emit! (rt/nav :settings-integrations)))
+(def ^:private go-settings-access-tokens
+  #(st/emit! (rt/nav :settings-access-tokens)))
 
 (def ^:private go-settings-notifications
   #(st/emit! (rt/nav :settings-notifications)))
@@ -66,7 +66,7 @@
         options?       (= section :settings-options)
         feedback?      (= section :settings-feedback)
         subscription?  (= section :settings-subscription)
-        integrations?  (= section :settings-integrations)
+        access-tokens? (= section :settings-access-tokens)
         notifications? (= section :settings-notifications)
         team-id        (or (dtm/get-last-team-id)
                            (:default-team-id profile))
@@ -115,13 +115,12 @@
                :data-testid "settings-subscription"}
           [:span {:class (stl/css :element-title)} (tr "subscription.labels")]])
 
-       (when (or (contains? cf/flags :access-tokens)
-                 (contains? cf/flags :mcp))
-         [:li {:class (stl/css-case :current integrations?
+       (when (contains? cf/flags :access-tokens)
+         [:li {:class (stl/css-case :current access-tokens?
                                     :settings-item true)
-               :on-click go-settings-integrations
-               :data-testid "settings-integrations"}
-          [:span {:class (stl/css :element-title)} (tr "labels.integrations")]])
+               :on-click go-settings-access-tokens
+               :data-testid "settings-access-tokens"}
+          [:span {:class (stl/css :element-title)} (tr "labels.access-tokens")]])
 
        [:hr {:class (stl/css :sidebar-separator)}]
 

frontend/src/app/main/ui/workspace/context_menu.cljs

@@ -150,9 +150,7 @@
   {::mf/props :obj
    ::mf/private true}
   [{:keys [shapes]}]
-  (let [multiple?         (> (count shapes) 1)
-
-        do-copy           #(st/emit! (dw/copy-selected))
+  (let [do-copy           #(st/emit! (dw/copy-selected))
         do-copy-link      #(st/emit! (dw/copy-link-to-clipboard))
 
         do-cut            #(st/emit! (dw/copy-selected)
@@ -180,9 +178,6 @@
         handle-copy-text
         (mf/use-callback #(st/emit! (dw/copy-selected-text)))
 
-        handle-copy-as-image
-        (mf/use-callback #(st/emit! (dw/copy-as-image)))
-
         handle-hover-copy-paste
         (mf/use-callback
          (fn []
@@ -227,11 +222,6 @@
       [:> menu-entry* {:title (tr "workspace.shape.menu.copy-svg")
                        :on-click handle-copy-svg}]
 
-      (when (some cfh/frame-shape? shapes)
-        [:> menu-entry* {:title (tr "workspace.shape.menu.copy-as-image")
-                         :disabled multiple?
-                         :on-click handle-copy-as-image}])
-
       [:> menu-separator* {}]
 
       [:> menu-entry* {:title (tr "workspace.shape.menu.copy-text")
@@ -239,7 +229,7 @@
 
       [:> menu-entry* {:title (tr "workspace.shape.menu.copy-props")
                        :shortcut (sc/get-tooltip :copy-props)
-                       :disabled multiple?
+                       :disabled (> (count shapes) 1)
                        :on-click handle-copy-props}]
       [:> menu-entry* {:title (tr "workspace.shape.menu.paste-props")
                        :shortcut (sc/get-tooltip :paste-props)

frontend/src/app/plugins/shape.cljs

@@ -175,6 +175,10 @@
 (defn shape-proxy? [p]
   (obj/type-of? p "ShapeProxy"))
 
+;; Cannot use token/token-proxy? here because of circular dependency in applyToShapes in token proxy
+(defn token-proxy? [t]
+  (obj/type-of? t "TokenProxy"))
+
 (defn shape-proxy
   ([plugin-id id]
    (shape-proxy plugin-id (:current-file-id @st/state) (:current-page-id @st/state) id))
@@ -1301,16 +1305,19 @@
                  tokens)))}
 
            :applyToken
-           (fn [token attrs]
-             (let [token (u/locate-token file-id (obj/get token "$set-id") (obj/get token "$id"))
-                   kw-attrs (into #{} (map keyword attrs))]
-               (if (some #(not (cto/token-attr? %)) kw-attrs)
-                 (u/display-not-valid :applyToken attrs)
-                 (st/emit!
-                  (dwta/toggle-token {:token token
-                                      :attrs kw-attrs
-                                      :shape-ids [id]
-                                      :expand-with-children false})))))
+           {:schema [:tuple
+                     [:fn token-proxy?]
+                     [:maybe [:set [:and ::sm/keyword [:fn cto/token-attr?]]]]]
+            :fn (fn [token attrs]
+                  (let [token (u/locate-token file-id (obj/get token "$set-id") (obj/get token "$id"))
+                        kw-attrs (into #{} (map keyword attrs))]
+                    (if (some #(not (cto/token-attr? %)) kw-attrs)
+                      (u/display-not-valid :applyToken attrs)
+                      (st/emit!
+                       (dwta/toggle-token {:token token
+                                           :attrs kw-attrs
+                                           :shape-ids [id]
+                                           :expand-with-children false})))))}
 
            :isVariantHead
            (fn []

frontend/src/app/plugins/tokens.cljs

@@ -13,10 +13,10 @@
    [app.common.types.tokens-lib :as ctob]
    [app.common.uuid :as uuid]
    [app.main.data.style-dictionary :as sd]
+   [app.main.data.tokenscript :as ts]
    [app.main.data.workspace.tokens.application :as dwta]
    [app.main.data.workspace.tokens.library-edit :as dwtl]
    [app.main.store :as st]
-   ;; [app.plugins.shape :as shape]
    [app.plugins.utils :as u]
    [app.util.object :as obj]
    [beicon.v2.core :as rx]
@@ -35,13 +35,25 @@
                            :shape-ids shape-ids
                            :expand-with-children false})))))
 
+(defn- get-resolved-value
+  [token tokens-tree]
+  (let [resolved-tokens (ts/resolve-tokens tokens-tree)
+        resolved-value  (-> resolved-tokens
+                            (dm/get-in [(:name token) :resolved-value])
+                            (ts/tokenscript-symbols->penpot-unit))]
+    resolved-value))
+
 (defn token-proxy? [p]
   (obj/type-of? p "TokenProxy"))
 
+;; Cannot use shape/shape-proxy? here because of circular dependency in applyToken in shape proxy
+(defn shape-proxy? [s]
+  (obj/type-of? s "ShapeProxy"))
+
 (defn token-proxy
   [plugin-id file-id set-id id]
   (obj/reify {:name "TokenProxy"
-              :wrap u/wrap-errors}
+              :on-error u/handle-error}
     :$plugin {:enumerable false :get (constantly plugin-id)}
     :$file-id {:enumerable false :get (constantly file-id)}
     :$set-id {:enumerable false :get (constantly set-id)}
@@ -82,6 +94,26 @@
      (fn [_ value]
        (st/emit! (dwtl/update-token set-id id {:value value})))}
 
+    :resolvedValue
+    {:this true
+     :enumerable false
+     :get
+     (fn [_]
+       (let [token           (u/locate-token file-id set-id id)
+             tokens-lib      (u/locate-tokens-lib file-id)
+             tokens-tree     (ctob/get-tokens-in-active-sets tokens-lib)]
+         (get-resolved-value token tokens-tree)))}
+
+    :resolvedValueString
+    {:this true
+     :enumerable false
+     :get
+     (fn [_]
+       (let [token           (u/locate-token file-id set-id id)
+             tokens-lib      (u/locate-tokens-lib file-id)
+             tokens-tree     (ctob/get-tokens-in-active-sets tokens-lib)]
+         (str (get-resolved-value token tokens-tree))))}
+
     :description
     {:this true
      :get
@@ -113,14 +145,10 @@
 
     :applyToShapes
     {:schema [:tuple
-              ;; FIXME: the schema decoder is interpreting the array of shape-proxys and converting
-              ;;        them to plain maps. For now we adapt the schema to accept it, but the decoder
-              ;;        should be fixed to keep the original proxy objects coming from the plugin.
-              ;; [:vector [:fn shape/shape-proxy?]]
-              [:vector [:map [:id ::sm/uuid]]]
-              [:maybe [:set [:set [:and ::sm/keyword [:fn cto/token-attr?]]]]]]
+              [:vector [:fn shape-proxy?]]
+              [:maybe [:set [:and ::sm/keyword [:fn cto/token-attr?]]]]]
      :fn (fn [shapes attrs]
-           (apply-token-to-shapes file-id set-id id (map :id shapes) attrs))}
+           (apply-token-to-shapes file-id set-id id (map #(obj/get % "$id") shapes) attrs))}
 
     :applyToSelected
     {:schema [:tuple [:maybe [:set [:and ::sm/keyword [:fn cto/token-attr?]]]]]
@@ -136,7 +164,7 @@
 (defn token-set-proxy
   [plugin-id file-id id]
   (obj/reify {:name "TokenSetProxy"
-              :wrap u/wrap-errors}
+              :on-error u/handle-error}
     :$plugin {:enumerable false :get (constantly plugin-id)}
     :$file-id {:enumerable false :get (constantly file-id)}
     :$id {:enumerable false :get (constantly id)}
@@ -257,7 +285,7 @@
 (defn token-theme-proxy
   [plugin-id file-id id]
   (obj/reify {:name "TokenThemeProxy"
-              :wrap u/wrap-errors}
+              :on-error u/handle-error}
     :$plugin {:enumerable false :get (constantly plugin-id)}
     :$file-id {:enumerable false :get (constantly file-id)}
     :$id {:enumerable false :get (constantly id)}
@@ -352,7 +380,7 @@
 (defn tokens-catalog
   [plugin-id file-id]
   (obj/reify {:name "TokensCatalog"
-              :wrap u/wrap-errors}
+              :on-error u/handle-error}
     :$plugin {:enumerable false :get (constantly plugin-id)}
     :$id {:enumerable false :get (constantly file-id)}
 

frontend/src/app/plugins/utils.cljs

@@ -223,7 +223,9 @@
 
 (defn display-not-valid
   [code value]
-  (.error js/console (dm/str "[PENPOT PLUGIN] Value not valid: " value ". Code: " code))
+  (if (some? value)
+    (.error js/console (dm/str "[PENPOT PLUGIN] Value not valid: " value ". Code: " code))
+    (.error js/console (dm/str "[PENPOT PLUGIN] Value not valid. Code: " code)))
   nil)
 
 (defn reject-not-valid
@@ -248,19 +250,12 @@
   (let [s (set values)]
     (if (= (count s) 1) (first s) "mixed")))
 
-(defn wrap-errors
-  "Function wrapper to be used in plugin proxies methods to handle errors.
-   When an exception is thrown, a readable error message is output to the console
-   and the exception is captured."
-  [f]
-  (fn []
-    (let [args (js-arguments)]
-      (try
-        (.apply f nil args)
-        (catch :default cause
-          (display-not-valid (ex-message cause) (obj/stringify args))
-          (if-let [explain (-> cause ex-data ::sm/explain)]
-            (println (sm/humanize-explain explain))
-            (js/console.log (ex-data cause)))
-          (js/console.log (.-stack cause))
-          nil)))))
+(defn handle-error
+  "Function to be used in plugin proxies methods to handle errors and print a readable
+   message to the console."
+  [cause]
+  (display-not-valid (ex-message cause) nil)
+  (if-let [explain (-> cause ex-data ::sm/explain)]
+    (println (sm/humanize-explain explain))
+    (js/console.log (ex-data cause)))
+  (js/console.log (.-stack cause)))

frontend/src/app/util/dom.cljs

@@ -230,6 +230,12 @@
 
 (def get-target-scroll (comp get-scroll-position get-target))
 
+(defn click
+  "Click a node"
+  [^js node]
+  (when (some? node)
+    (.click node)))
+
 (defn get-files
   "Extract the files from dom node."
   [^js node]
@@ -470,7 +476,7 @@
   (when (some? node)
     (.focus node)))
 
-(defn click
+(defn click!
   [^js node]
   (when (some? node)
     (.click node)))
@@ -742,11 +748,7 @@
 
 (defn trigger-download
   [filename blob]
-  (let [uri (wapi/create-uri blob)]
-    (try
-      (trigger-download-uri filename (.-type ^js blob) uri)
-      (finally
-        (wapi/revoke-uri uri)))))
+  (trigger-download-uri filename (.-type ^js blob) (wapi/create-uri blob)))
 
 (defn event
   "Create an instance of DOM Event"

frontend/src/app/util/http.cljs

@@ -190,11 +190,6 @@
   [{:keys [status]}]
   (<= 400 status 499))
 
-(defn blob?
-  [^js v]
-  (when (some? v)
-    (instance? js/Blob v)))
-
 (defn as-promise
   [observable]
   (p/create

frontend/src/app/util/object.cljc

@@ -464,13 +464,6 @@
      (let [o (get o type-symbol)]
        (= o t))))
 
-#?(:cljs
-   (def Proxy
-     (app.util.object/class
-      :name "Proxy"
-      :extends js/Object
-      :constructor (constantly nil))))
-
 (defmacro reify
   "A domain specific variation of reify that creates anonymous objects
   on demand with the ability to assign protocol implementations and
@@ -488,7 +481,7 @@
         obj-sym
         (gensym "obj-")]
 
-    `(let [~obj-sym (new Proxy)
+    `(let [~obj-sym (cljs.core/js-obj)
            ~f-sym   (fn [] ~type-name)]
        (add-properties! ~obj-sym
                         {:name ~'js/Symbol.toStringTag

frontend/translations/en.po

@@ -338,6 +338,77 @@ msgstr "You're going to restore %s."
 msgid "dashboard-restore-file-confirmation.title"
 msgstr "Restore file"
 
+#: src/app/main/ui/settings/access_tokens.cljs:103
+msgid "dashboard.access-tokens.copied-success"
+msgstr "Copied token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:189
+msgid "dashboard.access-tokens.create"
+msgstr "Generate new token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:64
+msgid "dashboard.access-tokens.create.success"
+msgstr "Access token created successfully."
+
+#: src/app/main/ui/settings/access_tokens.cljs:286
+msgid "dashboard.access-tokens.empty.add-one"
+msgstr "Press the button \"Generate new token\" to generate one."
+
+#: src/app/main/ui/settings/access_tokens.cljs:285
+msgid "dashboard.access-tokens.empty.no-access-tokens"
+msgstr "You have no tokens so far."
+
+#: src/app/main/ui/settings/access_tokens.cljs:135
+msgid "dashboard.access-tokens.expiration-180-days"
+msgstr "180 days"
+
+#: src/app/main/ui/settings/access_tokens.cljs:132
+msgid "dashboard.access-tokens.expiration-30-days"
+msgstr "30 days"
+
+#: src/app/main/ui/settings/access_tokens.cljs:133
+msgid "dashboard.access-tokens.expiration-60-days"
+msgstr "60 days"
+
+#: src/app/main/ui/settings/access_tokens.cljs:134
+msgid "dashboard.access-tokens.expiration-90-days"
+msgstr "90 days"
+
+#: src/app/main/ui/settings/access_tokens.cljs:131
+msgid "dashboard.access-tokens.expiration-never"
+msgstr "Never"
+
+#: src/app/main/ui/settings/access_tokens.cljs:268
+msgid "dashboard.access-tokens.expired-on"
+msgstr "Expired on %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:269
+msgid "dashboard.access-tokens.expires-on"
+msgstr "Expires on %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:267
+msgid "dashboard.access-tokens.no-expiration"
+msgstr "No expiration date"
+
+#: src/app/main/ui/settings/access_tokens.cljs:184
+msgid "dashboard.access-tokens.personal"
+msgstr "Personal access tokens"
+
+#: src/app/main/ui/settings/access_tokens.cljs:185
+msgid "dashboard.access-tokens.personal.description"
+msgstr ""
+"Personal access tokens function like an alternative to our login/password "
+"authentication system and can be used to allow an application to access the "
+"internal Penpot API"
+
+#: src/app/main/ui/settings/access_tokens.cljs:142
+msgid "dashboard.access-tokens.token-will-expire"
+msgstr "The token will expire on %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:143
+msgid "dashboard.access-tokens.token-will-not-expire"
+msgstr "The token has no expiration date"
+
 #: src/app/main/ui/dashboard/placeholder.cljs:41
 msgid "dashboard.add-file"
 msgstr "Add file"
@@ -360,7 +431,7 @@ msgstr "(copy)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:347
 msgid "dashboard.create-new-org"
-msgstr "+ Create org"
+msgstr "Create new org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:340
 msgid "dashboard.create-new-team"
@@ -2063,209 +2134,6 @@ msgstr "Resolved value:"
 msgid "inspect.tabs.styles.variants-panel"
 msgstr "Variant Properties"
 
-#: src/app/main/ui/settings/integrations.cljs:189
-msgid "integrations.access-tokens.create"
-msgstr "Create new access token"
-
-#: src/app/main/ui/settings/integrations.cljs:286
-msgid "integrations.access-tokens.empty.add-one"
-msgstr "Press the button \"Create new access token\" to generate one."
-
-#: src/app/main/ui/settings/integrations.cljs:285
-msgid "integrations.access-tokens.empty.no-access-tokens"
-msgstr "You have no tokens so far."
-
-#: src/app/main/ui/settings/integrations.cljs:184
-msgid "integrations.access-tokens.personal"
-msgstr "Personal access tokens"
-
-#: src/app/main/ui/settings/integrations.cljs:185
-msgid "integrations.access-tokens.personal.description"
-msgstr ""
-"Personal access tokens function like an alternative to our login/password "
-"authentication system and can be used to allow an application to access the "
-"internal Penpot API"
-
-#: src/app/main/ui/settings/integrations.cljs:152, src/app/main/ui/settings/integrations.cljs:158
-msgid "integrations.copy-token"
-msgstr "Copy token"
-
-#: src/app/main/ui/settings/integrations.cljs:432
-msgid "integrations.create-access-token.title"
-msgstr "Create access token"
-
-#: src/app/main/ui/settings/integrations.cljs:433
-msgid "integrations.create-access-token.title.created"
-msgstr "Access token created"
-
-#: src/app/main/ui/settings/integrations.cljs:290
-msgid "integrations.create-mcp-key.title"
-msgstr "Create new MCP key"
-
-#: src/app/main/ui/settings/integrations.cljs:291
-msgid "integrations.create-mcp-key.title.created"
-msgstr "MCP key created"
-
-#: src/app/main/ui/settings/integrations.cljs:257
-msgid "integrations.delete-token.accept"
-msgstr "Delete token"
-
-#: src/app/main/ui/settings/integrations.cljs:256
-msgid "integrations.delete-token.message"
-msgstr "Are you sure you want to delete this token?"
-
-#: src/app/main/ui/settings/integrations.cljs:255
-msgid "integrations.delete-token.title"
-msgstr "Delete token"
-
-#: src/app/main/ui/settings/integrations.cljs:135
-msgid "integrations.expiration-180-days"
-msgstr "180 days"
-
-#: src/app/main/ui/settings/integrations.cljs:132
-msgid "integrations.expiration-30-days"
-msgstr "30 days"
-
-#: src/app/main/ui/settings/integrations.cljs:133
-msgid "integrations.expiration-60-days"
-msgstr "60 days"
-
-#: src/app/main/ui/settings/integrations.cljs:134
-msgid "integrations.expiration-90-days"
-msgstr "90 days"
-
-#: src/app/main/ui/settings/integrations.cljs:131
-msgid "integrations.expiration-never"
-msgstr "Never"
-
-#: src/app/main/ui/settings/integrations.cljs:268
-msgid "integrations.expired-on"
-msgstr "Expired on %s"
-
-#: src/app/main/ui/settings/integrations.cljs:269
-msgid "integrations.expires-on"
-msgstr "Expires on %s"
-
-#: src/app/main/ui/settings/integrations.cljs:267
-msgid "integrations.no-expiration"
-msgstr "No expiration date"
-
-#: src/app/main/ui/settings/integrations.cljs:130
-msgid "integrations.expiration-date.label"
-msgstr "Expiration date"
-
-#: src/app/main/ui/settings/integrations.cljs:131
-msgid "integrations.info.non-recuperable"
-msgstr "This unique token is non-recuperable. If you lose it, you will need to create a new one."
-
-#: src/app/main/ui/settings/integrations.cljs:336
-msgid "integrations.mcp-server.title"
-msgstr "MCP Server"
-
-#: src/app/main/ui/settings/integrations.cljs:336
-msgid "integrations.mcp-server.title.beta"
-msgstr "Beta"
-
-#: src/app/main/ui/settings/integrations.cljs:347
-msgid "integrations.mcp-server.description"
-msgstr "The Penpot MCP Server enables MCP clients to interact directly with Penpot design files."
-
-#: src/app/main/ui/settings/integrations.cljs:353
-msgid "integrations.mcp-server.status"
-msgstr "Status"
-
-#: src/app/main/ui/settings/integrations.cljs:370
-msgid "integrations.mcp-server.status.disabled"
-msgstr "Disabled"
-
-#: src/app/main/ui/settings/integrations.cljs:370
-msgid "integrations.mcp-server.status.enabled"
-msgstr "Enabled"
-
-#: src/app/main/ui/settings/integrations.cljs:363
-msgid "integrations.mcp-server.status.expired.0"
-msgstr "The MCP key used to connect to the MCP server has expired. As a result, the connection cannot be established."
-
-#: src/app/main/ui/settings/integrations.cljs:368
-msgid "integrations.mcp-server.status.expired.1"
-msgstr "Please regenerate the MCP key and update your client configuration with the new key."
-
-#: src/app/main/ui/settings/integrations.cljs:415
-msgid "integrations.mcp-server.mcp-keys.copy"
-msgstr "Copy link"
-
-#: src/app/main/ui/settings/integrations.cljs:422
-msgid "integrations.mcp-server.mcp-keys.help"
-msgstr "How to configure MCP clients"
-
-#: src/app/main/ui/settings/integrations.cljs:405
-msgid "integrations.mcp-server.mcp-keys.info"
-msgstr "This is the server url you'll need to configure your MCP client in order to connect it to the Penpot MCP server."
-
-#: src/app/main/ui/settings/integrations.cljs:387
-msgid "integrations.mcp-server.mcp-keys.regenerate"
-msgstr "Regenerate MCP keys"
-
-#: src/app/main/ui/settings/integrations.cljs:381
-msgid "integrations.mcp-server.mcp-keys.title"
-msgstr "MCP keys"
-
-#: src/app/main/ui/settings/integrations.cljs:388
-msgid "integrations.mcp-server.mcp-keys.tootip"
-msgstr "The MCP key is needed for the MCP client set up"
-
-#: src/app/main/ui/settings/integrations.cljs:124
-msgid "integrations.name.label"
-msgstr "Name"
-
-#: src/app/main/ui/settings/integrations.cljs:126
-msgid "integrations.name.placeholder"
-msgstr "The name can help to know what's the token for"
-
-#: src/app/main/ui/settings/integrations.cljs:103
-msgid "integrations.notification.success.copied"
-msgstr "Copied token"
-
-#: src/app/main/ui/settings/integrations.cljs:64
-msgid "integrations.notification.success.created"
-msgstr "Token created successfully"
-
-#: src/app/main/ui/settings/integrations.cljs:327
-msgid "integrations.notification.success.copied-link"
-msgstr "Link copied to clipboard"
-
-#: src/app/main/ui/settings/integrations.cljs:293
-msgid "integrations.notification.success.mcp-server-disabled"
-msgstr "MCP server disabled"
-
-#: src/app/main/ui/settings/integrations.cljs:299
-msgid "integrations.notification.success.mcp-server-enabled"
-msgstr "MCP server enabled"
-
-#: src/app/main/ui/settings/integrations.cljs:317
-msgid "integrations.regenerate-mcp-key.info"
-msgstr "Regenerating the key will immediately revoke the current one. Any application using it will stop working."
-
-#: src/app/main/ui/settings/integrations.cljs:317
-msgid "integrations.regenerate-mcp-key.title"
-msgstr "Regenerate MCP key"
-
-#: src/app/main/ui/settings/integrations.cljs:318
-msgid "integrations.regenerate-mcp-key.title.created"
-msgstr "MCP key regenerated"
-
-#: src/app/main/ui/settings/integrations.cljs:480
-msgid "integrations.title"
-msgstr "Integrations"
-
-#: src/app/main/ui/settings/integrations.cljs:142
-msgid "integrations.token-will-expire"
-msgstr "The token will expire on %s"
-
-#: src/app/main/ui/settings/integrations.cljs:143
-msgid "integrations.token-will-not-expire"
-msgstr "The token has no expiration date"
-
 #: src/app/main/ui/dashboard/comments.cljs:96
 msgid "label.mark-all-as-read"
 msgstr "Mark all as read"
@@ -2486,9 +2354,6 @@ msgstr "Discard"
 msgid "labels.download"
 msgstr "Download %s"
 
-msgid "labels.download-simple"
-msgstr "Download"
-
 #: src/app/main/ui/dashboard/file_menu.cljs:30, src/app/main/ui/dashboard/files.cljs:80, src/app/main/ui/dashboard/files.cljs:179, src/app/main/ui/dashboard/projects.cljs:229, src/app/main/ui/dashboard/projects.cljs:233, src/app/main/ui/dashboard/sidebar.cljs:820
 msgid "labels.drafts"
 msgstr "Drafts"
@@ -2620,10 +2485,6 @@ msgstr "Info"
 msgid "labels.installed-fonts"
 msgstr "Installed fonts"
 
-#: src/app/main/ui/settings/sidebar.cljs:123
-msgid "labels.integrations"
-msgstr "Integrations"
-
 #: src/app/main/ui/static.cljs:405
 msgid "labels.internal-error.desc-message-first"
 msgstr "Something bad happened."
@@ -3283,6 +3144,30 @@ msgstr "Change email"
 msgid "modals.change-email.title"
 msgstr "Change your email"
 
+#: src/app/main/ui/settings/access_tokens.cljs:152, src/app/main/ui/settings/access_tokens.cljs:158
+msgid "modals.create-access-token.copy-token"
+msgstr "Copy token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:130
+msgid "modals.create-access-token.expiration-date.label"
+msgstr "Expiration date"
+
+#: src/app/main/ui/settings/access_tokens.cljs:124
+msgid "modals.create-access-token.name.label"
+msgstr "Name"
+
+#: src/app/main/ui/settings/access_tokens.cljs:126
+msgid "modals.create-access-token.name.placeholder"
+msgstr "The name can help to know what's the token for"
+
+#: src/app/main/ui/settings/access_tokens.cljs:178
+msgid "modals.create-access-token.submit-label"
+msgstr "Create token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:111
+msgid "modals.create-access-token.title"
+msgstr "Generate access token"
+
 #: src/app/main/ui/dashboard/team.cljs:1127
 msgid "modals.create-webhook.submit-label"
 msgstr "Create webhook"
@@ -3299,6 +3184,18 @@ msgstr "Payload URL"
 msgid "modals.create-webhook.url.placeholder"
 msgstr "https://example.com/postreceive"
 
+#: src/app/main/ui/settings/access_tokens.cljs:257
+msgid "modals.delete-acces-token.accept"
+msgstr "Delete token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:256
+msgid "modals.delete-acces-token.message"
+msgstr "Are you sure you want to delete this token?"
+
+#: src/app/main/ui/settings/access_tokens.cljs:255
+msgid "modals.delete-acces-token.title"
+msgstr "Delete token"
+
 #: src/app/main/ui/settings/delete_account.cljs:56
 msgid "modals.delete-account.cancel"
 msgstr "Cancel and keep my account"
@@ -5192,14 +5089,14 @@ msgstr "Shared Libraries - %s - Penpot"
 msgid "title.default"
 msgstr "Penpot - Design Freedom for Teams"
 
+#: src/app/main/ui/settings/access_tokens.cljs:278
+msgid "title.settings.access-tokens"
+msgstr "Profile - Access tokens"
+
 #: src/app/main/ui/settings/feedback.cljs:161
 msgid "title.settings.feedback"
 msgstr "Give feedback - Penpot"
 
-#: src/app/main/ui/settings/integrations.cljs:278
-msgid "title.settings.integrations"
-msgstr "Integrations - Penpot"
-
 #: src/app/main/ui/settings/notifications.cljs:45
 msgid "title.settings.notifications"
 msgstr "Notifications - Penpot"
@@ -7700,18 +7597,6 @@ msgstr "Paste"
 msgid "workspace.shape.menu.paste-props"
 msgstr "Paste properties"
 
-msgid "workspace.shape.menu.copy-as-image"
-msgstr "Copy as image"
-
-msgid "workspace.clipboard.copying"
-msgstr "Copying image…"
-
-msgid "workspace.clipboard.image-copied"
-msgstr "Image copied to the clipboard"
-
-msgid "workspace.clipboard.image-copy-failed"
-msgstr "Error copying image"
-
 #: src/app/main/ui/workspace/context_menu.cljs:443
 msgid "workspace.shape.menu.path"
 msgstr "Path"

frontend/translations/es.po

@@ -347,6 +347,77 @@ msgstr "Vas a restaurar %s."
 msgid "dashboard-restore-file-confirmation.title"
 msgstr "Restaurar archivo"
 
+#: src/app/main/ui/settings/access_tokens.cljs:103
+msgid "dashboard.access-tokens.copied-success"
+msgstr "Token copiado"
+
+#: src/app/main/ui/settings/access_tokens.cljs:189
+msgid "dashboard.access-tokens.create"
+msgstr "Generar nuevo token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:64
+msgid "dashboard.access-tokens.create.success"
+msgstr "Access token creado con éxito."
+
+#: src/app/main/ui/settings/access_tokens.cljs:286
+msgid "dashboard.access-tokens.empty.add-one"
+msgstr "Pulsa el botón \"Generar nuevo token\" para generar uno."
+
+#: src/app/main/ui/settings/access_tokens.cljs:285
+msgid "dashboard.access-tokens.empty.no-access-tokens"
+msgstr "Todavía no tienes ningún token."
+
+#: src/app/main/ui/settings/access_tokens.cljs:135
+msgid "dashboard.access-tokens.expiration-180-days"
+msgstr "180 días"
+
+#: src/app/main/ui/settings/access_tokens.cljs:132
+msgid "dashboard.access-tokens.expiration-30-days"
+msgstr "30 días"
+
+#: src/app/main/ui/settings/access_tokens.cljs:133
+msgid "dashboard.access-tokens.expiration-60-days"
+msgstr "60 días"
+
+#: src/app/main/ui/settings/access_tokens.cljs:134
+msgid "dashboard.access-tokens.expiration-90-days"
+msgstr "90 días"
+
+#: src/app/main/ui/settings/access_tokens.cljs:131
+msgid "dashboard.access-tokens.expiration-never"
+msgstr "Nunca"
+
+#: src/app/main/ui/settings/access_tokens.cljs:268
+msgid "dashboard.access-tokens.expired-on"
+msgstr "Expiró el %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:269
+msgid "dashboard.access-tokens.expires-on"
+msgstr "Expira el %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:267
+msgid "dashboard.access-tokens.no-expiration"
+msgstr "Sin fecha de expiración"
+
+#: src/app/main/ui/settings/access_tokens.cljs:184
+msgid "dashboard.access-tokens.personal"
+msgstr "Access tokens personales"
+
+#: src/app/main/ui/settings/access_tokens.cljs:185
+msgid "dashboard.access-tokens.personal.description"
+msgstr ""
+"Los access tokens personales funcionan como una alternativa a nuestro "
+"sistema de autenticación usuario/password y se pueden usar para permitir a "
+"otras aplicaciones acceso a la API interna de Penpot"
+
+#: src/app/main/ui/settings/access_tokens.cljs:142
+msgid "dashboard.access-tokens.token-will-expire"
+msgstr "El token expirará el %s"
+
+#: src/app/main/ui/settings/access_tokens.cljs:143
+msgid "dashboard.access-tokens.token-will-not-expire"
+msgstr "El token no tiene fecha de expiración"
+
 #: src/app/main/ui/dashboard/placeholder.cljs:41
 msgid "dashboard.add-file"
 msgstr "Añadir archivo"
@@ -369,7 +440,7 @@ msgstr "(copia)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:347
 msgid "dashboard.create-new-org"
-msgstr "+ Crear org"
+msgstr "Crear nueva organización"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:340
 msgid "dashboard.create-new-team"
@@ -2034,209 +2105,6 @@ msgstr "Valor resuelto:"
 msgid "inspect.tabs.styles.variants-panel"
 msgstr "Propiedades de las variantes"
 
-#: src/app/main/ui/settings/integrations.cljs:189
-msgid "integrations.access-tokens.create"
-msgstr "Crear nuevo token de acceso"
-
-#: src/app/main/ui/settings/integrations.cljs:286
-msgid "integrations.access-tokens.empty.add-one"
-msgstr "Pulsa el botón \"Crear nuevo token de accesso\" para generar uno."
-
-#: src/app/main/ui/settings/integrations.cljs:285
-msgid "integrations.access-tokens.empty.no-access-tokens"
-msgstr "Todavía no tienes ningún token."
-
-#: src/app/main/ui/settings/integrations.cljs:184
-msgid "integrations.access-tokens.personal"
-msgstr "Tokens de acceso personales"
-
-#: src/app/main/ui/settings/integrations.cljs:185
-msgid "integrations.access-tokens.personal.description"
-msgstr ""
-"Los tokens de accesso personales funcionan como una alternativa a nuestro "
-"sistema de autenticación usuario/password y se pueden usar para permitir a "
-"otras aplicaciones acceso a la API interna de Penpot"
-
-#: src/app/main/ui/settings/integrations.cljs:152, src/app/main/ui/settings/integrations.cljs:158
-msgid "integrations.copy-token"
-msgstr "Copiar token"
-
-#: src/app/main/ui/settings/integrations.cljs:432
-msgid "integrations.create-access-token.title"
-msgstr "Crear token de accesso"
-
-#: src/app/main/ui/settings/integrations.cljs:433
-msgid "integrations.create-access-token.title.created"
-msgstr "Token de acceso creado"
-
-#: src/app/main/ui/settings/integrations.cljs:290
-msgid "integrations.create-mcp-key.title"
-msgstr "Crear nueva clave MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:291
-msgid "integrations.create-mcp-key.title.created"
-msgstr "Clave MCP creada"
-
-#: src/app/main/ui/settings/integrations.cljs:257
-msgid "integrations.delete-token.accept"
-msgstr "Borrar token"
-
-#: src/app/main/ui/settings/integrations.cljs:256
-msgid "integrations.delete-token.message"
-msgstr "¿Seguro que deseas borrar este token?"
-
-#: src/app/main/ui/settings/integrations.cljs:255
-msgid "integrations.delete-token.title"
-msgstr "Borrar token"
-
-#: src/app/main/ui/settings/integrations.cljs:135
-msgid "integrations.expiration-180-days"
-msgstr "180 días"
-
-#: src/app/main/ui/settings/integrations.cljs:132
-msgid "integrations.expiration-30-days"
-msgstr "30 días"
-
-#: src/app/main/ui/settings/integrations.cljs:133
-msgid "integrations.expiration-60-days"
-msgstr "60 días"
-
-#: src/app/main/ui/settings/integrations.cljs:134
-msgid "integrations.expiration-90-days"
-msgstr "90 días"
-
-#: src/app/main/ui/settings/integrations.cljs:131
-msgid "integrations.expiration-never"
-msgstr "Nunca"
-
-#: src/app/main/ui/settings/integrations.cljs:268
-msgid "integrations.expired-on"
-msgstr "Expiró el %s"
-
-#: src/app/main/ui/settings/integrations.cljs:269
-msgid "integrations.expires-on"
-msgstr "Expira el %s"
-
-#: src/app/main/ui/settings/integrations.cljs:267
-msgid "integrations.no-expiration"
-msgstr "Sin fecha de expiración"
-
-#: src/app/main/ui/settings/integrations.cljs:130
-msgid "integrations.expiration-date.label"
-msgstr "Fecha de expiración"
-
-#: src/app/main/ui/settings/integrations.cljs:131
-msgid "integrations.info.non-recuperable"
-msgstr "Esta clave única no es recuperable. Si la pierdes, tendrás que crear una nueva."
-
-#: src/app/main/ui/settings/integrations.cljs:336
-msgid "integrations.mcp-server.title"
-msgstr "Servidor MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:336
-msgid "integrations.mcp-server.title.beta"
-msgstr "Beta"
-
-#: src/app/main/ui/settings/integrations.cljs:347
-msgid "integrations.mcp-server.description"
-msgstr "El servidor MCP de Penpot permite que los clientes MCP interactúen directamente con los archivos de diseño de Penpot."
-
-#: src/app/main/ui/settings/integrations.cljs:353
-msgid "integrations.mcp-server.status"
-msgstr "Estado"
-
-#: src/app/main/ui/settings/integrations.cljs:370
-msgid "integrations.mcp-server.status.enabled"
-msgstr "Habilitado"
-
-#: src/app/main/ui/settings/integrations.cljs:370
-msgid "integrations.mcp-server.status.disabled"
-msgstr "Deshabilitado"
-
-#: src/app/main/ui/settings/integrations.cljs:363
-msgid "integrations.mcp-server.status.expired.0"
-msgstr "La clave MCP utilizada para conectarse al servidor MCP ha expirado. Como resultado, no se puede establecer la conexión."
-
-#: src/app/main/ui/settings/integrations.cljs:368
-msgid "integrations.mcp-server.status.expired.1"
-msgstr "Por favor, regenera la clave MCP y actualiza la configuración de tu cliente con la nueva clave." 
-
-#: src/app/main/ui/settings/integrations.cljs:415
-msgid "integrations.mcp-server.mcp-keys.copy"
-msgstr "Copiar enlace"
-
-#: src/app/main/ui/settings/integrations.cljs:422
-msgid "integrations.mcp-server.mcp-keys.help"
-msgstr "Cómo configurar clientes MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:405
-msgid "integrations.mcp-server.mcp-keys.info"
-msgstr "Esta es la URL del servidor que necesitarás configurar en tu cliente MCP para conectarlo al servidor MCP de Penpot."
-
-#: src/app/main/ui/settings/integrations.cljs:387
-msgid "integrations.mcp-server.mcp-keys.regenerate"
-msgstr "Regenerar clave MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:381
-msgid "integrations.mcp-server.mcp-keys.title"
-msgstr "Claves MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:388
-msgid "integrations.mcp-server.mcp-keys.tootip"
-msgstr "La clave MCP es necesaria para la configuración del cliente MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:124
-msgid "integrations.name.label"
-msgstr "Nombre"
-
-#: src/app/main/ui/settings/integrations.cljs:126
-msgid "integrations.name.placeholder"
-msgstr "El nombre te pude ayudar a saber para qué se utiliza el token"
-
-#: src/app/main/ui/settings/integrations.cljs:103
-msgid "integrations.notification.success.copied"
-msgstr "Token copiado"
-
-#: src/app/main/ui/settings/integrations.cljs:64
-msgid "integrations.notification.success.created"
-msgstr "Token creado con éxito"
-
-#: src/app/main/ui/settings/integrations.cljs:327
-msgid "integrations.notification.success.copied-link"
-msgstr "Enlace copiado al portapapeles"
-
-#: src/app/main/ui/settings/integrations.cljs:293
-msgid "integrations.notification.success.mcp-server-disabled"
-msgstr "Servidor MCP deshabilitado"
-
-#: src/app/main/ui/settings/integrations.cljs:299
-msgid "integrations.notification.success.mcp-server-enabled"
-msgstr "Servidor MCP habilitado"
-
-#: src/app/main/ui/settings/integrations.cljs:317
-msgid "integrations.regenerate-mcp-key.info"
-msgstr "Regenerar la clave revocará inmediatamente la actual. Cualquier aplicación que la esté utilizando dejará de funcionar."
-
-#: src/app/main/ui/settings/integrations.cljs:317
-msgid "integrations.regenerate-mcp-key.title"
-msgstr "Regenerar clave MCP"
-
-#: src/app/main/ui/settings/integrations.cljs:318
-msgid "integrations.regenerate-mcp-key.title.created"
-msgstr "Clave MCP regenerada"
-
-#: src/app/main/ui/settings/integrations.cljs:480
-msgid "integrations.title"
-msgstr "Integraciones"
-
-#: src/app/main/ui/settings/integrations.cljs:142
-msgid "integrations.token-will-expire"
-msgstr "El token expirará el %s"
-
-#: src/app/main/ui/settings/integrations.cljs:143
-msgid "integrations.token-will-not-expire"
-msgstr "El token no tiene fecha de expiración"
-
 #: src/app/main/ui/dashboard/comments.cljs:96
 msgid "label.mark-all-as-read"
 msgstr "Marcar todo como leído"
@@ -2457,9 +2325,6 @@ msgstr "Descartar"
 msgid "labels.download"
 msgstr "Descargar %s"
 
-msgid "labels.download-simple"
-msgstr "Descargar"
-
 #: src/app/main/ui/dashboard/file_menu.cljs:30, src/app/main/ui/dashboard/files.cljs:80, src/app/main/ui/dashboard/files.cljs:179, src/app/main/ui/dashboard/projects.cljs:229, src/app/main/ui/dashboard/projects.cljs:233, src/app/main/ui/dashboard/sidebar.cljs:820
 msgid "labels.drafts"
 msgstr "Borradores"
@@ -2591,10 +2456,6 @@ msgstr "Información"
 msgid "labels.installed-fonts"
 msgstr "Fuentes instaladas"
 
-#: src/app/main/ui/settings/sidebar.cljs:123
-msgid "labels.integrations"
-msgstr "Integraciones"
-
 #: src/app/main/ui/static.cljs:405
 msgid "labels.internal-error.desc-message-first"
 msgstr "Ha ocurrido algo extraño."
@@ -3250,6 +3111,30 @@ msgstr "Cambiar correo"
 msgid "modals.change-email.title"
 msgstr "Cambiar tu correo"
 
+#: src/app/main/ui/settings/access_tokens.cljs:152, src/app/main/ui/settings/access_tokens.cljs:158
+msgid "modals.create-access-token.copy-token"
+msgstr "Copiar token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:130
+msgid "modals.create-access-token.expiration-date.label"
+msgstr "Fecha de expiración"
+
+#: src/app/main/ui/settings/access_tokens.cljs:124
+msgid "modals.create-access-token.name.label"
+msgstr "Nombre"
+
+#: src/app/main/ui/settings/access_tokens.cljs:126
+msgid "modals.create-access-token.name.placeholder"
+msgstr "El nombre te pude ayudar a saber para qué se utiliza el token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:178
+msgid "modals.create-access-token.submit-label"
+msgstr "Crear token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:111
+msgid "modals.create-access-token.title"
+msgstr "Generar access token"
+
 #: src/app/main/ui/dashboard/team.cljs:1127
 msgid "modals.create-webhook.submit-label"
 msgstr "Crear webhook"
@@ -3266,6 +3151,18 @@ msgstr "Payload URL"
 msgid "modals.create-webhook.url.placeholder"
 msgstr "https://example.com/postreceive"
 
+#: src/app/main/ui/settings/access_tokens.cljs:257
+msgid "modals.delete-acces-token.accept"
+msgstr "Borrar token"
+
+#: src/app/main/ui/settings/access_tokens.cljs:256
+msgid "modals.delete-acces-token.message"
+msgstr "¿Seguro que deseas borrar este token?"
+
+#: src/app/main/ui/settings/access_tokens.cljs:255
+msgid "modals.delete-acces-token.title"
+msgstr "Borrar token"
+
 #: src/app/main/ui/settings/delete_account.cljs:56
 msgid "modals.delete-account.cancel"
 msgstr "Cancelar y mantener mi cuenta"
@@ -5171,14 +5068,14 @@ msgstr "Bibliotecas Compartidas - %s - Penpot"
 msgid "title.default"
 msgstr "Penpot - Diseño Libre para Equipos"
 
+#: src/app/main/ui/settings/access_tokens.cljs:278
+msgid "title.settings.access-tokens"
+msgstr "Perfil - Access tokens"
+
 #: src/app/main/ui/settings/feedback.cljs:161
 msgid "title.settings.feedback"
 msgstr "Danos tu opinión - Penpot"
 
-#: src/app/main/ui/settings/integrations.cljs:278
-msgid "title.settings.integrations"
-msgstr "Integraciones - Penpot"
-
 #: src/app/main/ui/settings/notifications.cljs:45
 msgid "title.settings.notifications"
 msgstr "Notificaciones - Penpot"
@@ -7644,18 +7541,6 @@ msgstr "Pegar"
 msgid "workspace.shape.menu.paste-props"
 msgstr "Pegar propiedades"
 
-msgid "workspace.shape.menu.copy-as-image"
-msgstr "Copiar como imagen"
-
-msgid "workspace.clipboard.copying"
-msgstr "Copiando imagen…"
-
-msgid "workspace.clipboard.image-copied"
-msgstr "Imagen copiada al portapapeles"
-
-msgid "workspace.clipboard.image-copy-failed"
-msgstr "Error al copiar la imagen"
-
 #: src/app/main/ui/workspace/context_menu.cljs:443
 msgid "workspace.shape.menu.path"
 msgstr "Ruta"

plugins/apps/poc-tokens-plugin/src/app/app.component.html

@@ -113,7 +113,9 @@
                 class="body-m panel-item token-item"
                 (click)="applyToken(token.id)"
               >
-                <span>{{ token.name }}</span>
+                <span title="{{ token.resolvedValueString }}">
+                  {{ token.name }}
+                </span>
                 <button
                   type="button"
                   data-appearance="secondary"

plugins/apps/poc-tokens-plugin/src/app/app.component.ts

@@ -23,6 +23,7 @@ type Token = {
   id: string;
   name: string;
   description: string;
+  resolvedValueString: string;
 };
 
 type TokensGroup = [string, Token[]];

plugins/apps/poc-tokens-plugin/src/plugin.ts

@@ -109,6 +109,7 @@ function loadTokens(setId: string) {
             id: token.id,
             name: token.name,
             description: token.description,
+            resolvedValueString: token.resolvedValueString,
           };
         }),
       ]);

plugins/libs/plugin-types/index.d.ts

@@ -4345,6 +4345,15 @@ export interface TokenBase {
    */
   remove(): void;
 
+  /**
+   * The value calculated by finding all tokens with the same name in active sets
+   * and resolving the references.
+   *
+   * It's converted to string, regardless of the data type of the value depending
+   * on the token type. It can be undefined if no value has been found in active sets.
+   */
+  readonly resolvedValueString: string | undefined;
+
   /**
    * Applies this token to one or more properties of the given shapes.
    * @param shapes is an array of shapes to apply it.
@@ -5226,27 +5235,27 @@ type TokenDimensionProps =
 /**
  * The properties that a FontFamilies token can be applied to.
  */
-type TokenFontFamiliesProps = 'font-families';
+type TokenFontFamiliesProps = 'fontFamilies';
 
 /**
  * The properties that a FontSizes token can be applied to.
  */
-type TokenFontSizesProps = 'font-size';
+type TokenFontSizesProps = 'fontSize';
 
 /**
  * The properties that a FontWeight token can be applied to.
  */
-type TokenFontWeightProps = 'font-weight';
+type TokenFontWeightProps = 'fontWeight';
 
 /**
  * The properties that a LetterSpacing token can be applied to.
  */
-type TokenLetterSpacingProps = 'letter-spacing';
+type TokenLetterSpacingProps = 'letterSpacing';
 
 /**
  * The properties that a Number token can be applied to.
  */
-type TokenNumberProps = 'rotation' | 'line-height';
+type TokenNumberProps = 'rotation';
 
 /**
  * The properties that an Opacity token can be applied to.
@@ -5262,18 +5271,18 @@ type TokenSizingProps =
   | 'height'
 
   // Layout
-  | 'layout-item-min-w'
-  | 'layout-item-max-w'
-  | 'layout-item-min-h'
-  | 'layout-item-max-h';
+  | 'layoutItemMinW'
+  | 'layoutItemMaxW'
+  | 'layoutItemMinH'
+  | 'layoutItemMaxH';
 
 /**
  * The properties that a Spacing token can be applied to.
  */
 type TokenSpacingProps =
   // Spacing / Gap
-  | 'row-gap'
-  | 'column-gap'
+  | 'rowGap'
+  | 'columnGap'
 
   // Spacing / Padding
   | 'p1'
@@ -5290,17 +5299,17 @@ type TokenSpacingProps =
 /**
  * The properties that a BorderWidth token can be applied to.
  */
-type TokenBorderWidthProps = 'stroke-width';
+type TokenBorderWidthProps = 'strokeWidth';
 
 /**
  * The properties that a TextCase token can be applied to.
  */
-type TokenTextCaseProps = 'text-case';
+type TokenTextCaseProps = 'textCase';
 
 /**
  * The properties that a TextDecoration token can be applied to.
  */
-type TokenTextDecorationProps = 'text-decoration';
+type TokenTextDecorationProps = 'textDecoration';
 
 /**
  * The properties that a Typography token can be applied to.