From 9728f1ba806bda63772b175013e8956ecadba6ca Mon Sep 17 00:00:00 2001
From: Pablo Alba <pablo.alba@kaleidos.net>
Date: Fri, 25 Oct 2024 14:34:57 +0200
Subject: [PATCH 1/2] :bug: Fix unexpected failure on plugins-menu and
info-menu
---
frontend/src/app/main/ui/workspace/main_menu.cljs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/src/app/main/ui/workspace/main_menu.cljs b/frontend/src/app/main/ui/workspace/main_menu.cljs
index 763c9c883..d75c75b57 100644
--- a/frontend/src/app/main/ui/workspace/main_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/main_menu.cljs
@@ -846,12 +846,12 @@
:on-close close-sub-menu}]
:plugins
- [:& plugins-menu*
+ [:> plugins-menu*
{:open-plugins open-plugins-manager
:on-close close-sub-menu}]
:help-info
- [:& help-info-menu*
+ [:> help-info-menu*
{:layout layout
:on-close close-sub-menu}]
From 122acb3eeee7380aa0cd6a72a3520d5d47d35c74 Mon Sep 17 00:00:00 2001
From: Pablo Alba <pablo.alba@kaleidos.net>
Date: Fri, 25 Oct 2024 17:42:21 +0200
Subject: [PATCH 2/2] :bug: Fix view role user have menu option for unpublish a
library
---
.../src/app/main/ui/workspace/main_menu.cljs | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/frontend/src/app/main/ui/workspace/main_menu.cljs b/frontend/src/app/main/ui/workspace/main_menu.cljs
index d75c75b57..7fd4cddb5 100644
--- a/frontend/src/app/main/ui/workspace/main_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/main_menu.cljs
@@ -479,7 +479,7 @@
(mf/defc file-menu*
{::mf/props :obj
::mf/private true}
- [{:keys [on-close file can-edit]}]
+ [{:keys [on-close file]}]
(let [file-id (:id file)
shared? (:is-shared file)
@@ -487,6 +487,9 @@
frames (->> (cfh/get-immediate-children objects uuid/zero)
(filterv cfh/frame-shape?))
+ perms (mf/use-ctx ctx/team-permissions)
+ can-edit (:can-edit perms)
+
on-remove-shared
(mf/use-fn
(mf/deps file-id)
@@ -567,11 +570,12 @@
:on-close on-close}
(if ^boolean shared?
- [:> dropdown-menu-item* {:class (stl/css :submenu-item)
- :on-click on-remove-shared
- :on-key-down on-remove-shared-key-down
- :id "file-menu-remove-shared"}
- [:span {:class (stl/css :item-name)} (tr "dashboard.unpublish-shared")]]
+ (when can-edit
+ [:> dropdown-menu-item* {:class (stl/css :submenu-item)
+ :on-click on-remove-shared
+ :on-key-down on-remove-shared-key-down
+ :id "file-menu-remove-shared"}
+ [:span {:class (stl/css :item-name)} (tr "dashboard.unpublish-shared")]])
(when can-edit
[:> dropdown-menu-item* {:class (stl/css :submenu-item)