From d70fc3368963353d02fcadc103ad201581dac8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Tue, 30 Jan 2024 15:35:59 +0100 Subject: [PATCH] :sparkles: Show loading message in Libraries modal --- .../src/app/main/ui/workspace/libraries.cljs | 27 +++++++++++-------- frontend/translations/en.po | 4 +++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs index 8d6b7dcc9..6232f7c23 100644 --- a/frontend/src/app/main/ui/workspace/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/libraries.cljs @@ -123,11 +123,12 @@ shared-libraries (mf/with-memo [shared-libraries linked-libraries file-id search-term] - (->> shared-libraries - (remove #(= (:id %) file-id)) - (remove #(contains? linked-libraries (:id %))) - (filter #(matches-search (:name %) search-term)) - (sort-by (comp str/lower :name)))) + (when shared-libraries + (->> shared-libraries + (remove #(= (:id %) file-id)) + (remove #(contains? linked-libraries (:id %))) + (filter #(matches-search (:name %) search-term)) + (sort-by (comp str/lower :name))))) linked-libraries (mf/with-memo [linked-libraries] @@ -275,12 +276,17 @@ :on-click link-library} i/add-refactor]])] - [:div {:class (stl/css :section-list-empty)} - (if (nil? shared-libraries) - i/loader-pencil - (if (str/empty? search-term) + (when (empty? shared-libraries) + [:div {:class (stl/css :section-list-empty)} + (cond + (nil? shared-libraries) + (tr "workspace.libraries.loading") + + (str/empty? search-term) (tr "workspace.libraries.no-shared-libraries-available") - (tr "workspace.libraries.no-matches-for" search-term)))])]])) + + :else + (tr "workspace.libraries.no-matches-for" search-term))]))]])) (defn- extract-assets [file-data library summary?] @@ -519,4 +525,3 @@ [:& updates-tab {:file-id file-id :file-data file-data :libraries libraries}]]]]]]]])) - diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 0affa485f..69cad92bf 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -3593,6 +3593,10 @@ msgstr "Search shared libraries" msgid "workspace.libraries.shared-libraries" msgstr "SHARED LIBRARIES" +#: src/app/main/ui/workspace/libraries.cljs +msgid "workspace.libraries.loading" +msgstr "Loading…" + #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs msgid "workspace.libraries.text.multiple-typography" msgstr "Multiple typographies"