#30411 adding last renames

dotCMS · Nov 27, 2024 · 1ff54d8 · 1ff54d8
1 parent 6ba6527
commit 1ff54d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/BasicProfileCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/BasicProfileCollector.java
@@ -69,8 +69,6 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
         collectorPayloadBean.put(PERSONA,
                 WebAPILocator.getPersonalizationWebAPI().getContainerPersonalization(request));
 
-        collectorPayloadBean.put(RENDER_MODE, PageMode.get(request).toString().replace("_MODE", StringPool.BLANK));
-
         // Include default value for other boolean fields in the Clickhouse table
         collectorPayloadBean.put(COME_FROM_VANITY_URL, false);
         collectorPayloadBean.put(IS_EXPERIMENT_PAGE, false);

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/FilesCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/FilesCollector.java
@@ -9,6 +9,7 @@
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.fileassets.business.FileAssetAPI;
 import com.liferay.util.StringPool;
+import io.vavr.control.Try;
 
 import java.util.HashMap;
 import java.util.Objects;
@@ -61,6 +62,8 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
                 fileObject.put(CONTENT_TYPE_NAME, fileAsset.getContentType().name());
                 fileObject.put(CONTENT_TYPE_VAR_NAME, fileAsset.getContentType().variable());
                 fileObject.put(BASE_TYPE, fileAsset.getContentType().baseType().name());
+                fileObject.put(LIVE,    String.valueOf(Try.of(()->fileAsset.isLive()).getOrElse(false)));
+                fileObject.put(WORKING, String.valueOf(Try.of(()->fileAsset.isWorking()).getOrElse(false)));
             });
         }
 

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PageDetailCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PageDetailCollector.java
@@ -82,6 +82,8 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
             pageObject.put(CONTENT_TYPE_NAME, urlMapContentlet.getContentType().name());
             pageObject.put(CONTENT_TYPE_VAR_NAME, urlMapContentlet.getContentType().variable());
             pageObject.put(BASE_TYPE, urlMapContentlet.getContentType().baseType().name());
+            pageObject.put(LIVE,    String.valueOf(Try.of(()->urlMapContentlet.isLive()).getOrElse(false)));
+            pageObject.put(WORKING, String.valueOf(Try.of(()->urlMapContentlet.isWorking()).getOrElse(false)));
             pageObject.put(DETAIL_PAGE_URL, Try.of(detailPageContent::getURI).getOrElse(StringPool.BLANK));
             collectorPayloadBean.put(OBJECT,  pageObject);
         }

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PagesCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PagesCollector.java
@@ -76,6 +76,8 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
                     pageObject.put(CONTENT_TYPE_NAME, urlMapContentType.name());
                     pageObject.put(CONTENT_TYPE_VAR_NAME, urlMapContentType.variable());
                     pageObject.put(BASE_TYPE, urlMapContentType.baseType().name());
+                    pageObject.put(LIVE,    String.valueOf(Try.of(()->urlMapContentlet.isLive()).getOrElse(false)));
+                    pageObject.put(WORKING, String.valueOf(Try.of(()->urlMapContentlet.isWorking()).getOrElse(false)));
                     collectorPayloadBean.put(EVENT_TYPE, EventType.URL_MAP.getType());
                 }
             } else {