Publishing Report widget stops rendering after switching from Archive…

… to Content #1111

-Need to differentiate containers of the widget in studio and archive by using separate container ids

src/main/resources/admin/widgets/publish-report/publish-report.html

@@ -1,4 +1,4 @@
-<widget id="cs-plus-widget-publish-report">
+<widget id="{{containerId}}">
     {{#isNoIdMode}}
     <div class="error">Select an item - and we'll show you the details!</div>
     {{/isNoIdMode}}

src/main/resources/admin/widgets/publish-report/publish-report.js

@@ -3,6 +3,9 @@ const contentLib = require('/lib/xp/content');
 const contextLib = require('/lib/xp/context');
 const mustache = require('/lib/mustache');
 
+
+const defaultContainerId = 'cs-plus-widget-publish-report';
+
 const handleGet = (req) => {
     return renderWidgetView(req);
 }
@@ -19,7 +22,8 @@ const getContentId = (req) => {
 
 const makeParamsNoContentId = () => {
     return {
-        isNoIdMode: true
+        isNoIdMode: true,
+        containerId: defaultContainerId,
     }
 }
 
@@ -37,6 +41,7 @@ const makeParams = (content, isArchived) => {
         publishFirst: content.publish.first,
         isNormalMode: !!content.publish.first,
         isNoPublishMode: !content.publish.first,
+        containerId: defaultContainerId + (isArchived ? '-archived' : ''),
         isArchived
     }
 }

src/main/resources/assets/js/widgets/publish-report/main.ts

@@ -12,13 +12,15 @@ void (async () => {
 
     const contentId = document.currentScript.getAttribute('data-content-id');
     const publishFirstAsString = document.currentScript.getAttribute('data-publish-first');
-    const isArchived = document.currentScript.getAttribute('data-archived');
+    const isArchivedAttrValue = document.currentScript.getAttribute('data-archived');
+    const isArchived = Boolean(isArchivedAttrValue == 'true');
 
     await CONFIG.init(configServiceUrl);
     await i18nInit(CONFIG.getString('services.i18nUrlStudio'));
     await i18nAdd(CONFIG.getString('services.i18nUrl'));
 
-    const widgetContainer = document.getElementById(AppHelper.getPublishReportWidgetClass());
+    const containerId = AppHelper.getPublishReportWidgetClass() + (isArchived ? '-archived' : '');
+    const widgetContainer = document.getElementById(containerId);
 
     if (widgetContainer) {
         const widgetContainerEl = Element.fromHtmlElement((widgetContainer), true);
@@ -27,7 +29,7 @@ void (async () => {
         const widget: PublishReportWidget =
             PublishReportWidget.get()
             .setPublishFirstDateString(publishFirstAsString)
-            .setIsContentArchived(Boolean(isArchived == 'true'));
+            .setIsContentArchived(isArchived);
 
         widget.setContentId(contentId);