@sapui5/sap.ushell 1.136.2 → 1.138.0

package/src/main/js/sap/ushell/UserActivityLog.js

@@ -35,7 +35,7 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/Container",
     "sap/ushell/state/StateManager"
-], function (
+], (
     Log,
     extend,
     Element,
@@ -47,11 +47,11 @@ sap.ui.define([
     urlParsing,
     Container,
     StateManager
-) {
+) => {
     "use strict";
 
     // Constructor
-    var UserActivityLogClass = function () { };
+    function UserActivityLogClass () { }
 
     UserActivityLogClass.prototype = {
         _maxLoggedMessages: 50,
@@ -82,31 +82,31 @@ sap.ui.define([
 
         _tileOntapOrigFunc: undefined,
 
-        activate: function (/*clean*/) {
+        activate: function (/* clean */) {
             if (this._isActive) {
                 return;
             }
 
             this._isActive = true;
 
-            var oEventBus = EventBus.getInstance();
+            const oEventBus = EventBus.getInstance();
 
             // Action logging: Subscribe to all the events in  _observedLaunchpadActions - User actions
-            this._observedLaunchpadActions.forEach(function (item) {
+            this._observedLaunchpadActions.forEach((item) => {
                 oEventBus.subscribe("launchpad", item, this._handleAction, this);
-            }.bind(this));
+            });
 
             oEventBus.subscribe("sap.ushell", "appOpened", this._handleAction, this);
 
             // Action logging: Subscribe to all the events in  _observedGeneralActions - User actions
-            this._observedGeneralActions.forEach(function (item) {
+            this._observedGeneralActions.forEach((item) => {
                 oEventBus.subscribe(item, this._handleAction, this);
-            }.bind(this));
+            });
 
             // Action logging: Subscribe to all the events in  _observedEventHubEvents - User actions
-            this._observedEventHubEvents.forEach(function (item) {
+            this._observedEventHubEvents.forEach((item) => {
                 this._aDoables.push(EventHub.on(item).do(this._handleActionEventHub.bind(this)));
-            }.bind(this));
+            });
 
             Log.addLogListener(this);
 
@@ -121,23 +121,23 @@ sap.ui.define([
 
             this._isActive = false;
 
-            var oEventBus = EventBus.getInstance();
+            const oEventBus = EventBus.getInstance();
 
             // Action logging: Unsubscribe to all the events in  _observedLaunchpadActions - User actions
-            this._observedLaunchpadActions.forEach(function (item, i, arr) {
+            this._observedLaunchpadActions.forEach((item, i, arr) => {
                 oEventBus.unsubscribe("launchpad", item, this._handleAction, this);
-            }.bind(this));
+            });
 
             oEventBus.unsubscribe("sap.ushell", "appOpened", this._handleAction, this);
 
             // Action logging: Unsubscribe to all the events in  _observedGeneralActions - User actions
-            this._observedGeneralActions.forEach(function (item, i, arr) {
+            this._observedGeneralActions.forEach((item, i, arr) => {
                 oEventBus.unsubscribe(item, this._handleAction, this);
-            }.bind(this));
+            });
 
             // Action logging: Unsubscribe to all the events in  _observedEventHubEvents - User actions
             // The doable objects were stored in _aDoables
-            this._aDoables.forEach(function (oDoable) {
+            this._aDoables.forEach((oDoable) => {
                 oDoable.off();
             });
             this._aDoables = [];
@@ -169,7 +169,7 @@ sap.ui.define([
          *
          * @returns {object} MessageInfo object
          */
-        getMessageInfo: function (/*sUserText*/) {
+        getMessageInfo: function (/* sUserText */) {
             return {
                 userDetails: this._getUserDetails(),
                 shellState: this._getShellState(),
@@ -196,9 +196,9 @@ sap.ui.define([
         onLogEntry: function (oData) {
             // track only log levels "fatal", "error", "warning"
             if (oData.level <= 2) {
-                var sErrorMes = oData.message;
+                let sErrorMes = oData.message;
                 if (typeof oData.details !== "undefined" && (oData.details !== "")) {
-                    sErrorMes = sErrorMes + ", " + oData.details;
+                    sErrorMes = `${sErrorMes}, ${oData.details}`;
                 }
                 this.addMessage(this.messageType.ERROR, sErrorMes);
             }
@@ -219,17 +219,17 @@ sap.ui.define([
          * @returns {function} TabDecorator
          */
         _tileOnTapDecorator: function (origFunc) {
-            var that = this;
+            const that = this;
 
-            return function (/*event, ui*/) {
+            return function (/* event, ui */) {
                 // If the Tile that was clicked is a PlusTile
                 if (this.isA("sap.ushell.ui.launchpad.PlusTile")) {
-                    that.addMessage(that.messageType.ACTION, "Open Catalog for empty group " + this.getGroupId());
+                    that.addMessage(that.messageType.ACTION, `Open Catalog for empty group ${this.getGroupId()}`);
 
                     // If the Tile that was clicked is a regular Tile
                 } else if (this.isA("sap.ushell.ui.launchpad.Tile")) {
                     // Get the href of the anchor of the clicked tile
-                    var sNavigationHash = hasher.getHash();
+                    let sNavigationHash = hasher.getHash();
 
                     /*
                      * according to wiki PSSEC/SEC-222
@@ -238,25 +238,25 @@ sap.ui.define([
                      * which might contains sensitive data like account number
                      */
                     if (sNavigationHash) {
-                        var oNavObj = urlParsing.parseShellHash(sNavigationHash);
-                        sNavigationHash = "#" + urlParsing.constructShellHash({
+                        const oNavObj = urlParsing.parseShellHash(sNavigationHash);
+                        sNavigationHash = `#${urlParsing.constructShellHash({
                             target: {
                                 semanticObject: oNavObj.semanticObject,
                                 action: oNavObj.action
                             }
-                        });
+                        })}`;
                     }
 
-                    var oLastNavigationActionData = that._getLastNavActionFromStorage();
+                    const oLastNavigationActionData = that._getLastNavActionFromStorage();
                     oLastNavigationActionData.time = new Date();
                     oLastNavigationActionData.navigationHash = sNavigationHash;
                     oLastNavigationActionData.tileDebugInfo = this.getDebugInfo();
 
                     // Get tile title
-                    var oTile = Element.getElementById(this.getId());
-                    var oModel = oTile.getModel();
-                    var oBindingContext = this.getBindingContext();
-                    var sPath = oBindingContext.getPath();
+                    const oTile = Element.getElementById(this.getId());
+                    const oModel = oTile.getModel();
+                    const oBindingContext = this.getBindingContext();
+                    const sPath = oBindingContext.getPath();
 
                     oLastNavigationActionData.tileTitle = oBindingContext.getModel().getProperty(sPath).title;
 
@@ -267,7 +267,7 @@ sap.ui.define([
 
                     that.addMessage(
                         that.messageType.ACTION,
-                        "Click on Tile: " + oModel.getData().title + " Tile debugInfo: " + this.getDebugInfo()
+                        `Click on Tile: ${oModel.getData().title} Tile debugInfo: ${this.getDebugInfo()}`
                     );
                 }
                 origFunc.apply(this, arguments);
@@ -284,11 +284,11 @@ sap.ui.define([
          * @param {string} messageID an ID...
          */
         _addMessageInternal: function (type, messageText, messageID) {
-            var aLoggingQueue = this._getLoggingQueueFromStorage();
-            var oLoggedMessage = {
+            const aLoggingQueue = this._getLoggingQueueFromStorage();
+            const oLoggedMessage = {
                 type: null
             };
-            for (var prop in this.messageType) {
+            for (const prop in this.messageType) {
                 if (type === this.messageType[prop]) {
                     oLoggedMessage.type = prop;
                     break;
@@ -302,7 +302,7 @@ sap.ui.define([
                 messageText: messageText,
                 time: new Date(),
                 toString: function () {
-                    var aStringBuffer = [this.type, this.time];
+                    const aStringBuffer = [this.type, this.time];
                     if (typeof this.messageID !== "undefined") {
                         aStringBuffer.push(this.messageID);
                     }
@@ -342,44 +342,44 @@ sap.ui.define([
          * @param {object} oData The data sent with the event.
          */
         _handleAction: function (sChannelId, sEventId, oData) {
-            var sMessage;
+            let sMessage;
 
             switch (sEventId) {
                 case "deleteTile":
-                    sMessage = "Delete Tile " + (oData.tileId || "");
+                    sMessage = `Delete Tile ${oData.tileId || ""}`;
                     break;
                 case "moveTile":
-                    sMessage = "Move Tile " + (oData.sTileId || "") + " to Group " + (oData.toGroupId || "");
+                    sMessage = `Move Tile ${oData.sTileId || ""} to Group ${oData.toGroupId || ""}`;
                     break;
                 case "createGroupAt":
                     sMessage = "Create Group";
                     break;
                 case "changeGroupTitle":
-                    sMessage = "Change Group Title of " + (oData.groupId || "") + " to " + (oData.newTitle || "");
+                    sMessage = `Change Group Title of ${oData.groupId || ""} to ${oData.newTitle || ""}`;
                     break;
                 case "deleteGroup":
-                    sMessage = "Delete Group " + (oData.groupId || "");
+                    sMessage = `Delete Group ${oData.groupId || ""}`;
                     break;
                 case "addTile":
-                    var oModel = oData.catalogTileContext.oModel;
-                    var sPath = oData.catalogTileContext.sPath;
-                    var oTileContext = oModel.getProperty(sPath);
-                    var sTileID = (oTileContext && oTileContext.id) || "";
-                    var oGroupContext = oData.groupContext.getObject();
-                    var sGroupID = (oGroupContext && oGroupContext.id) || "";
-                    sMessage = "Add Tile " + sTileID + " to Group " + sGroupID;
+                    const oModel = oData.catalogTileContext.oModel;
+                    const sPath = oData.catalogTileContext.sPath;
+                    const oTileContext = oModel.getProperty(sPath);
+                    const sTileID = (oTileContext && oTileContext.id) || "";
+                    const oGroupContext = oData.groupContext.getObject();
+                    const sGroupID = (oGroupContext && oGroupContext.id) || "";
+                    sMessage = `Add Tile ${sTileID} to Group ${sGroupID}`;
                     break;
                 case "moveGroup":
-                    sMessage = "Move Group from index " + (oData.fromIndex || "") + " to index " + (oData.toIndex || "");
+                    sMessage = `Move Group from index ${oData.fromIndex || ""} to index ${oData.toIndex || ""}`;
                     break;
                 case "appOpened":
-                    sMessage = "Open application " + oData.action;
-                    var lastNavigationActionData = this._getLastNavActionFromStorage();
+                    sMessage = `Open application ${oData.action}`;
+                    const lastNavigationActionData = this._getLastNavActionFromStorage();
 
                     // TODO, clone, we are mutating an present object?
                     // Add the applicationInformation to the navigation data that was collected before the openApp event
                     lastNavigationActionData.applicationInformation = {};
-                    ["applicationType", "ui5ComponentName", "url", "additionalInformation", "text"].forEach(function (sProp) {
+                    ["applicationType", "ui5ComponentName", "url", "additionalInformation", "text"].forEach((sProp) => {
                         lastNavigationActionData.applicationInformation[sProp] = oData[sProp];
                     });
 
@@ -402,7 +402,7 @@ sap.ui.define([
                     );
                     break;
                 case "addBookmarkTile":
-                    sMessage = "Add Bookmark " + (oData.title || "") + " " + (oData.subtitle || "") + " for URL: " + (oData.url || "");
+                    sMessage = `Add Bookmark ${oData.title || ""} ${oData.subtitle || ""} for URL: ${oData.url || ""}`;
                     break;
                 case "showCatalog":
                     sMessage = "Show Catalog";
@@ -418,8 +418,8 @@ sap.ui.define([
          * @returns {object} The current user details.
          * @private
          */
-        _getUserDetails: function (/*sUserText*/) {
-            var oUser = Container.getUser();
+        _getUserDetails: function (/* sUserText */) {
+            const oUser = Container.getUser();
             return {
                 fullName: oUser.getFullName() || "",
                 userId: oUser.getId() || "",
@@ -442,13 +442,13 @@ sap.ui.define([
          * @private
          */
         _getLoggingQueueFromStorage: function () {
-            var sLoggingQueue = this._getFromSessionStorage("sap.ushell.UserActivityLog.loggingQueue");
-            var aQueue = [];
+            const sLoggingQueue = this._getFromSessionStorage("sap.ushell.UserActivityLog.loggingQueue");
+            let aQueue = [];
             if (sLoggingQueue) {
                 try {
                     aQueue = JSON.parse(sLoggingQueue);
                 } catch (e) {
-                    //ignore cases where its not a valid JSON
+                    // ignore cases where its not a valid JSON
                 }
             }
             return aQueue;
@@ -459,7 +459,7 @@ sap.ui.define([
          * @private
          */
         _getLastNavActionFromStorage: function () {
-            var sLastNavigationActionData = this._getFromSessionStorage("sap.ushell.UserActivityLog.lastNavigationActionData");
+            const sLastNavigationActionData = this._getFromSessionStorage("sap.ushell.UserActivityLog.lastNavigationActionData");
             return (sLastNavigationActionData ? JSON.parse(sLastNavigationActionData) : {});
         },
 
@@ -480,7 +480,7 @@ sap.ui.define([
          * @private
          */
         _getHashSegment: function (url) {
-            var aParts = url.split("~");
+            let aParts = url.split("~");
             if (aParts.length > 1) {
                 return aParts[0];
             }
@@ -501,7 +501,7 @@ sap.ui.define([
          * @private
          */
         _getFromSessionStorage: function (key) {
-            var sReturnedValue = null;
+            let sReturnedValue = null;
             try {
                 sReturnedValue = sessionStorage.getItem(key);
             } catch (err) {
@@ -526,7 +526,7 @@ sap.ui.define([
         }
     };
 
-    var UserActivityLog = new UserActivityLogClass();
+    const UserActivityLog = new UserActivityLogClass();
 
     return UserActivityLog;
 });

package/src/main/js/sap/ushell/adapters/AppVariantPersonalizationAdapter.js

@@ -5,22 +5,22 @@ sap.ui.define([
     "sap/ui/fl/apply/api/UI2PersonalizationApplyAPI",
     "sap/base/Log",
     "sap/ui/thirdparty/jquery"
-], function (
+], (
     Library,
     oConstants,
     UI2PersonalizationApplyAPI,
     Log,
     jQuery
-) {
+) => {
     "use strict";
 
     function rectifyKey (sContainerKey) {
-        var sCONTAINER_KEY_PREFIX = "sap.ushell.personalization#";
+        const sCONTAINER_KEY_PREFIX = "sap.ushell.personalization#";
         if (sContainerKey.substring(0, sCONTAINER_KEY_PREFIX.length) !== sCONTAINER_KEY_PREFIX) {
-            Log.error("Unexpected ContainerKey " + sContainerKey);
+            Log.error(`Unexpected ContainerKey ${sContainerKey}`);
             return sContainerKey;
         }
-        var sKey = sContainerKey.substring(sCONTAINER_KEY_PREFIX.length);
+        let sKey = sContainerKey.substring(sCONTAINER_KEY_PREFIX.length);
         sKey = sKey.split("#")[0];
         return sKey;
     }
@@ -64,7 +64,7 @@ sap.ui.define([
         this._sContainerKey = rectifyKey(sContainerKey);
         this._sAppName = sAppName || "";
 
-        //Determine category resulting out of possible scope flag combinations
+        // Determine category resulting out of possible scope flag combinations
         this._category = this._determineCategory(oScope);
 
         this._aJSONContainer = [];
@@ -81,41 +81,41 @@ sap.ui.define([
 
     // loads data from backend, when done, oPropertyBag contains the items
     AppVariantAdapterContainer.prototype.load = function () {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
         Library.load("sap/ui/fl")
-            .then(function () {
+            .then(() => {
                 // "sap/ui/flp" library finished bootstrapping. Now UI2PersonalizationApplyAPI can be used.
                 return UI2PersonalizationApplyAPI.load({
                     selector: this._oComponent,
                     containerKey: this._sContainerKey
                 });
-            }.bind(this))
-            .then(function (oContainer) {
+            })
+            .then((oContainer) => {
                 this._aJSONContainer = oContainer || [];
                 oDeferred.resolve(oContainer);
-            }.bind(this))
-            .catch(function (sErrorMessage) {
+            })
+            .catch((sErrorMessage) => {
                 Log.warning(sErrorMessage);
                 // load errors are ok (at least 404), return empty(!) container
                 this._reset();
                 oDeferred.reject(sErrorMessage);
-            }.bind(this));
+            });
 
         return oDeferred.promise();
     };
 
     AppVariantAdapterContainer.prototype.save = function () {
-        var aPromises = [];
+        const aPromises = [];
 
-        var oDeferred = new jQuery.Deferred();
-        sap.ui.require(["sap/ui/fl/write/api/UI2PersonalizationWriteAPI"], function (UI2PersonalizationWriteAPI) {
+        const oDeferred = new jQuery.Deferred();
+        sap.ui.require(["sap/ui/fl/write/api/UI2PersonalizationWriteAPI"], (UI2PersonalizationWriteAPI) => {
             Object.keys(this._oChangedKeys).forEach(function (sItemKey) {
-                var oItem = this._oChangedKeys[sItemKey];
-                var mPropertyBag = Object.assign({
-                        selector: this._oComponent
-                    },
-                    oItem
+                const oItem = this._oChangedKeys[sItemKey];
+                const mPropertyBag = Object.assign({
+                    selector: this._oComponent
+                },
+                oItem
                 );
                 aPromises.push(UI2PersonalizationWriteAPI.create(mPropertyBag));
             }, this);
@@ -126,24 +126,24 @@ sap.ui.define([
                     itemName: sItemKey
                 }));
             }, this);
-            Promise.all(aPromises).then(function (oResult) {
+            Promise.all(aPromises).then((oResult) => {
                 this._oChangedKeys = {};
                 this._oDeletedKeys = {};
                 oDeferred.resolve();
-            }.bind(this), function (oError) {
+            }, (oError) => {
                 oDeferred.reject(oError);
             });
-        }.bind(this));
+        });
 
         return oDeferred.promise();
     };
 
     AppVariantAdapterContainer.prototype.del = function () {
-        var oDeferred = new jQuery.Deferred();
-        sap.ui.require(["sap/ui/fl/write/api/UI2PersonalizationWriteAPI"], function (UI2PersonalizationWriteAPI) {
+        const oDeferred = new jQuery.Deferred();
+        sap.ui.require(["sap/ui/fl/write/api/UI2PersonalizationWriteAPI"], (UI2PersonalizationWriteAPI) => {
             this.load()
-                .then(function () {
-                    var aPromises = [];
+                .then(() => {
+                    const aPromises = [];
                     this._aJSONContainer.forEach(function (oItem) {
                         aPromises.push(UI2PersonalizationWriteAPI.deletePersonalization({
                             selector: this._oComponent,
@@ -151,25 +151,25 @@ sap.ui.define([
                             itemName: oItem.itemName
                         }));
                     }, this);
-                    Promise.all(aPromises).then(function (oResult) {
+                    Promise.all(aPromises).then((oResult) => {
                         oDeferred.resolve();
-                    }, function (oError) {
+                    }, (oError) => {
                         oDeferred.reject(oError);
                     });
-                }.bind(this));
-        }.bind(this));
+                });
+        });
 
         return oDeferred.promise();
     };
 
     AppVariantAdapterContainer.prototype.getItemKeys = function () {
-        var res = [];
+        const res = [];
         // collect item names from types
-        this._aJSONContainer.forEach(function (oMember) {
+        this._aJSONContainer.forEach((oMember) => {
             if (oMember.category === "V") {
-                res.push("VARIANTSET#" + oMember.itemName);
+                res.push(`VARIANTSET#${oMember.itemName}`);
             } else if (oMember.category === "I") {
-                res.push("ITEM#" + oMember.itemName);
+                res.push(`ITEM#${oMember.itemName}`);
             }
         });
         return res;
@@ -183,7 +183,7 @@ sap.ui.define([
      * Find item index by internal true key
      */
     AppVariantAdapterContainer.prototype._findItemIndex = function (sItemId, sCategory) {
-        var i;
+        let i;
         for (i = 0; i < this._aJSONContainer.length; i = i + 1) {
             if (this._aJSONContainer[i].itemName === sItemId && this._aJSONContainer[i].category === sCategory) {
                 return i;
@@ -199,7 +199,7 @@ sap.ui.define([
      * index is filled iff it is a present item
      */
     AppVariantAdapterContainer.prototype._locateItem = function (sItemKey) {
-        var res = { index: -1};
+        const res = { index: -1};
 
         // Remove prefix, mapping into category,
         // Strip prefix from itemkey and truncate to 40 effective characters
@@ -210,16 +210,16 @@ sap.ui.define([
             res.trueItemKey = sItemKey.substring("VARIANTSET#".length, "VARIANTSET#".length + 40);
             res.category = "V";
         } else if (sItemKey.indexOf("ADMIN#") !== 0) {
-            Log.error("Unknown itemkey prefix" + sItemKey);
+            Log.error(`Unknown itemkey prefix${sItemKey}`);
         }
         res.index = this._findItemIndex(res.trueItemKey, res.category);
         return res;
     };
 
     AppVariantAdapterContainer.prototype.getItemValue = function (sItemKey) {
-        var sItemValue = "",
-            oItemValue,
-            oItemRef = this._locateItem(sItemKey);
+        let sItemValue = "";
+        let oItemValue;
+        const oItemRef = this._locateItem(sItemKey);
         if (oItemRef.index >= 0) {
             sItemValue = this._aJSONContainer[oItemRef.index].content;
             oItemValue = sItemValue;
@@ -227,14 +227,13 @@ sap.ui.define([
         return oItemValue;
     };
 
-
     /**
      * set oItemValue under sItemKey
      * returns undefined
      */
     AppVariantAdapterContainer.prototype.setItemValue = function (sItemKey, oItemValue) {
-        var oItemRef = this._locateItem(sItemKey);
-        var oItem;
+        const oItemRef = this._locateItem(sItemKey);
+        let oItem;
         if (oItemRef.index >= 0) {
             oItem = this._aJSONContainer[oItemRef.index];
             oItem.content = oItemValue;
@@ -258,7 +257,7 @@ sap.ui.define([
      * delete (1st) item with key sItemKey
      */
     AppVariantAdapterContainer.prototype.delItem = function (sItemKey) {
-        var oItemRef = this._locateItem(sItemKey);
+        const oItemRef = this._locateItem(sItemKey);
         if (oItemRef.index >= 0) {
             this._aJSONContainer.splice(oItemRef.index, 1);
             this._oDeletedKeys[oItemRef.trueItemKey] = true;
@@ -266,7 +265,7 @@ sap.ui.define([
         }
     };
 
-    var AppVariantPersonalizationAdapter = function () {};
+    const AppVariantPersonalizationAdapter = function () {};
 
     AppVariantPersonalizationAdapter.prototype.getAdapterContainer = function (sContainerKey, oScope, sAppName) {
         return new AppVariantAdapterContainer(sContainerKey, this, oScope, sAppName);