@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/services/NotificationsV2.js

@@ -10,7 +10,7 @@ sap.ui.define([
     "sap/ui/thirdparty/datajs",
     "sap/ushell/utils",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     Localization,
     EventBus,
@@ -20,10 +20,10 @@ sap.ui.define([
     OData,
     ushellUtils,
     Container
-) {
+) => {
     "use strict";
 
-    /*eslint consistent-this: ["error", "oNotificationsService"]*/
+    /* eslint consistent-this: ["error", "oNotificationsService"] */
 
     const S_DEFAULT_WEBSOCKET_URL = "/sap/bc/apc/iwngw/notification_push_apc";
     const I_DEFAULT_POLLING_INTERVAL = 60; // Seconds
@@ -70,7 +70,6 @@ sap.ui.define([
      * @public
      */
     function Notifications (oContainerInterface, sParameters, oServiceConfiguration) {
-
         /**
          * Type for notification target parameters.
          * @typedef {object} sap.ushell.services.NotificationsV2.NotificationTargetParameter
@@ -154,7 +153,7 @@ sap.ui.define([
          * @public
          */
 
-         /**
+        /**
          * Type for the notification item
          *
          * @typedef {object} sap.ushell.services.NotificationsV2.NotificationItem
@@ -239,10 +238,9 @@ sap.ui.define([
         const oUserFlagsReadFromPersonalizationDeferred = new Deferred();
         const oNotificationSettingsAvailabilityDeferred = new Deferred();
         const oUserFlagsReadFromPersonalizationPromise = oUserFlagsReadFromPersonalizationDeferred.promise();
-        const oDummyItems = {};
         const iInitialBufferSize = 10;
 
-        let tInitializationTimestamp = new Date();
+        const tInitializationTimestamp = new Date();
         let oWebSocket;
         let initialReadTimer;
         let webSocketRecoveryTimer;
@@ -261,7 +259,6 @@ sap.ui.define([
         let bHighPriorityBannerEnabled = true;
         let bNotificationSettingsMobileSupport;
         let bNotificationSettingsEmailSupport;
-        let bUseDummyItems = false;
         let bInvalidCsrfTokenRecoveryMode = false;
         let bCsrfDataSet = false;
         let aDismissNotifications = [];
@@ -328,7 +325,7 @@ sap.ui.define([
         this.fireInitialRequest = async function () {
             return new Promise((resolve) => {
                 const oRequestObject = {
-                    requestUri: oServiceConfig.serviceUrl + "/GetBadgeNumber()",
+                    requestUri: `${oServiceConfig.serviceUrl}/GetBadgeNumber()`,
                     headers: {
                         "X-CSRF-Token": sHeaderXcsrfToken
                     }
@@ -411,7 +408,20 @@ sap.ui.define([
         };
 
         /**
-         * Returns the number of  notifications<br>
+         * Set the number of unseen notifications<br>
+         * e.g. Notifications that the user hasn't seen yet.
+         *
+         * @param {int} number The number of unseen notifications to set
+         * @returns {Promise} Promise resolves when the unseen notifications count is set
+         *
+         * @public
+         */
+        this.setUnseenNotificationsCount = function (number) {
+            return Promise.resolve(oModel.setProperty("/UnseenCount", number));
+        };
+
+        /**
+         * Returns the number of notifications<br>
          * e.g. Notifications for user.
          *
          * @returns {int} Returns the number of notifications of the user
@@ -480,18 +490,6 @@ sap.ui.define([
 
         // Private. The function is used in Notifications.controller.
         this.getNotificationsBufferInGroup = function (sGroup, iSkip, iTop) {
-            if (bUseDummyItems === true) {
-                const aResponse = oDummyItems[oOperationEnum.NOTIFICATIONS_IN_GROUP].slice(iSkip, iSkip + iTop);
-                const oResponse = JSON.stringify({
-                    "@odata.context": "$metadata#Notifications",
-                    value: aResponse
-                });
-
-                return new Promise((resolve) => {
-                    window.setTimeout(() => resolve(oResponse), 1000);
-                });
-            }
-
             const oNotificationsService = this;
             const oArgs = {
                 group: sGroup,
@@ -520,14 +518,6 @@ sap.ui.define([
 
         // Private. The function is used in Notifications.controller.
         this.getNotificationsBufferBySortingType = function (sSortingType, iSkip, iTop) {
-            if (bUseDummyItems === true) {
-                const oResponse = JSON.stringify({
-                    "@odata.context": "$metadata#Notifications",
-                    value: oDummyItems[sSortingType].slice(iSkip, iSkip + iTop)
-                });
-                return new Promise((resolve) => window.setTimeout(() => resolve(oResponse), 1000));
-            }
-
             const oNotificationsService = this;
             const oArgs = {
                 skip: iSkip,
@@ -544,7 +534,7 @@ sap.ui.define([
                     (oMessage) => {
                         if (oMessage.response && oMessage.response.statusCode === 200 && oMessage.response.body) {
                             oNotificationsService._updateCSRF(oMessage.response);
-                            var oParse = this._parseJSON(oMessage.response.body);
+                            const oParse = this._parseJSON(oMessage.response.body);
                             if (oParse) {
                                 resolve(oParse.value);
                             } else {
@@ -624,7 +614,7 @@ sap.ui.define([
 
         this.executeAction = function (sNotificationId, sActionId) {
             const oNotificationsService = this;
-            const sActionUrl = oServiceConfig.serviceUrl + "/ExecuteAction";
+            const sActionUrl = `${oServiceConfig.serviceUrl}/ExecuteAction`;
             const oRequestBody = { NotificationId: sNotificationId, ActionId: sActionId };
             const oRequestObject = {
                 requestUri: sActionUrl,
@@ -669,7 +659,7 @@ sap.ui.define([
 
         this.sendBulkAction = function (sParentId, sActionId) {
             const oNotificationsService = this;
-            const sActionUrl = oServiceConfig.serviceUrl + "/BulkActionByHeader";
+            const sActionUrl = `${oServiceConfig.serviceUrl}/BulkActionByHeader`;
             const oRequestBody = { ParentId: sParentId, ActionId: sActionId };
             const oRequestObject = {
                 requestUri: sActionUrl,
@@ -689,15 +679,15 @@ sap.ui.define([
                     (oResult) => {
                         let responseAck;
                         if (oResult && oResult.response && oResult.response.statusCode === 200 && oResult.response.body) {
-                            let responseAckJson = JSON.parse(oResult.response.body);
+                            const responseAckJson = JSON.parse(oResult.response.body);
                             responseAck = responseAckJson.value;
                         }
                         resolve(responseAck);
                     },
                     (oResult) => {
                         if (oResult.response && oResult.response.statusCode === 200 && oResult.response.body) {
-                            let responseAckJson = JSON.parse(oResult.response.body);
-                            let responseAck = responseAckJson.value;
+                            const responseAckJson = JSON.parse(oResult.response.body);
+                            const responseAck = responseAckJson.value;
                             resolve(responseAck);
                         } else if (oNotificationsService._csrfTokenInvalid(oResult) && (bInvalidCsrfTokenRecoveryMode === false)) {
                             oNotificationsService._invalidCsrfTokenRecovery(resolve, reject, oNotificationsService.sendBulkAction, [sParentId, sActionId]);
@@ -711,7 +701,7 @@ sap.ui.define([
 
         this.sendBulkDismiss = function (sParentId) {
             const oNotificationsService = this;
-            const sActionUrl = oServiceConfig.serviceUrl + "/DismissAll";
+            const sActionUrl = `${oServiceConfig.serviceUrl}/DismissAll`;
             const oRequestBody = { ParentId: sParentId };
             const oRequestObject = {
                 requestUri: sActionUrl,
@@ -751,7 +741,7 @@ sap.ui.define([
          */
         this.markRead = function (sNotificationId) {
             const oNotificationsService = this;
-            const sActionUrl = oServiceConfig.serviceUrl + "/MarkRead";
+            const sActionUrl = `${oServiceConfig.serviceUrl}/MarkRead`;
             const oRequestBody = { NotificationId: sNotificationId };
             const oRequestObject = {
                 requestUri: sActionUrl,
@@ -786,7 +776,7 @@ sap.ui.define([
          * @public
          */
         this.dismissNotification = function (sNotificationId) {
-            const sActionUrl = oServiceConfig.serviceUrl + "/Dismiss";
+            const sActionUrl = `${oServiceConfig.serviceUrl}/Dismiss`;
             const oNotificationsService = this;
             const oRequestBody = { NotificationId: sNotificationId };
             const oRequestObject = {
@@ -1050,7 +1040,7 @@ sap.ui.define([
                 this.fireODataRequest(
                     oRequestObject,
                     resolve,
-                    function (oMessage) {
+                    (oMessage) => {
                         if (oNotificationsService._csrfTokenInvalid(oMessage)) {
                             oNotificationsService._invalidCsrfTokenRecovery(resolve, reject, oNotificationsService.notificationsSeen);
                         } else {
@@ -1129,11 +1119,11 @@ sap.ui.define([
                 // Get notifications
                 case oOperationEnum.NOTIFICATIONS:
                     if (aRequestURIs.getNotifications.basic === undefined) {
-                        aRequestURIs.getNotifications.basic = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams&$filter=IsGroupHeader%20eq%20false";
+                        aRequestURIs.getNotifications.basic = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams&$filter=IsGroupHeader%20eq%20false`;
                     }
                     if (this._isIntentBasedConsumption()) {
                         if (aRequestURIs.getNotifications.byIntents === undefined) {
-                            aRequestURIs.getNotifications.byIntents = aRequestURIs.getNotifications.basic.concat("&intents%20eq%20" + sEncodedConsumedIntents);
+                            aRequestURIs.getNotifications.byIntents = aRequestURIs.getNotifications.basic.concat(`&intents%20eq%20${sEncodedConsumedIntents}`);
                         }
                         return aRequestURIs.getNotifications.byIntents;
                     }
@@ -1141,11 +1131,11 @@ sap.ui.define([
                 // Get notifications, grouped by type
                 case oOperationEnum.NOTIFICATIONS_BY_TYPE:
                     if (aRequestURIs.getNotificationsByType.basic === undefined) {
-                        aRequestURIs.getNotificationsByType.basic = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams";
+                        aRequestURIs.getNotificationsByType.basic = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams`;
                     }
                     if (this._isIntentBasedConsumption()) {
                         if (aRequestURIs.getNotificationsByType.byIntents === undefined) {
-                            aRequestURIs.getNotificationsByType.byIntents = aRequestURIs.getNotificationsByType.basic.concat("&$filter=intents%20eq%20" + sEncodedConsumedIntents);
+                            aRequestURIs.getNotificationsByType.byIntents = aRequestURIs.getNotificationsByType.basic.concat(`&$filter=intents%20eq%20${sEncodedConsumedIntents}`);
                         }
                         return aRequestURIs.getNotificationsByType.byIntents;
                     }
@@ -1154,11 +1144,11 @@ sap.ui.define([
                 // Get notifications group Headers
                 case oOperationEnum.NOTIFICATIONS_GROUP_HEADERS:
                     if (aRequestURIs.getNotificationsGroupHeaders.basic === undefined) {
-                        aRequestURIs.getNotificationsGroupHeaders.basic = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams&$filter=IsGroupHeader%20eq%20true";
+                        aRequestURIs.getNotificationsGroupHeaders.basic = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams&$filter=IsGroupHeader%20eq%20true`;
                     }
                     if (this._isIntentBasedConsumption()) {
                         if (aRequestURIs.getNotificationsGroupHeaders.byIntents === undefined) {
-                            aRequestURIs.getNotificationsGroupHeaders.byIntents = aRequestURIs.getNotificationsGroupHeaders.basic.concat("&intents%20eq%20" + sEncodedConsumedIntents);
+                            aRequestURIs.getNotificationsGroupHeaders.byIntents = aRequestURIs.getNotificationsGroupHeaders.basic.concat(`&intents%20eq%20${sEncodedConsumedIntents}`);
                         }
                         return aRequestURIs.getNotificationsGroupHeaders.byIntents;
                     }
@@ -1166,22 +1156,22 @@ sap.ui.define([
 
                 // Get notifications in group
                 case oOperationEnum.NOTIFICATIONS_IN_GROUP:
-                    sReturnedURI = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams&$orderby=CreatedAt desc&$filter=IsGroupHeader eq false and ParentId eq "
-                        + oArgs.group + "&$skip=" + oArgs.skip + "&$top=" + oArgs.top;
+                    sReturnedURI = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams&$orderby=CreatedAt desc&$filter=IsGroupHeader eq false and ParentId eq ${
+                        oArgs.group}&$skip=${oArgs.skip}&$top=${oArgs.top}`;
 
                     if (this._isIntentBasedConsumption() === true) {
-                        sReturnedURI = sReturnedURI.concat("&intents%20eq%20" + sEncodedConsumedIntents);
+                        sReturnedURI = sReturnedURI.concat(`&intents%20eq%20${sEncodedConsumedIntents}`);
                     }
                     break;
 
                 // Get badge number
                 case oOperationEnum.GET_BADGE_NUMBER:
                     if (aRequestURIs.getBadgeNumber.basic === undefined) {
-                        aRequestURIs.getBadgeNumber.basic = oServiceConfig.serviceUrl + "/GetBadgeNumber()";
+                        aRequestURIs.getBadgeNumber.basic = `${oServiceConfig.serviceUrl}/GetBadgeNumber()`;
                     }
                     if (this._isIntentBasedConsumption()) {
                         if (aRequestURIs.getBadgeNumber.byIntents === undefined) {
-                            aRequestURIs.getBadgeNumber.byIntents = oServiceConfig.serviceUrl + "/GetBadgeCountByIntent(" + sEncodedConsumedIntents + ")";
+                            aRequestURIs.getBadgeNumber.byIntents = `${oServiceConfig.serviceUrl}/GetBadgeCountByIntent(${sEncodedConsumedIntents})`;
                         }
                         return aRequestURIs.getBadgeNumber.byIntents;
                     }
@@ -1190,57 +1180,57 @@ sap.ui.define([
                 // Get Notification Count
                 case oOperationEnum.GET_NOTIFICATIONS_COUNT:
                     if (aRequestURIs.getNotificationCount.basic === undefined) {
-                        aRequestURIs.getNotificationCount.basic = oServiceConfig.serviceUrl + "/Notifications/$count";
+                        aRequestURIs.getNotificationCount.basic = `${oServiceConfig.serviceUrl}/Notifications/$count`;
                     }
                     return aRequestURIs.getNotificationCount.basic;
 
                 // Reset badge number (i.e. mark all notifications as "seen")
                 case oOperationEnum.RESET_BADGE_NUMBER:
                     if (aRequestURIs.resetBadgeNumber.basic === undefined) {
-                        aRequestURIs.resetBadgeNumber.basic = oServiceConfig.serviceUrl + "/ResetBadgeNumber";
+                        aRequestURIs.resetBadgeNumber.basic = `${oServiceConfig.serviceUrl}/ResetBadgeNumber`;
                     }
                     return aRequestURIs.resetBadgeNumber.basic;
 
                 // Get user settings
                 case oOperationEnum.GET_SETTINGS:
                     if (aRequestURIs.getNotificationTypesSettings.basic === undefined) {
-                        aRequestURIs.getNotificationTypesSettings.basic = oServiceConfig.serviceUrl + "/NotificationTypePersonalizationSet";
+                        aRequestURIs.getNotificationTypesSettings.basic = `${oServiceConfig.serviceUrl}/NotificationTypePersonalizationSet`;
                     }
                     return aRequestURIs.getNotificationTypesSettings.basic;
 
                 case oOperationEnum.GET_MOBILE_SUPPORT_SETTINGS:
                     if (aRequestURIs.getMobileSupportSettings.basic === undefined) {
-                        aRequestURIs.getMobileSupportSettings.basic = oServiceConfig.serviceUrl + "/Channels(ChannelId='SAP_SMP')";
+                        aRequestURIs.getMobileSupportSettings.basic = `${oServiceConfig.serviceUrl}/Channels(ChannelId='SAP_SMP')`;
                     }
                     return aRequestURIs.getMobileSupportSettings.basic;
 
                 case oOperationEnum.GET_EMAIL_SUPPORT_SETTINGS:
                     if (aRequestURIs.getEmailSupportSettings.basic === undefined) {
-                        aRequestURIs.getEmailSupportSettings.basic = oServiceConfig.serviceUrl + "/Channels(ChannelId='SAP_EMAIL')";
+                        aRequestURIs.getEmailSupportSettings.basic = `${oServiceConfig.serviceUrl}/Channels(ChannelId='SAP_EMAIL')`;
                     }
                     return aRequestURIs.getEmailSupportSettings.basic;
 
                 case oOperationEnum.VALIDATE_WEBSOCKET_CHANNEL:
                     if (aRequestURIs.getWebSocketValidity.basic === undefined) {
-                        aRequestURIs.getWebSocketValidity.basic = oServiceConfig.serviceUrl + "/Channels('SAP_WEBSOCKET')";
+                        aRequestURIs.getWebSocketValidity.basic = `${oServiceConfig.serviceUrl}/Channels('SAP_WEBSOCKET')`;
                     }
                     return aRequestURIs.getWebSocketValidity.basic;
 
                 // Get a buffer of notifications (using $skip, $top and $orderby options) sorted by date in descending order
                 case oOperationEnum.NOTIFICATIONS_BY_DATE_DESCENDING:
-                    sReturnedURI = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams&$orderby=CreatedAt%20desc&$filter=IsGroupHeader%20eq%20false&$skip="
-                        + oArgs.skip + "&$top=" + oArgs.top;
+                    sReturnedURI = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams&$orderby=CreatedAt%20desc&$filter=IsGroupHeader%20eq%20false&$skip=${
+                        oArgs.skip}&$top=${oArgs.top}`;
                     if (this._isIntentBasedConsumption() === true) {
-                        sReturnedURI = sReturnedURI.concat("&intents%20eq%20" + sEncodedConsumedIntents);
+                        sReturnedURI = sReturnedURI.concat(`&intents%20eq%20${sEncodedConsumedIntents}`);
                     }
                     break;
 
                 // Get a buffer of notifications (using $skip, $top and $orderby options) sorted by priority in descending order
                 case oOperationEnum.NOTIFICATIONS_BY_PRIORITY_DESCENDING:
-                    sReturnedURI = oServiceConfig.serviceUrl + "/Notifications?$expand=Actions,NavigationTargetParams&$orderby=Priority%20desc&$filter=IsGroupHeader%20eq%20false&$skip="
-                        + oArgs.skip + "&$top=" + oArgs.top;
+                    sReturnedURI = `${oServiceConfig.serviceUrl}/Notifications?$expand=Actions,NavigationTargetParams&$orderby=Priority%20desc&$filter=IsGroupHeader%20eq%20false&$skip=${
+                        oArgs.skip}&$top=${oArgs.top}`;
                     if (this._isIntentBasedConsumption() === true) {
-                        sReturnedURI = sReturnedURI.concat("&intents%20eq%20" + sEncodedConsumedIntents);
+                        sReturnedURI = sReturnedURI.concat(`&intents%20eq%20${sEncodedConsumedIntents}`);
                     }
                     break;
 
@@ -1374,7 +1364,7 @@ sap.ui.define([
          */
         this.saveSettingsEntry = function (oEntry) {
             const oNotificationsService = this;
-            const sSetSettingsUrl = this._getRequestURI(oOperationEnum.GET_SETTINGS) + "(NotificationTypeId=" + oEntry.NotificationTypeId + ")";
+            const sSetSettingsUrl = `${this._getRequestURI(oOperationEnum.GET_SETTINGS)}(NotificationTypeId=${oEntry.NotificationTypeId})`;
             const oRequestObject = {
                 requestUri: sSetSettingsUrl,
                 method: "PUT",
@@ -1494,20 +1484,22 @@ sap.ui.define([
         this._performFirstRead = function () {
             const oNotificationsService = this;
 
-            this._readNotificationsData(true).then(() => {
-                // Calculate time left until Fiori Client mode can be checked
-                const tFioriClientRemainingDelay = oNotificationsService._getFioriClientRemainingDelay();
-                if (tFioriClientRemainingDelay <= 0) {
-                    oNotificationsService._fioriClientStep();
-                } else {
-                    initialReadTimer = setTimeout(function () {
+            this._readNotificationsData(true)
+                .then(() => {
+                    // Calculate time left until Fiori Client mode can be checked
+                    const tFioriClientRemainingDelay = oNotificationsService._getFioriClientRemainingDelay();
+                    if (tFioriClientRemainingDelay <= 0) {
                         oNotificationsService._fioriClientStep();
-                    }, tFioriClientRemainingDelay);
-                }
-                bFirstDataLoaded = true;
-            }).catch((sMsg) => {
-                Log.error("Notifications oData read failed. Error: " + sMsg);
-            });
+                    } else {
+                        initialReadTimer = setTimeout(() => {
+                            oNotificationsService._fioriClientStep();
+                        }, tFioriClientRemainingDelay);
+                    }
+                    bFirstDataLoaded = true;
+                })
+                .catch((sMsg) => {
+                    Log.error(`Notifications oData read failed. Error: ${sMsg}`);
+                });
         };
 
         /**
@@ -1521,11 +1513,9 @@ sap.ui.define([
                 oCurrentMode = oModesEnum.FIORI_CLIENT;
                 this._addPushNotificationHandler();
 
-                this.getUnseenNotificationsCount()
-                    .then(function (iBadgeValue) {
-                        this._setNativeIconBadge(iBadgeValue, () => { });
-                    }.bind(this))
-                    .catch(() => { });
+                this.getUnseenNotificationsCount().then((iBadgeValue) => {
+                    this._setNativeIconBadge(iBadgeValue);
+                });
             } else {
                 this._webSocketStep();
             }
@@ -1642,7 +1632,7 @@ sap.ui.define([
                 // Init WebSocket connection
                 oWebSocket = this._getWebSocketObjectObject(oServiceConfig.webSocketUrl || S_DEFAULT_WEBSOCKET_URL, [SapPcpWebSocket.SUPPORTED_PROTOCOLS.v10]);
 
-                oWebSocket.attachMessage(this, function (oMessage/*, oData*/) {
+                oWebSocket.attachMessage(this, (oMessage /* , oData */) => {
                     const oPcpFields = oMessage.getParameter("pcpFields");
                     if ((oPcpFields) && (oPcpFields.Command) && (oPcpFields.Command === "Notification")) {
                         // Receive "pings" for Notification EntitySet
@@ -1651,7 +1641,7 @@ sap.ui.define([
                     }
                 });
 
-                oWebSocket.attachOpen(this, function () {
+                oWebSocket.attachOpen(this, () => {
                     oNotificationsService._checkWebSocketActivity().then((bIsActive) => {
                         // In case when bIsActive is false, the webSocket is not active although the connection is opened.
                         // in this case we should close the WebSocket connection and switch to polling step.
@@ -1664,19 +1654,19 @@ sap.ui.define([
                     Log.info("Notifications UShell service WebSocket: webSocket connection opened");
                 });
 
-                oWebSocket.attachClose(this, function (oEvent) {
-                    Log.warning("Notifications UShell service WebSocket: attachClose called with code: " + oEvent.mParameters.code + " and reason: " + oEvent.mParameters.reason);
+                oWebSocket.attachClose(this, (oEvent) => {
+                    Log.warning(`Notifications UShell service WebSocket: attachClose called with code: ${oEvent.mParameters.code} and reason: ${oEvent.mParameters.reason}`);
                     if ((!bOnServiceStop) && (!bDeliberateClose)) {
                         oNotificationsService._webSocketRecoveryStep();
                     }
                 });
 
                 // attachError is not being handled since each attachError is followed by a call to attachClose (...which includes handling)
-                oWebSocket.attachError(this, function () {
+                oWebSocket.attachError(this, () => {
                     Log.warning("Notifications UShell service WebSocket: attachError called!");
                 });
             } catch (e) {
-                Log.error("Exception occurred while creating new sap.ui.core.ws.SapPcpWebSocket. Message: " + e.message);
+                Log.error(`Exception occurred while creating new sap.ui.core.ws.SapPcpWebSocket. Message: ${e.message}`);
             }
         };
 
@@ -1707,12 +1697,11 @@ sap.ui.define([
         };
 
         this._setNativeIconBadgeWithDelay = function () {
-            setTimeout(function () {
-                this.getUnseenNotificationsCount().then(function (iBadgeValue) {
+            setTimeout(() => {
+                this.getUnseenNotificationsCount().then((iBadgeValue) => {
                     this._setNativeIconBadge(iBadgeValue);
-                }.bind(this))
-                    .catch(() => { });
-            }.bind(this), 4000);
+                });
+            }, 4000);
         };
 
         this._getIntentsFromConfiguration = function (aInput) {
@@ -1834,10 +1823,10 @@ sap.ui.define([
                         if (index === 0) {
                             sConsumedIntents = aConsumedIntents[index];
                         } else {
-                            sConsumedIntents = sConsumedIntents + "," + aConsumedIntents[index];
+                            sConsumedIntents = `${sConsumedIntents},${aConsumedIntents[index]}`;
                         }
                     } else {
-                        sConsumedIntents = sConsumedIntents + "NavigationIntent%20eq%20%27" + aConsumedIntents[index] + "%27";
+                        sConsumedIntents = `${sConsumedIntents}NavigationIntent%20eq%20%27${aConsumedIntents[index]}%27`;
                     }
                 }
             }
@@ -1948,7 +1937,7 @@ sap.ui.define([
                 })
                 .catch((error) => {
                     Log.error("Personalization service does not work:");
-                    Log.error(error.name + ": " + error.message);
+                    Log.error(`${error.name}: ${error.message}`);
                     Log.error("Reading User Settings flags from Personalization service failed");
                 });
         };
@@ -1966,7 +1955,7 @@ sap.ui.define([
                 .then((oPersonalizer) => oPersonalizer.setPersData(oFlags))
                 .catch((error) => {
                     Log.error("Personalization service does not work:");
-                    Log.error(error.name + ": " + error.message);
+                    Log.error(`${error.name}: ${error.message}`);
                 });
         };
 
@@ -2013,7 +2002,6 @@ sap.ui.define([
          * @private
          */
         this._userSettingInitialization = function () {
-
             // Initialize only once to avoid duplicated requests
             if (this._bSettingsInitialized) {
                 return;

package/src/main/js/sap/ushell/services/PageBuilding.js

@@ -3,13 +3,13 @@
 /**
  * @fileOverview The Unified Shell's page building service.
  *
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery"
-], function (
+], (
     jQuery
-) {
+) => {
     "use strict";
 
     /**
@@ -66,9 +66,12 @@ sap.ui.define([
          * @since 1.15.0
          */
         this.getPageSet = function (sId) {
-            var oDeferred = new jQuery.Deferred();
-            oAdapter.getFactory().createPageSet(sId, oDeferred.resolve.bind(oDeferred),
-                oDeferred.reject.bind(oDeferred));
+            const oDeferred = new jQuery.Deferred();
+            oAdapter.getFactory().createPageSet(
+                sId,
+                oDeferred.resolve.bind(oDeferred),
+                oDeferred.reject.bind(oDeferred)
+            );
             return oDeferred.promise();
         };
     }

package/src/main/js/sap/ushell/services/PagePersistence.js

@@ -6,9 +6,9 @@
  * It provides the layout and tile data of pages in the pages runtime.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.138.1
+ * @version 1.139.0
  */
-sap.ui.define([], function () {
+sap.ui.define([], () => {
     "use strict";
 
     /**
@@ -35,7 +35,7 @@ sap.ui.define([], function () {
      * @experimental Since 1.67.0
      * @private
      */
-    function PagePersistence (/*adapter, serviceConfiguration*/) {
+    function PagePersistence (/* adapter, serviceConfiguration */) {
         this._init.apply(this, arguments);
     }
 

package/src/main/js/sap/ushell/services/PageReferencing.js

@@ -2,11 +2,13 @@
 
 /**
  * @fileOverview This module deals with page related referencing and dereferencing.
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/services/_PageReferencing/PageReferencer"
-], function (PageReferencer) {
+], (
+    PageReferencer
+) => {
     "use strict";
 
     /**