[ERM-4] - Implement the "Rollout and activate" action

Author: AlKaliada

ui.apps/src/main/content/jcr_root/apps/etoolbox-rollout-manager/clientlibs/rollout-manager-ui/js/console-ui.actions.js

@@ -16,7 +16,7 @@
  * EToolbox Rollout Manager clientlib.
  * 'Rollout' button and dialog actions definition.
  */
-(function (window, document, $, ERM, Granite) {
+(function (window, document, $, ns, Granite) {
     'use strict';
 
     const COLLECT_LIVE_COPIES_COMMAND = '/content/etoolbox-rollout-manager/servlet/collect-live-copies';
@@ -73,7 +73,7 @@
      * @returns {*}
      */
     function doItemsRollout(data, rolloutRequest) {
-        const logger = ERM.createLoggerDialog(PROCESSING_LABEL, ROLLOUT_IN_PROGRESS_LABEL, data.path);
+        const logger = ns.createLoggerDialog(PROCESSING_LABEL, ROLLOUT_IN_PROGRESS_LABEL, data.path);
         return $.Deferred()
             .resolve()
             .then(rolloutRequest(data, logger))
@@ -129,7 +129,7 @@
             .then((liveCopiesJsonArray) => {
                 // Clears the wait mask once the dialog is loaded
                 foundationUi.clearWait();
-                ERM.showRolloutDialog(liveCopiesJsonArray, selectedPath)
+                ns.showRolloutDialog(liveCopiesJsonArray, selectedPath)
                     .then((data) => {
                         doItemsRollout(data, buildRolloutRequest);
                     });
@@ -154,4 +154,4 @@
             name: 'etoolbox.rollout-manager.rollout-active-condition',
             handler: onRolloutActiveCondition
         });
-})(window, document, Granite.$, Granite.ERM, Granite);
+})(window, document, Granite.$, window.erm = (window.erm || {}), Granite);

ui.apps/src/main/content/jcr_root/apps/etoolbox-rollout-manager/clientlibs/rollout-manager-ui/js/console-ui.dialog.js

@@ -16,11 +16,9 @@
  * EToolbox Rollout Manager clientlib.
  * Contains helper functions to showing the rollout process dialogs.
  */
-(function (window, document, $, Granite) {
+(function (document, $, Granite, ns) {
     'use strict';
 
-    const Utils = Granite.ERM = (Granite.ERM || {});
-
     const LOGGER_DIALOG_CLASS = 'rollout-manager-logger-dialog';
     const BASE_DIALOG_CLASS = 'rollout-manager-dialog';
 
@@ -103,7 +101,7 @@
             }
         };
     }
-    Utils.createLoggerDialog = createLoggerDialog;
+    ns.createLoggerDialog = createLoggerDialog;
 
     // Rollout dialog related constants
     const CANCEL_LABEL = Granite.I18n.get('Cancel');
@@ -185,9 +183,9 @@
             ).text(liveCopyJson.path).attr('disabled', !!liveCopyJson.disabled);
         const lastRolledOutTimeAgo =
             $(`<i
-                title="${TimeUtil.displayLastRolledOut(liveCopyJson.lastRolledOut)}"
+                title="${ns.TimeUtil.displayLastRolledOut(liveCopyJson.lastRolledOut)}"
                 class="rollout-manager-last-rollout-date">`
-            ).text(TimeUtil.timeSince(liveCopyJson.lastRolledOut));
+            ).text(ns.TimeUtil.timeSince(liveCopyJson.lastRolledOut));
         liveCopyCheckbox.append(lastRolledOutTimeAgo);
         if (liveCopyJson.liveCopies && liveCopyJson.liveCopies.length > 0) {
             const accordion = initNestedAccordion(liveCopyCheckbox, liveCopyJson.liveCopies);
@@ -318,5 +316,5 @@
 
         return deferred.promise();
     }
-    Utils.showRolloutDialog = showRolloutDialog;
-})(window, document, Granite.$, Granite);
+    ns.showRolloutDialog = showRolloutDialog;
+})(document, Granite.$, Granite, (window.erm = (window.erm || {})));

ui.apps/src/main/content/jcr_root/apps/etoolbox-rollout-manager/clientlibs/rollout-manager-ui/js/time-util.js

@@ -16,8 +16,9 @@
  * EToolbox Rollout Manager Time Utility.
  * Contains utilities for time data processing
  */
-(function ($, ns, TimeUtil) {
+(function ($, ns) {
     'use strict';
+    ns.TimeUtil = {};
 
     const NOT_ROLLED_OUT_LABEL = Granite.I18n.get('Not Rolled Out');
     const TIME_AGO_LABEL = Granite.I18n.get('ago');
@@ -53,7 +54,7 @@
      * @param {string} date - The date to calculate the time difference from (ISO 8601 format).
      * @returns {string} A formatted string indicating the time difference.
      */
-    TimeUtil.timeSince = function (date) {
+    ns.TimeUtil.timeSince = function (date) {
         if (!date) {
             return NOT_ROLLED_OUT_LABEL;
         }
@@ -80,11 +81,11 @@
      * @param {string} date - The date to format (ISO 8601 format).
      * @returns {string} A formatted timestamp string.
      */
-    TimeUtil.displayLastRolledOut = function (date) {
+    ns.TimeUtil.displayLastRolledOut = function (date) {
         if (!date) {
             return '';
         }
         return new Date(date).toLocaleString(undefined, TIME_FORMATTER_OPTIONS);
     };
 
-})(Granite.$, Granite.author, (window.TimeUtil = (window.TimeUtil || {})));
+})(Granite.$, window.erm = (window.erm || {}));