From af93325fd9a8b5840d312606b2d7db1fd499c914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marina=20L=C3=B3pez?= Date: Thu, 13 Feb 2025 20:06:28 +0100 Subject: [PATCH] :tada: Consolidate suggested libraries and add library button (#5828) --- frontend/playwright/ui/pages/WorkspacePage.js | 2 +- .../src/app/main/ui/workspace/libraries.cljs | 16 +--------------- .../src/app/main/ui/workspace/libraries.scss | 10 ---------- .../app/main/ui/workspace/sidebar/assets.cljs | 17 ++--------------- frontend/translations/en.po | 8 -------- frontend/translations/es.po | 8 -------- 6 files changed, 4 insertions(+), 57 deletions(-) diff --git a/frontend/playwright/ui/pages/WorkspacePage.js b/frontend/playwright/ui/pages/WorkspacePage.js index 87a2eedab..f905cf8b4 100644 --- a/frontend/playwright/ui/pages/WorkspacePage.js +++ b/frontend/playwright/ui/pages/WorkspacePage.js @@ -221,7 +221,7 @@ export class WorkspacePage extends BaseWebSocketPage { } async openLibrariesModal(clickOptions = {}) { - await this.sidebar.getByText("Libraries").click(clickOptions); + await this.sidebar.getByTestId("libraries").click(clickOptions); await expect(this.librariesModal).toBeVisible(); } diff --git a/frontend/src/app/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs index ed4e8e4b9..5a07a1a25 100644 --- a/frontend/src/app/main/ui/workspace/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/libraries.cljs @@ -14,7 +14,6 @@ [app.common.types.file :as ctf] [app.common.types.typographies-list :as ctyl] [app.common.uuid :as uuid] - [app.config :as cf] [app.main.data.dashboard :as dd] [app.main.data.modal :as modal] [app.main.data.notifications :as ntf] @@ -354,7 +353,7 @@ (nil? shared-libraries) (tr "workspace.libraries.loading") - (and (str/empty? search-term) (cf/external-feature-flag "templates-03" "test")) + (str/empty? search-term) [:* [:div {:class (stl/css :sample-libraries-info)} (tr "workspace.libraries.empty.no-libraries") @@ -369,19 +368,6 @@ {:library library :importing importing*}])]] - (str/empty? search-term) - [:* - [:span {:class (stl/css :empty-state-icon)} - library-icon] - (tr "workspace.libraries.no-shared-libraries-available") - (when (cf/external-feature-flag "templates-01" "test") - [:div {:class (stl/css :templates-info)} - (tr "workspace.libraries.more-templates") - [:a {:target "_blank" - :class (stl/css :templates-info-link) - :href "https://penpot.app/libraries-templates"} - (tr "workspace.libraries.more-templates-link")]])] - :else (tr "workspace.libraries.no-matches-for" search-term))]))]])) diff --git a/frontend/src/app/main/ui/workspace/libraries.scss b/frontend/src/app/main/ui/workspace/libraries.scss index a1df227fe..41a3747dd 100644 --- a/frontend/src/app/main/ui/workspace/libraries.scss +++ b/frontend/src/app/main/ui/workspace/libraries.scss @@ -326,16 +326,6 @@ padding: $s-0 $s-16; } -.templates-info { - color: var(--color-accent-primary); -} - -.templates-info-link { - color: var(--color-accent-primary); - text-decoration: underline; - font-weight: $fw400; -} - .sample-libraries-info { display: flex; flex-direction: column; diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs index 893ac6317..10973c9a5 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -8,7 +8,6 @@ (:require-macros [app.main.style :as stl]) (:require [app.common.data.macros :as dm] - [app.config :as cf] [app.main.data.modal :as modal] [app.main.data.workspace :as dw] [app.main.data.workspace.assets :as dwa] @@ -92,12 +91,6 @@ reverse-sort? (= :desc ordering) num-libs (count (mf/deref refs/libraries)) - show-templates-04-test1? - (and (cf/external-feature-flag "templates-04" "test1") (zero? num-libs)) - - show-templates-04-test2? - (and (cf/external-feature-flag "templates-04" "test2") (zero? num-libs)) - toggle-ordering (mf/use-fn (mf/deps ordering) @@ -166,18 +159,12 @@ [:article {:class (stl/css :assets-bar)} [:div {:class (stl/css :assets-header)} (when-not ^boolean read-only? - (cond - show-templates-04-test1? - [:button {:class (stl/css :libraries-button) - :on-click show-libraries-dialog - :data-testid "libraries"} - (tr "workspace.assets.add-library")] - show-templates-04-test2? + (if (= num-libs 1) [:button {:class (stl/css :add-library-button) :on-click show-libraries-dialog :data-testid "libraries"} (tr "workspace.assets.add-library")] - :else + [:button {:class (stl/css :libraries-button) :on-click show-libraries-dialog :data-testid "libraries"} diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 3bc907e71..c185ea192 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -4786,10 +4786,6 @@ msgstr "Loading…" msgid "workspace.libraries.more-templates" msgstr "You can look for " -#: src/app/main/ui/workspace/libraries.cljs:391 -msgid "workspace.libraries.more-templates-link" -msgstr "more templates in here" - #: src/app/main/ui/workspace/libraries.cljs:481 msgid "workspace.libraries.no-libraries-need-sync" msgstr "There are no Shared Libraries that need update" @@ -4798,10 +4794,6 @@ msgstr "There are no Shared Libraries that need update" msgid "workspace.libraries.no-matches-for" msgstr "No matches found for “%s“" -#: src/app/main/ui/workspace/libraries.cljs:384 -msgid "workspace.libraries.no-shared-libraries-available" -msgstr "There are no Shared Libraries available" - #: src/app/main/ui/workspace/libraries.cljs:337 msgid "workspace.libraries.search-shared-libraries" msgstr "Search shared libraries" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 89f668712..9ffd59215 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -4804,10 +4804,6 @@ msgstr "Cargando…" msgid "workspace.libraries.more-templates" msgstr "Puedes buscar " -#: src/app/main/ui/workspace/libraries.cljs:391 -msgid "workspace.libraries.more-templates-link" -msgstr "más plantillas aquí" - #: src/app/main/ui/workspace/libraries.cljs:481 msgid "workspace.libraries.no-libraries-need-sync" msgstr "No hay bibliotecas que necesiten ser actualizadas" @@ -4816,10 +4812,6 @@ msgstr "No hay bibliotecas que necesiten ser actualizadas" msgid "workspace.libraries.no-matches-for" msgstr "No se encuentra “%s“" -#: src/app/main/ui/workspace/libraries.cljs:384 -msgid "workspace.libraries.no-shared-libraries-available" -msgstr "No hay bibliotecas compartidas disponibles" - #: src/app/main/ui/workspace/libraries.cljs:337 msgid "workspace.libraries.search-shared-libraries" msgstr "Buscar bibliotecas compartidas"