From 01d4c9584c6ab2bb11975702a166d2ad123159ac Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 27 Sep 2024 18:44:16 +0100 Subject: [PATCH 1/2] feat: Delete useless trigger while extensionRegistry trigger its own event - MEED-7475 - Meeds-io/MIPs#151 This change ensures to use extensionRegistry trigger rather than a custom trigger to define extensions which is redundant. --- kudos-webapps/src/main/webapp/vue-app/js/Kudos.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kudos-webapps/src/main/webapp/vue-app/js/Kudos.js b/kudos-webapps/src/main/webapp/vue-app/js/Kudos.js index 460769c43..d7b6205a8 100644 --- a/kudos-webapps/src/main/webapp/vue-app/js/Kudos.js +++ b/kudos-webapps/src/main/webapp/vue-app/js/Kudos.js @@ -208,7 +208,6 @@ export function registerExternalExtensions(title) { }, }; extensionRegistry.registerExtension('profile-extension', 'action', profileExtensionAction); - document.dispatchEvent(new CustomEvent('profile-extension-updated', { detail: profileExtensionAction})); } export function registerOverviewExtension() { From a23706fc16c2f22e803723f62a06eb0528868da5 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Tue, 1 Oct 2024 15:27:10 +0100 Subject: [PATCH 2/2] feat: Update calls to UserACL to avoid implicit usage of Conversation State in Service Layer - MEED-7555 - Meeds-io/MIPs#151 (#530) This change will update UserACL usage to not implicitly use the current conversation state of authenticated user. --- kudos-webapps/src/main/webapp/WEB-INF/pages/kudosOverview.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kudos-webapps/src/main/webapp/WEB-INF/pages/kudosOverview.jsp b/kudos-webapps/src/main/webapp/WEB-INF/pages/kudosOverview.jsp index 9fe1de94c..356df6bd1 100644 --- a/kudos-webapps/src/main/webapp/WEB-INF/pages/kudosOverview.jsp +++ b/kudos-webapps/src/main/webapp/WEB-INF/pages/kudosOverview.jsp @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ %> +<%@ page import="org.exoplatform.services.security.ConversationState"%> <%@ page import="org.exoplatform.social.webui.Utils"%> <%@ page import="org.exoplatform.portal.config.model.Page"%> <%@ page import="org.exoplatform.portal.application.PortalRequestContext"%> @@ -28,7 +29,7 @@ String portletStorageId = ((String) request.getAttribute("portletStorageId")); String kudosPeriod = request.getAttribute("kudosPeriod") == null ? "week" : ((String[]) request.getAttribute("kudosPeriod"))[0]; Page currentPage = PortalRequestContext.getCurrentInstance().getPage(); - boolean canEdit = ExoContainerContext.getService(UserACL.class).hasEditPermission(currentPage); + boolean canEdit = ExoContainerContext.getService(UserACL.class).hasEditPermission(currentPage, ConversationState.getCurrent().getIdentity()); String pageRef = currentPage.getPageKey().format(); %>