Merge branch 'main' into 30820-custom-hook-content-analytics-sdk

dotCMS · Dec 17, 2024 · d49793f · d49793f
2 parents 5cf2435 + 65ad5d1
commit d49793f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 2 deletions.
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts
@@ -152,6 +152,7 @@ export const MOCK_RESPONSE_HEADLESS: DotPageApiResponse = {
         inode: '123-i',
         canEdit: true,
         canRead: true,
+        canSeeRules: true,
         contentType: 'htmlpageasset',
         canLock: true,
         locked: false,
@@ -212,6 +213,7 @@ export const MOCK_RESPONSE_VTL: DotPageApiResponse = {
         inode: '123-i',
         canEdit: true,
         canRead: true,
+        canSeeRules: true,
         rendered: '<html><body><h1>Hello, World!</h1></body></html>',
         contentType: 'htmlpageasset',
         canLock: true,
@@ -427,6 +429,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
             inode: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'index',
             liveInode: '1234',
             stInode: '12345',
@@ -455,6 +458,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
             inode: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'index',
             liveInode: '1234',
             stInode: '12345',
@@ -483,6 +487,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
             inode: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'index',
             liveInode: '1234',
             stInode: '12345',
@@ -757,6 +762,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             identifier: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             canLock: false,
             isLocked: true,
@@ -785,6 +791,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             identifier: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             canLock: true,
             locked: true,
@@ -811,6 +818,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             inode: PAGE_INODE_MOCK,
             identifier: '123',
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             canEdit: false
         },
@@ -836,6 +844,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             inode: PAGE_INODE_MOCK,
             identifier: 'i-have-a-running-experiment',
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             rendered: '<div>New Content - Hello World</div>',
             canEdit: true
@@ -862,6 +871,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             inode: PAGE_INODE_MOCK,
             identifier: '123',
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             rendered: '<div>New Content - Hello World</div>',
             canEdit: true
@@ -888,6 +898,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             inode: PAGE_INODE_MOCK,
             identifier: '123',
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             rendered: '<div>hello world</div>',
             canEdit: true
@@ -914,6 +925,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             inode: PAGE_INODE_MOCK,
             identifier: '123',
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one',
             canEdit: true
         },
@@ -939,6 +951,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
             identifier: '123',
             canEdit: true,
             canRead: true,
+            canSeeRules: true,
             pageURI: 'page-one'
         },
         site: {

diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts
@@ -170,6 +170,7 @@ export interface DotPage {
     inode: string;
     canEdit: boolean;
     canRead: boolean;
+    canSeeRules: boolean;
     canLock?: boolean;
     locked?: boolean;
     lockedBy?: string;

diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts
@@ -98,7 +98,8 @@ export const UVEStore = signalStore(
                                 label: 'editema.editor.navbar.rules',
                                 id: 'rules',
                                 href: `rules/${page?.identifier}`,
-                                isDisabled: !page?.canEdit || !isEnterpriseLicense
+                                isDisabled:
+                                    !page?.canSeeRules || !page?.canEdit || !isEnterpriseLicense
                             },
                             {
                                 iconURL: 'experiments',

diff --git a/...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java b/...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java
@@ -99,6 +99,8 @@ protected Map<String, Object> transform(final HTMLPageAsset page, final Map<Stri
         map.put("canEdit", toolBox.permissionAPI.doesUserHavePermission(page, PermissionLevel.EDIT.getType(), user, false));
         map.put("canRead", toolBox.permissionAPI.doesUserHavePermission(page, PermissionLevel.READ.getType(), user, false));
         map.put("canLock", canLock(page, user));
+        map.put("canSeeRules", toolBox.permissionAPI.doesUserHavePermissions(page, "RULES: " + PermissionLevel.READ.getType(), user, false));
+
 
         if(info.isPresent() && info.get().getLockedBy()!=null) {
             map.put("lockedOn", info.get().getLockedOn());

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp
@@ -15,6 +15,11 @@
 <%@ page import="com.liferay.portal.language.LanguageUtil"%>
 <%@ page import="java.util.stream.Collectors" %>
 <%@ page import="com.dotcms.publisher.business.PublishQueueElementTransformer" %>
+<%@ page import="com.dotcms.publisher.bundle.bean.Bundle" %>
+<%@ page import="com.dotmarketing.exception.DotDataException" %>
+<%@ page import="com.dotmarketing.util.Logger" %>
+<%@ page import="com.liferay.util.StringPool" %>
+<%@ page import="com.dotcms.publishing.FilterDescriptor" %>
 <%@ include file="/html/portlet/ext/contentlet/publishing/init.jsp" %>
 <%
 	final int MAX_ASSETS_TO_SHOW = 3;
@@ -288,6 +293,7 @@
 
 
 			<th  nowrap="nowrap" ><strong><%= LanguageUtil.get(pageContext, "publisher_Identifier") %></strong></th>
+			<th  nowrap="nowrap" ><strong><%= LanguageUtil.get(pageContext, "Filter") %></strong></th>
 			<th style="width:100%" nowrap="nowrap" ><strong><%= LanguageUtil.get(pageContext, "publisher_Contents") %></strong></th>
 			<th style="width:100px" nowrap="nowrap" ><strong><%= LanguageUtil.get(pageContext, "publisher_Status") %></strong></th>
 			<th style="width:40px" nowrap="nowrap" ><strong><%= LanguageUtil.get(pageContext, "publisher_Date_Entered") %></strong></th>
@@ -322,6 +328,18 @@
 					}
 					shortBundleId.append("-").append(bundleIdParts[i]);
 				}
+
+				String filterName = "";
+				try {
+					final Bundle bundle = APILocator.getBundleAPI().getBundleById(c.getBundleId());
+					if ( UtilMethods.isSet(bundle) && UtilMethods.isSet(bundle.getFilterKey()) ) {
+						final FilterDescriptor filterDescriptor =
+								APILocator.getPublisherAPI().getFilterDescriptorByKey(bundle.getFilterKey());
+						filterName = filterDescriptor != null ? filterDescriptor.getTitle() : "";
+					}
+				} catch (DotDataException e) {
+					Logger.error(this, "Error getting bundle id: " + c.getBundleId(), e);
+				}
 		%>
 			<tr <%=errorclass%>>
 				<td style="width:30px;text-align:center;" valign="top">
@@ -336,7 +354,11 @@
 				<td valign="top" nowrap="nowrap" style="cursor: pointer" onclick="javascript: showDetail('<%=c.getBundleId()%>')">
 					<%=shortBundleId.toString()%>
 				</td>
-				<%--BundleTitle--%>
+				<%--BundleFilter--%>
+				<td valign="top" nowrap="nowrap" style="cursor: pointer" onclick="javascript: showDetail('<%=c.getBundleId()%>')">
+					<%= filterName %>
+				</td>
+				<%--BundleContents--%>
 				<%try{ %>
 					<% if(bundleAssets.keySet().size()>0){ %>
 						<td valign="top" style="cursor: pointer" onclick="showDetail('<%=c.getBundleId()%>', event)">