Merge pull request penpot#4852 from penpot/alotor-plugins-7

✨ Small improvements over plugin manager
n-stha · Jul 8, 2024 · 1b05e7a · 1b05e7a
2 parents 6f8ce1f + 2cc3f65
commit 1b05e7a
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/frontend/src/app/main/ui/workspace/plugins.cljs b/frontend/src/app/main/ui/workspace/plugins.cljs
@@ -86,6 +86,8 @@
         plugin-url* (mf/use-state "")
         plugin-url  @plugin-url*
 
+        fetching-manifest? (mf/use-state false)
+
         input-status* (mf/use-state nil) ;; :error-url :error-manifest :success
         input-status  @input-status*
 
@@ -106,13 +108,15 @@
         (mf/use-callback
          (mf/deps plugins-state plugin-url)
          (fn []
+           (reset! fetching-manifest? true)
            (->> (http/send! {:method :get
                              :uri plugin-url
                              :omit-default-headers true
                              :response-type :json})
                 (rx/map :body)
                 (rx/subs!
                  (fn [body]
+                   (reset! fetching-manifest? false)
                    (let [plugin (plugins/parser-manifest plugin-url body)]
                      (st/emit! (ptk/event ::ev/event {::ev/name "install-plugin" :name (:name plugin) :url plugin-url}))
                      (modal/show!
@@ -125,6 +129,7 @@
                      (reset! input-status* :success)
                      (reset! plugin-url* "")))
                  (fn [_]
+                   (reset! fetching-manifest? false)
                    (reset! input-status* :error-url))))))
 
         handle-open-plugin
@@ -161,12 +166,18 @@
                         :class (stl/css-case :input-error error?)}]
 
         [:button {:class (stl/css :primary-button)
+                  :disabled @fetching-manifest?
                   :on-click handle-install-click} (tr "workspace.plugins.install")]]
 
        (when error?
          [:div {:class (stl/css-case :info true :error error?)}
           (tr "workspace.plugins.error.url")])
 
+       [:> i18n/tr-html*
+        {:class (stl/css :discover)
+         :on-click #(st/emit! (ptk/event ::ev/event {::ev/name "open-plugins-list"}))
+         :content (tr "workspace.plugins.discover" cf/plugins-list-uri)}]
+
        [:hr]
 
        (if (empty? plugins-state)

diff --git a/frontend/src/app/main/ui/workspace/plugins.scss b/frontend/src/app/main/ui/workspace/plugins.scss
@@ -213,7 +213,7 @@ div.input-error {
   gap: $s-4;
 
   svg {
-    margin-top: calc(-1 * var($s-2));
+    margin-top: calc(-1 * $s-2);
     width: $s-12;
     height: $s-12;
     stroke: $da-primary;
@@ -262,3 +262,13 @@ div.input-error {
   display: flex;
   gap: $s-12;
 }
+
+.discover {
+  @include bodySmallTypography;
+  color: $df-secondary;
+  margin-top: $s-24;
+
+  a {
+    color: $da-primary;
+  }
+}
diff --git a/frontend/src/app/plugins/register.cljs b/frontend/src/app/plugins/register.cljs
@@ -34,7 +34,12 @@
 
 (defn install-plugin!
   [plugin]
-  (let [plugins (vec (conj (seq @pluginsdb) plugin))]
+  (let [plugins (as-> @pluginsdb $
+                  (remove (fn [{:keys [name host]}]
+                            (and (= name (:name plugin))
+                                 (= host (:host plugin)))) $)
+                  (conj $ plugin)
+                  (vec $))]
     (reset! pluginsdb plugins)
     (save-to-store plugins)))
 

diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs
@@ -174,10 +174,11 @@
 
 (mf/defc tr-html*
   {::mf/props :obj}
-  [{:keys [content class tag-name]}]
+  [{:keys [content class tag-name on-click]}]
   (let [tag-name (d/nilv tag-name "p")]
     [:> tag-name {:dangerouslySetInnerHTML #js {:__html content}
-                  :className class}]))
+                  :className class
+                  :on-click on-click}]))
 
 ;; DEPRECATED
 (defn use-locale

diff --git a/frontend/translations/en.po b/frontend/translations/en.po
@@ -5282,7 +5282,7 @@ msgid "workspace.plugins.menu.title"
 msgstr "Plugins"
 
 msgid "workspace.toolbar.plugins"
-msgstr "Plugins"
+msgstr "Plugins (%s)"
 
 msgid "workspace.plugins.menu.plugins-manager"
 msgstr "Plugins manager"
@@ -5310,3 +5310,8 @@ msgstr "Read your libraries and assets."
 
 msgid "workspace.plugins.permissions.library-write"
 msgstr "Read and modify your libraries and assets."
+
+#, markdown
+msgid "workspace.plugins.discover"
+msgstr ""
+"Discover [more plugins](%s)"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
@@ -5362,7 +5362,7 @@ msgid "workspace.plugins.title"
 msgstr "Extensiones"
 
 msgid "workspace.toolbar.plugins"
-msgstr "Extensiones"
+msgstr "Extensiones (%s)"
 
 msgid "workspace.plugins.search-placeholder"
 msgstr "Intruduzca URL de la extensión"
@@ -5414,3 +5414,8 @@ msgstr "Leer la información de sus bibliotecas y recursos."
 
 msgid "workspace.plugins.permissions.library-write"
 msgstr "Leer y modificar la información de sus bibliotecas y recursos."
+
+#, markdown
+msgid "workspace.plugins.discover"
+msgstr ""
+"Descubre [más extensiones](%s)"