@sapui5/sap.ushell 1.121.1 → 1.122.0

package/src/main/js/sap/ushell/components/shell/Notifications/Notifications.controller.js

@@ -1,53 +1,52 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/Device",
-    "sap/ui/core/Element",
-    "sap/ushell/utils",
-    "sap/ushell/resources",
-    "sap/m/Text",
-    "sap/m/VBox",
-    "sap/m/CustomListItem",
-    "sap/ui/thirdparty/jquery",
-    "sap/ui/events/KeyCodes",
     "sap/base/Log",
-    "sap/ui/model/json/JSONModel",
-    "sap/m/MessageToast",
+    "sap/m/CustomListItem",
     "sap/m/library",
+    "sap/m/MessageToast",
+    "sap/m/Text",
+    "sap/m/VBox",
+    "sap/ui/core/Element",
     "sap/ui/core/library",
-    "sap/ui/core/mvc/Controller"
+    "sap/ui/core/mvc/Controller",
+    "sap/ui/Device",
+    "sap/ui/model/json/JSONModel",
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/Container",
+    "sap/ushell/resources",
+    "sap/ushell/utils"
 ], function (
-    Device,
-    Element,
-    utils,
-    resources,
-    Text,
-    VBox,
-    CustomListItem,
-    jQuery,
-    KeyCodes,
     Log,
-    JSONModel,
-    MessageToast,
+    CustomListItem,
     mobileLibrary,
+    MessageToast,
+    Text,
+    VBox,
+    Element,
     coreLibrary,
-    Controller
+    Controller,
+    Device,
+    JSONModel,
+    jQuery,
+    Container,
+    resources,
+    utils
 ) {
     "use strict";
 
     // shortcut for sap.ui.core.Priority
-    var Priority = coreLibrary.Priority;
+    const Priority = coreLibrary.Priority;
 
     // shortcut for sap.m.ListType
-    var ListType = mobileLibrary.ListType;
+    const ListType = mobileLibrary.ListType;
 
     // shortcut for sap.m.FlexAlignItems
-    var FlexAlignItems = mobileLibrary.FlexAlignItems;
+    const FlexAlignItems = mobileLibrary.FlexAlignItems;
 
-    function _errorMessage (sText) {
-        sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
-            oMessageService.error(sText);
-        });
+    async function _errorMessage (sText) {
+        const oMessageService = await Container.getServiceAsync("Message");
+        oMessageService.error(sText);
     }
 
     Controller.extend("sap.ushell.components.shell.Notifications.Notifications", {
@@ -70,20 +69,20 @@ sap.ui.define([
          *   3. Sets the first data buffer to the model
          */
         onInit: function () {
-            var oInitialModelStructure = {};
+            const oInitialModelStructure = {};
 
             if (Device.system.desktop) {
                 this.iMaxNotificationItemsForDevice = this.oPagingConfiguration.MAX_NOTIFICATION_ITEMS_DESKTOP;
             } else {
                 this.iMaxNotificationItemsForDevice = this.oPagingConfiguration.MAX_NOTIFICATION_ITEMS_MOBILE;
             }
+            const oView = this.getView();
 
             // Container.getService use is allowed here. The service is already loaded by the notification component.
-            this.oNotificationsService = this.getView().getViewData().notificationsService;
+            this.oNotificationsService = oView.getViewData().notificationsService;
             this.oSortingType = this.oNotificationsService.getOperationEnum();
 
             oInitialModelStructure[this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING] = this.getInitialSortingModelStructure();
-            oInitialModelStructure[this.oSortingType.NOTIFICATIONS_BY_DATE_ASCENDING] = this.getInitialSortingModelStructure();
             oInitialModelStructure[this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING] = this.getInitialSortingModelStructure();
             oInitialModelStructure[this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING] = {};
 
@@ -93,12 +92,12 @@ sap.ui.define([
             // For byType sorting: keeps the currently expended group/Notification type
             this.sCurrentExpandedType = undefined;
 
-            var oModel = new JSONModel(oInitialModelStructure);
+            const oModel = new JSONModel(oInitialModelStructure);
             oModel.setSizeLimit(1500);
             // Initializing the model with a branch for each sorting type
-            this.getView().setModel(oModel);
+            oView.setModel(oModel);
 
-            this.getView().setModel(resources.i18nModel, "i18n");
+            oView.setModel(resources.i18nModel, "i18n");
 
             // Get the first buffer of notification items, byDate (descending)
             this.getNextBuffer();
@@ -109,9 +108,9 @@ sap.ui.define([
         onAfterRendering: function () {
             this.removeTabIndexFromList(this.sCurrentSorting);
 
-            var oTabBarHeader = this.getView().byId("notificationIconTabBar--header");
+            const oView = this.getView();
+            const oTabBarHeader = oView.byId("notificationIconTabBar--header");
             if (oTabBarHeader) {
-                // TODO: remove this workaround when BCP 1970336135 is resolved
                 oTabBarHeader.getDomRef().classList.remove("sapContrastPlus"); // "sapContrastPlus" class is not removed with "removeStyleClass()" or "toggleStyleClass()"
             }
 
@@ -121,18 +120,20 @@ sap.ui.define([
                 }
             }
 
-            this.getView().$("-sapUshellNotificationIconTabByDate-text")
+            oView.$("-sapUshellNotificationIconTabByDate-text")
                 .attr("aria-label", resources.i18n.getText("Notifications.ByDateDescending.AriaLabel"));
-            this.getView().$("-sapUshellNotificationIconTabByType-text")
+            oView.$("-sapUshellNotificationIconTabByType-text")
                 .attr("aria-label", resources.i18n.getText("Notifications.ByType.AriaLabel"));
-            this.getView().$("-sapUshellNotificationIconTabByPrio-text")
+            oView.$("-sapUshellNotificationIconTabByPrio-text")
                 .attr("aria-label", resources.i18n.getText("Notifications.ByPriority.AriaLabel"));
         },
 
         // check if the get next buffer should fetch more notifications
         shouldFetchMoreNotifications: function () {
-            var bHasMoreItemsInBackend = this.getView().getModel().getProperty("/" + this.sCurrentSorting + "/hasMoreItemsInBackend"),
-                bListMaxReached = this.getView().getModel().getProperty("/" + this.sCurrentSorting + "/listMaxReached");
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const bHasMoreItemsInBackend = oModel.getProperty(`/${this.sCurrentSorting}/hasMoreItemsInBackend`);
+            const bListMaxReached = oModel.getProperty(`/${this.sCurrentSorting}/listMaxReached`);
             return bHasMoreItemsInBackend && !bListMaxReached;
         },
 
@@ -140,19 +141,18 @@ sap.ui.define([
          * Gets a buffer of notification items from notification service, according to the current sorting type
          */
         getNextBuffer: function () {
-            var sCurrentSorting = this.sCurrentSorting,
-                aCurrentItems = this.getItemsFromModel(sCurrentSorting),
-                iNumberOfItemsInModel,
-                oPromise,
-                iNumberOfItemsToFetch;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aCurrentItems = this.getItemsFromModel(this.sCurrentSorting);
+            let iNumberOfItemsInModel;
 
             if (!this.shouldFetchMoreNotifications()) {
                 return;
             }
 
-            iNumberOfItemsToFetch = this.getNumberOfItemsToFetchOnScroll(sCurrentSorting);
+            const iNumberOfItemsToFetch = this.getNumberOfItemsToFetchOnScroll(this.sCurrentSorting);
             if (iNumberOfItemsToFetch === 0) {
-                this.getView().getModel().setProperty("/" + sCurrentSorting + "/hasMoreItems", false);
+                oModel.setProperty(`/${this.sCurrentSorting}/hasMoreItems`, false);
                 return;
             }
 
@@ -161,62 +161,56 @@ sap.ui.define([
             }
 
             if (iNumberOfItemsInModel === 0) {
-                this.addBusyIndicatorToTabFilter(sCurrentSorting);
+                this.addBusyIndicatorToTabFilter(this.sCurrentSorting);
             }
 
-            this.getView().getModel().setProperty("/" + sCurrentSorting + "/inUpdate", true);
+            oModel.setProperty(`/${this.sCurrentSorting}/inUpdate`, true);
 
             // Fetch a buffer of notification items from notification service
-            oPromise = this.oNotificationsService.getNotificationsBufferBySortingType(sCurrentSorting, iNumberOfItemsInModel, iNumberOfItemsToFetch);
-
-            oPromise.then(function (oResult) {
-                var dNotificationsUserSettingsAvailability = this.oNotificationsService._getNotificationSettingsAvailability();
-                if (dNotificationsUserSettingsAvailability.state() === "pending") {
-                    this.oNotificationsService._userSettingInitialization();
-                }
-                this.addBufferToModel(sCurrentSorting, oResult);
-            }.bind(this));
-
-            oPromise.catch(function (/*oResult*/) {
-                if (iNumberOfItemsInModel === 0) {
-                    this.removeBusyIndicatorToTabFilter(sCurrentSorting);
-                    this.handleError();
-                }
-            }.bind(this));
+            this.oNotificationsService.getNotificationsBufferBySortingType(this.sCurrentSorting, iNumberOfItemsInModel, iNumberOfItemsToFetch)
+                .then((oResult) => {
+                    const dNotificationsUserSettingsAvailability = this.oNotificationsService._getNotificationSettingsAvailability();
+                    if (dNotificationsUserSettingsAvailability.state() === "pending") {
+                        this.oNotificationsService._userSettingInitialization();
+                    }
+                    this.addBufferToModel(this.sCurrentSorting, oResult);
+                })
+                .catch((/*oResult*/) => {
+                    if (iNumberOfItemsInModel === 0) {
+                        this.removeBusyIndicatorToTabFilter(this.sCurrentSorting);
+                        _errorMessage(resources.i18n.getText("errorOccurredMsg"));
+                    }
+                });
         },
 
         /**
          * Gets a buffer of notification items of specific type from notification service
          */
         getNextBufferForType: function () {
-            var selectedTypeId = this.sCurrentExpandedType,
-                sSortingType = this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING,
-                oGroup = this.getGroupFromModel(selectedTypeId),
-                aCurrentItems = oGroup ? oGroup.aNotifications : undefined,
-                iNumberOfItemsInModel = 0,
-                oPromise,
-                bHasMoreItems = oGroup ? oGroup.hasMoreItems : true;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const selectedTypeId = this.sCurrentExpandedType;
+            const sSortingType = this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING;
+            const oGroup = this.getGroupFromModel(selectedTypeId);
+            const aCurrentItems = oGroup ? oGroup.aNotifications : undefined;
+            const iNumberOfItemsInModel = aCurrentItems && aCurrentItems.length || 0;
+            const bHasMoreItems = oGroup ? oGroup.hasMoreItems : true;
 
             // If there are no more notification items (in the backend) for this sorting type - then return
             if (!bHasMoreItems) {
                 return;
             }
-            if (aCurrentItems !== undefined) {
-                iNumberOfItemsInModel = aCurrentItems.length;
-            }
 
-            this.getView().getModel().setProperty("/" + sSortingType + "/inUpdate", true);
+            oModel.setProperty(`/${sSortingType}/inUpdate`, true);
 
             // Fetch a buffer of notification items from notification service
-            oPromise = this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, iNumberOfItemsInModel, this.iMaxNotificationItemsForDevice);
-
-            oPromise.then(function (oResult) {
-                this.addTypeBufferToModel(selectedTypeId, oResult, false);
-            }.bind(this));
-
-            oPromise.catch(function (/*oResult*/) {
-                this.getNextBufferFailHandler(sSortingType);
-            }.bind(this));
+            this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, iNumberOfItemsInModel, this.iMaxNotificationItemsForDevice)
+                .then((oResult) => {
+                    this.addTypeBufferToModel(selectedTypeId, oResult, false);
+                })
+                .catch((/*oResult*/) => {
+                    this.getNextBufferFailHandler(sSortingType);
+                });
         },
 
         /**
@@ -229,33 +223,33 @@ sap.ui.define([
          * @param {object} oResult The data (notification items) to insert to the model
          */
         addBufferToModel: function (sSortingType, oResult) {
-            var aCurrentItems = this.getItemsFromModel(sSortingType),
-                iCurrentNumberOfItems = aCurrentItems.length,
-                mergedArrays,
-                hasMoreItems = oResult.length >= this.getNumberOfItemsToFetchOnScroll(sSortingType);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aCurrentItems = this.getItemsFromModel(sSortingType);
+            const bHasMoreItems = oResult.length >= this.getNumberOfItemsToFetchOnScroll(sSortingType);
 
             this._oTopNotificationData = undefined;
 
             if (!oResult) {
-                this.getView().getModel().setProperty("/" + sSortingType + "/hasMoreItemsInBackend", false);
+                oModel.setProperty(`/${sSortingType}/hasMoreItemsInBackend`, false);
                 return;
             }
 
             // If the number of returned items is smaller than the number that was requested -
             // it means that there is no more data (i.e. notification items) in the backend that needs to be fetched for this sorting type
 
-            this.getView().getModel().setProperty("/" + sSortingType + "/hasMoreItemsInBackend", hasMoreItems);
+            oModel.setProperty(`/${sSortingType}/hasMoreItemsInBackend`, bHasMoreItems);
 
-            mergedArrays = aCurrentItems.concat(oResult);
-            this.getView().getModel().setProperty("/" + sSortingType + "/aNotifications", mergedArrays);
-            this.getView().getModel().setProperty("/" + sSortingType + "/inUpdate", false);
-            if (mergedArrays.length >= this.iMaxNotificationItemsForDevice) {
+            const aMergedArrays = aCurrentItems.concat(oResult);
+            oModel.setProperty(`/${sSortingType}/aNotifications`, aMergedArrays);
+            oModel.setProperty(`/${sSortingType}/inUpdate`, false);
+            if (aMergedArrays.length >= this.iMaxNotificationItemsForDevice) {
                 this.handleMaxReached(sSortingType);
             }
 
             // If this is the first time that items are fetched for this tab\sorting type (no old items) -
             // then the busy indicator was rendered and now needs to be removed
-            if (iCurrentNumberOfItems === 0) {
+            if (aCurrentItems.length === 0) {
                 this.removeBusyIndicatorToTabFilter(sSortingType);
             }
         },
@@ -270,10 +264,11 @@ sap.ui.define([
          * @param {boolean} bOverwrite Overwrite the current buffer
          */
         addTypeBufferToModel: function (sTypeId, oResult, bOverwrite) {
-            var oGroup = this.getGroupFromModel(sTypeId),
-                oGroupIndexInModel = this.getGroupIndexFromModel(sTypeId),
-                aGroupHeaders = this.getView().getModel().getProperty("/" + this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING),
-                mergedArrays;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oGroup = this.getGroupFromModel(sTypeId);
+            const oGroupIndexInModel = this.getGroupIndexFromModel(sTypeId);
+            const aGroupHeaders = oModel.getProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`);
 
             if (!oResult) {
                 return;
@@ -287,32 +282,12 @@ sap.ui.define([
             if (!oGroup.aNotifications || bOverwrite) {
                 oGroup.aNotifications = [];
             }
-            mergedArrays = oGroup.aNotifications.concat(oResult);
-            aGroupHeaders[oGroupIndexInModel].aNotifications = mergedArrays;
+            const aMergedArrays = oGroup.aNotifications.concat(oResult);
+            aGroupHeaders[oGroupIndexInModel].aNotifications = aMergedArrays;
             aGroupHeaders[oGroupIndexInModel].Busy = false;
 
-            this.getView().getModel().setProperty("/" + this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING, aGroupHeaders);
-            this.getView().getModel().setProperty("/" + this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING + "/inUpdate", false);
-        },
-
-        keydownHandler: function (keyup) {
-            var jqElement,
-                nextElem,
-                closeBtn;
-
-            if (keyup.keyCode === KeyCodes.DELETE) {
-                jqElement = jQuery(document.activeElement);
-                if (jqElement.hasClass("sapUshellNotificationsListItem")) {
-                    nextElem = jqElement.next();
-                    closeBtn = jqElement.find(".sapMNLB-CloseButton")[0];
-                    Element.getElementById(closeBtn.id).firePress();
-
-                    // set focus on the next list item.
-                    if (nextElem) {
-                        nextElem.focus();
-                    }
-                }
-            }
+            oModel.setProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`, aGroupHeaders);
+            oModel.setProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}/inUpdate`, false);
         },
 
         /**
@@ -323,57 +298,54 @@ sap.ui.define([
          * - Gets the updated notifications array and sets the model accordingly
          */
         notificationsUpdateCallback: function () {
-            var that = this,
-                sCurrentSorting = this.sCurrentSorting,
-                aCurrentItems,
-                iNumberOfItemsInModel,
-                iNumberOfItemsToFetch;
-
-            if (sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
+            if (this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
                 this.notificationsUpdateCallbackForType();
                 return;
             }
 
-            aCurrentItems = this.getItemsFromModel(sCurrentSorting);
-            if (aCurrentItems !== undefined) {
-                iNumberOfItemsInModel = aCurrentItems.length;
-            }
+            const aCurrentItems = this.getItemsFromModel(this.sCurrentSorting);
+            const iNumberOfItemsInModel = aCurrentItems && aCurrentItems.length;
 
             // On update, only the current tab/sorting should maintain its previous data,
             // while other tabs (i.e. the model branch) should be emptied
             this.cleanModel();
 
-            iNumberOfItemsToFetch = this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel);
+            const iNumberOfItemsToFetch = this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel);
 
-            this.oNotificationsService.getNotificationsBufferBySortingType(sCurrentSorting, 0, iNumberOfItemsToFetch).then(function (aNotifications) {
-                if (!aNotifications) {
-                    return;
-                }
+            this.oNotificationsService.getNotificationsBufferBySortingType(this.sCurrentSorting, 0, iNumberOfItemsToFetch)
+                .then((aNotifications) => {
+                    if (!aNotifications) {
+                        return;
+                    }
 
-                // Updating the model with the updated array of notification objects
-                that.replaceItemsInModel(sCurrentSorting, aNotifications, iNumberOfItemsToFetch);
-            }).catch(function (data) {
-                Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ",
-                    data,
-                    "sap.ushell.components.shell.Notifications.Notifications");
-            });
+                    // Updating the model with the updated array of notification objects
+                    this.replaceItemsInModel(this.sCurrentSorting, aNotifications, iNumberOfItemsToFetch);
+                })
+                .catch((data) => {
+                    Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ",
+                        data,
+                        "sap.ushell.components.shell.Notifications.Notifications");
+                });
         },
 
         isMoreCircleExist: function (sSortingType) {
-            var oSelectedList = this.getNotificationList(sSortingType),
-                iItemsLength = oSelectedList.getItems().length,
-                oLastItem = oSelectedList.getItems()[iItemsLength - 1];
+            const oSelectedList = this.getNotificationList(sSortingType);
+            const aSelectedItems = oSelectedList.getItems();
+            const iItemsLength = aSelectedItems.length;
+            const oLastItem = aSelectedItems[iItemsLength - 1];
             return !!iItemsLength && oLastItem.getMetadata().getName() === "sap.m.CustomListItem";
         },
 
         handleMaxReached: function (sSortingType) {
-            var oSelectedList = this.getNotificationList(sSortingType),
-                iNotificationCount = Math.floor(this.oNotificationsService.getNotificationsCount()),
-                iMoreNotificationsNumber = iNotificationCount - this.iMaxNotificationItemsForDevice,
-                bIsMoreCircleExist = this.isMoreCircleExist(sSortingType);
-
-            this.getView().getModel().setProperty("/" + this.sCurrentSorting + "/moreNotificationCount", iMoreNotificationsNumber);
-            this.getView().getModel().setProperty("/" + this.sCurrentSorting + "/listMaxReached", iMoreNotificationsNumber >= 0);
+            const oSelectedList = this.getNotificationList(sSortingType);
+            const iNotificationCount = Math.floor(this.oNotificationsService.getNotificationsCount());
+            const iMoreNotificationsNumber = iNotificationCount - this.iMaxNotificationItemsForDevice;
+            const bIsMoreCircleExist = this.isMoreCircleExist(sSortingType);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+
+            oModel.setProperty(`/${this.sCurrentSorting}/moreNotificationCount`, iMoreNotificationsNumber);
+            oModel.setProperty(`/${this.sCurrentSorting}/listMaxReached`, iMoreNotificationsNumber >= 0);
             if (iMoreNotificationsNumber > 0 && !bIsMoreCircleExist) {
                 oSelectedList.addItem(this.getMoreCircle(this.sCurrentSorting));
             } else if (iMoreNotificationsNumber <= 0 && bIsMoreCircleExist) {
@@ -382,22 +354,24 @@ sap.ui.define([
         },
 
         reAddFailedGroup: function (oGroupToAdd) {
-            var oModel = this.getView().getModel(),
-                aGroups = oModel.getProperty("/notificationsByTypeDescending");
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aGroups = oModel.getProperty("/notificationsByTypeDescending");
 
             aGroups.splice(oGroupToAdd.removedGroupIndex, 0, oGroupToAdd.oGroup);
             oModel.setProperty("/notificationsByTypeDescending", aGroups);
         },
 
         removeGroupFromModel: function (oGroupToDelete) {
-            var oModel = this.getView().getModel(),
-                aGroups = oModel.getProperty("/notificationsByTypeDescending"),
-                oRemovedGroup = {
-                    oGroup: oGroupToDelete,
-                    removedGroupIndex: undefined
-                };
-
-            aGroups.some(function (oGroup, iIndex) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aGroups = oModel.getProperty("/notificationsByTypeDescending");
+            const oRemovedGroup = {
+                oGroup: oGroupToDelete,
+                removedGroupIndex: undefined
+            };
+
+            aGroups.some((oGroup, iIndex) => {
                 if (oGroup.Id === oGroupToDelete.Id) {
                     oRemovedGroup.removedGroupIndex = iIndex;
                     aGroups.splice(iIndex, 1);
@@ -411,81 +385,80 @@ sap.ui.define([
         },
 
         updateGroupHeaders: function () {
-            var oPromise = this.oNotificationsService.getNotificationsGroupHeaders(),
-                that = this,
-                aGroups = that.getView().getModel().getProperty("/" + that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
-            oPromise.catch(function (data) {
-                Log.error("Notifications control - call to notificationsService.updateGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
-            });
-            oPromise.then(function (notificationsByType) {
-                var oJson = JSON.parse(notificationsByType),
-                    arr = oJson.value;
-
-                arr.forEach(function (item) {
-                    var bFound = false;
-                    aGroups.forEach(function (group, iIndex) {
-                        if (group.Id === item.Id) {
-                            aGroups[iIndex].GroupHeaderText = item.GroupHeaderText;
-                            aGroups[iIndex].CreatedAt = item.CreatedAt;
-                            bFound = true;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aGroups = oModel.getProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`);
+            this.oNotificationsService.getNotificationsGroupHeaders()
+                .then((notificationsByType) => {
+                    const aTypes = JSON.parse(notificationsByType).value;
+                    aTypes.forEach((item) => {
+                        let bFound = false;
+                        aGroups.forEach((group, iIndex) => {
+                            if (group.Id === item.Id) {
+                                aGroups[iIndex].GroupHeaderText = item.GroupHeaderText;
+                                aGroups[iIndex].CreatedAt = item.CreatedAt;
+                                bFound = true;
+                            }
+                        });
+                        if (!bFound) {
+                            aGroups.unshift(item);
                         }
                     });
-                    if (!bFound) {
-                        aGroups.unshift(item);
-                    }
+                    oModel.setProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`, aGroups);
+                })
+                .catch((data) => {
+                    Log.error("Notifications control - call to notificationsService.updateGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
                 });
-                that.getView().getModel().setProperty("/" + that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING, aGroups);
-            });
         },
 
         updateNotificationsByDate: function () {
-            var iTop = this.getNumberOfItemsToFetchOnScroll(this.sCurrentSorting);
+            const iTop = this.getNumberOfItemsToFetchOnScroll(this.sCurrentSorting);
 
             this.oNotificationsService.getNotificationsBufferBySortingType(this.sCurrentSorting, 0, iTop)
-                .then(function (aNotifications) {
-                    this.getView().getModel().setProperty("/" + this.sCurrentSorting + "/aNotifications", aNotifications);
-                    this.removeBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING);
-                }.bind(this))
-                .catch(function (error) {
+                .then((aNotifications) => {
+                    const oView = this.getView();
+                    const oModel = oView.getModel();
+                    oModel.setProperty(`/${this.sCurrentSorting}/aNotifications`, aNotifications);
+                })
+                .catch((error) => {
                     Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ", error, "sap.ushell.components.shell.Notifications.Notifications");
+                })
+                .finally(() => {
                     this.removeBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING);
-                }.bind(this));
+                });
         },
 
         reloadGroupHeaders: function () {
-            var oPromise = this.oNotificationsService.getNotificationsGroupHeaders(),
-                that = this;
-            oPromise.catch(function (data) {
-                Log.error("Notifications control - call to notificationsService.getNotificationsGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
-                that.removeBusyIndicatorToTabFilter(that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
-            });
-            oPromise.then(function (notificationsByType) {
-                var oJson = JSON.parse(notificationsByType),
-                    arr = oJson.value,
-                    result = [];
-                arr.forEach(function (item) {
-                    if (item.IsGroupHeader) {
-                        item.Collapsed = true;
-                        result.push(item);
-                    }
+            this.oNotificationsService.getNotificationsGroupHeaders()
+                .then((notificationsByType) => {
+                    const oView = this.getView();
+                    const oModel = oView.getModel();
+                    const aTypes = JSON.parse(notificationsByType).value;
+                    const aResult = aTypes.filter((item) => {
+                        if (item.IsGroupHeader) {
+                            item.Collapsed = true;
+                            return true;
+                        }
+                        return false;
+                    });
+                    oModel.setProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`, aResult);
+                })
+                .catch((data) => {
+                    Log.error("Notifications control - call to notificationsService.getNotificationsGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
+                })
+                .finally(() => {
+                    this.removeBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
                 });
-                that.getView().getModel().setProperty("/" + that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING, result);
-                that.removeBusyIndicatorToTabFilter(that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
-            });
         },
 
         markRead: function (sNotificationId) {
-            var oPromise = this.oNotificationsService.markRead(sNotificationId),
-                that = this;
-            oPromise.catch(function () {
+            this.oNotificationsService.markRead(sNotificationId).catch(() => {
                 _errorMessage(resources.i18n.getText("notificationsFailedMarkRead"));
-                that.setMarkReadOnModel(sNotificationId, false);
+                this.setMarkReadOnModel(sNotificationId, false);
             });
             this.setMarkReadOnModel(sNotificationId, true);
         },
 
-        onExit: function () { },
-
         onBeforeRendering: function () {
             if (!this._bDependencyCallbackRegistered) { // register once: the service registration is primitive and does not remove duplicates
                 this._bDependencyCallbackRegistered = true;
@@ -501,93 +474,87 @@ sap.ui.define([
         },
 
         executeBulkAction: function (sActionName, sActionText, oGroup, sPathToNotification) {
-            var oThatGroup = oGroup,
-                oPromise = this.oNotificationsService.executeBulkAction(oGroup.Id, sActionName),
-                sMessage,
-                sGroupActionText = sActionText,
-                sNotificationTypeDesc = this.getView().getModel().getProperty(sPathToNotification + "/NotificationTypeDesc"),
-                that = this;
-
-            if (sNotificationTypeDesc === "") {
-                sNotificationTypeDesc = this.getView().getModel().getProperty(sPathToNotification + "/NotificationTypeKey");
-            }
-            oPromise.catch(function (oResult) {
-                this.getView().getModel().setProperty(sPathToNotification + "/Busy", false);
-
-                if (oResult && oResult.succededNotifications && oResult.succededNotifications.length) {
-                    oResult.succededNotifications.forEach(function (sNotificationId) {
-                        this.removeNotificationFromModel(sNotificationId);
-                    }.bind(this));
-                    // There is need to load again the other 2 tabs, therefore we need to "clean" other models.
-                    that.cleanModel();
-                }
-
-                if (oResult.succededNotifications.length === 1) {
-                    sMessage = resources.i18n.getText("notificationsPartialSuccessExecuteBulkAction", [
-                        sGroupActionText,
-                        oResult.succededNotifications.length,
-                        oResult.failedNotifications.length + oResult.succededNotifications.length,
-                        sNotificationTypeDesc,
-                        oResult.failedNotifications.length
+            const oThatGroup = oGroup;
+            let sMessage;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const sNotificationTypeDesc = oModel.getProperty(`${sPathToNotification}/NotificationTypeDesc`) || oModel.getProperty(`${sPathToNotification}/NotificationTypeKey`);
+
+            return this.oNotificationsService.executeBulkAction(oGroup.Id, sActionName)
+                .then(() => {
+                    sMessage = resources.i18n.getText("notificationsSuccessExecuteBulkAction", [
+                        sActionText, sNotificationTypeDesc
                     ]);
                     MessageToast.show(sMessage, { duration: 4000 });
-                } else if (oResult.succededNotifications.length > 1) {
-                    sMessage = resources.i18n.getText("notificationsSingleSuccessExecuteBulkAction", [
-                        sGroupActionText,
-                        oResult.succededNotifications.length,
-                        oResult.failedNotifications.length + oResult.succededNotifications.length,
-                        sNotificationTypeDesc,
-                        oResult.failedNotifications.length
-                    ]);
-                    MessageToast.show(sMessage, { duration: 4000 });
-                } else {
-                    sMessage = resources.i18n.getText("notificationsFailedExecuteBulkAction");
-                    _errorMessage(sMessage);
-                }
-            }.bind(this));
-
-            oPromise.then(function () {
-                sMessage = resources.i18n.getText("notificationsSuccessExecuteBulkAction", [
-                    sGroupActionText, sNotificationTypeDesc
-                ]);
-                MessageToast.show(sMessage, { duration: 4000 });
-                this.removeGroupFromModel(oThatGroup);
-                // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
-                this.cleanModel();
-            }.bind(this));
+                    this.removeGroupFromModel(oThatGroup);
+                    // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
+                    this.cleanModel();
+                })
+                .catch((oResult) => {
+                    oModel.setProperty(`${sPathToNotification}/Busy`, false);
+
+                    if (oResult && oResult.succededNotifications && oResult.succededNotifications.length) {
+                        oResult.succededNotifications.forEach((sNotificationId) => {
+                            this.removeNotificationFromModel(sNotificationId);
+                        });
+                        // There is need to load again the other 2 tabs, therefore we need to "clean" other models.
+                        this.cleanModel();
+                    }
+
+
+                    if (oResult.succededNotifications.length === 1) {
+                        sMessage = resources.i18n.getText("notificationsPartialSuccessExecuteBulkAction", [
+                            sActionText,
+                            oResult.succededNotifications.length,
+                            oResult.failedNotifications.length + oResult.succededNotifications.length,
+                            sNotificationTypeDesc,
+                            oResult.failedNotifications.length
+                        ]);
+                        MessageToast.show(sMessage, { duration: 4000 });
+                    } else if (oResult.succededNotifications.length > 1) {
+                        sMessage = resources.i18n.getText("notificationsSingleSuccessExecuteBulkAction", [
+                            sActionText,
+                            oResult.succededNotifications.length,
+                            oResult.failedNotifications.length + oResult.succededNotifications.length,
+                            sNotificationTypeDesc,
+                            oResult.failedNotifications.length
+                        ]);
+                        MessageToast.show(sMessage, { duration: 4000 });
+                    } else {
+                        sMessage = resources.i18n.getText("notificationsFailedExecuteBulkAction");
+                        _errorMessage(sMessage);
+                    }
+                });
         },
 
         dismissNotification: function (notificationId) {
             // if the service call is successful, we will get the updated model from the service via the standard update.
             // if the operation fails, the model won't be changed, so we just need to call "updateItems" on the list,
             // since the model contains the dismissed notification.
-            var that = this,
-                oRemovedNotification = this.removeNotificationFromModel(notificationId),
-                oPromise = this.oNotificationsService.dismissNotification(notificationId);
+            const oRemovedNotification = this.removeNotificationFromModel(notificationId);
             // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
             this.cleanModel();
-            oPromise.catch(function () {
+            this.oNotificationsService.dismissNotification(notificationId).catch(() => {
                 _errorMessage(resources.i18n.getText("notificationsFailedDismiss"));
-                that.addNotificationToModel(oRemovedNotification.obj, oRemovedNotification.index);
+                this.addNotificationToModel(oRemovedNotification.obj, oRemovedNotification.index);
             });
         },
 
         dismissBulkNotifications: function (oGroup) {
-            var oRemovedGroup = this.removeGroupFromModel(oGroup),
-                oPromise = this.oNotificationsService.dismissBulkNotifications(oGroup.Id);
+            const oRemovedGroup = this.removeGroupFromModel(oGroup);
             // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
             this.cleanModel();
-            oPromise.catch(function () {
+            this.oNotificationsService.dismissBulkNotifications(oGroup.Id).catch(() => {
                 _errorMessage(resources.i18n.getText("notificationsFailedExecuteBulkAction"));
                 this.reAddFailedGroup(oRemovedGroup);
-            }.bind(this));
+            });
         },
 
         onListItemPress: function (sNotificationId, sSemanticObject, sAction, aParameters) {
             if (sSemanticObject && sAction) {
-                var viewPortContainer = Element.getElementById("viewPortContainer");
-                if (viewPortContainer) { // qUnits do not create the viewport container
-                    viewPortContainer.switchState("Center");
+                const oViewPortContainer = Element.getElementById("viewPortContainer");
+                if (oViewPortContainer) { // qUnits do not create the viewport container
+                    oViewPortContainer.switchState("Center");
                 }
                 utils.toExternalWithParameters(sSemanticObject, sAction, aParameters);
             }
@@ -598,54 +565,39 @@ sap.ui.define([
         //******************************************* Scrolling ***************************************************
 
         scrollToItem: function (oTopNotificationData) {
-            var jqNotificationItems = this._getJqNotificationObjects(),
-                jqNotificationContainerContent = jqNotificationItems[0],
-                jqNotificationsContent = jqNotificationItems[1],
-                jqNotificationsList = jqNotificationItems[2],
-                jqNotificationItem = jqNotificationItems[3],
-                itemHeight,
-                notificationIndex,
-                indexOffSet,
-                containerPadding,
-                notificationContainerOffSet;
+            const jqNotificationContainerContent = jQuery("#notificationIconTabBar-containerContent");
+            const jqNotificationsContent = jqNotificationContainerContent.children();
+            const jqNotificationsList = jqNotificationsContent.children();
+            const jqNotificationItem = jqNotificationContainerContent.find("li").eq(0);
 
             if (jqNotificationContainerContent.length > 0
                 && jqNotificationsContent.length > 0
                 && jqNotificationsList.length > 0
                 && jqNotificationItem.length > 0) {
-                itemHeight = jqNotificationItem.outerHeight(true) - window.parseInt(jqNotificationItem.css("margin-top").replace("px", ""));
-                notificationIndex = this.getIndexInModelByItemId(oTopNotificationData.topItemId);
-                notificationIndex = notificationIndex || 0;
-                indexOffSet = notificationIndex * itemHeight + window.parseInt(jqNotificationItem.css("margin-top").replace("px", ""));
+                const itemHeight = jqNotificationItem.outerHeight(true) - window.parseInt(jqNotificationItem.css("margin-top").replace("px", ""));
+                const iNotificationIndex = this.getIndexInModelByItemId(oTopNotificationData.topItemId) || 0;
+                const iOffset = iNotificationIndex * itemHeight + window.parseInt(jqNotificationItem.css("margin-top").replace("px", ""));
 
-                containerPadding = window.parseInt(jqNotificationsContent.css("padding-top").replace("px", ""))
+                const iContainerPadding = window.parseInt(jqNotificationsContent.css("padding-top").replace("px", ""))
                     + window.parseInt(jqNotificationsList.css("padding-top").replace("px", ""));
-                notificationContainerOffSet = jqNotificationContainerContent.offset().top;
+                const iNotificationContainerOffset = jqNotificationContainerContent.offset().top;
 
-                jqNotificationContainerContent.scrollTop(indexOffSet + containerPadding + notificationContainerOffSet - oTopNotificationData.offSetTop);
+                jqNotificationContainerContent.scrollTop(iOffset + iContainerPadding + iNotificationContainerOffset - oTopNotificationData.offSetTop);
             }
             this._oTopNotificationData = undefined;
         },
 
-        _getJqNotificationObjects: function () {
-            var jqNotificationContainerContent = jQuery("#notificationIconTabBar-containerContent"),
-                jqNotificationsContent = jqNotificationContainerContent.children(),
-                jqNotificationsList = jqNotificationsContent.children(),
-                jqNotificationItem = jqNotificationContainerContent.find("li").eq(0);
-
-            return [jqNotificationContainerContent, jqNotificationsContent, jqNotificationsList, jqNotificationItem];
-        },
-
-        getTopOffSet: function () {
-            var topOffSet = 0,
-                jqContainerContent = this._getJqNotificationObjects()[0];
-            if (jqContainerContent.children().length > 0 && jqContainerContent.children().children().length > 0) {
+        getTopOffSet: function (jqNotificationContainerContent) {
+            let iTopOffset = 0;
+            const jqNotificationsContent = jqNotificationContainerContent.children();
+            const jqNotificationsList = jqNotificationsContent.children();
+            if (jqNotificationsContent.length > 0 && jqNotificationsList.length > 0) {
                 // Get the outer space/margin
-                topOffSet += jqContainerContent.children().outerHeight() - jqContainerContent.children().height();
+                iTopOffset += jqNotificationsContent.outerHeight() - jqNotificationsContent.height();
                 // Get the inner space/margin
-                topOffSet += jqContainerContent.children().children().outerHeight() - jqContainerContent.children().children().height();
+                iTopOffset += jqNotificationsList.outerHeight() - jqNotificationsList.height();
             }
-            return topOffSet;
+            return iTopOffset;
         },
 
         /**
@@ -654,46 +606,37 @@ sap.ui.define([
          */
         getTopItemOnTheScreen: function () {
             // The notifications list control including top offset (until the tabs bar)
-            var jqContainerContent = this._getJqNotificationObjects()[0],
-                topOffSet = 0,
-                sItemId,
-                itemOffsetTop = 0,
-                that = this;
+            const jqNotificationContainerContent = jQuery("#notificationIconTabBar-containerContent");
+            const jqNotificationItems = jqNotificationContainerContent.find("li");
+            const iTopOffset = this.getTopOffSet(jqNotificationContainerContent);
+            let sItemId;
+            let itemOffsetTop = 0;
 
-            topOffSet = this.getTopOffSet();
-
-            jqContainerContent.find("li").each(function () {
+            jqNotificationItems.each((index, item) => {
                 // The distance between the top of an item from the top of the screen
-                itemOffsetTop = jQuery(this).offset().top;
+                itemOffsetTop = jQuery(item).offset().top;
                 // Check if this element is in the interested viewport, the first element whose itemOffsetTop is bigger then topOffSet -
                 // is the highest visible element in the list
-                if (itemOffsetTop >= topOffSet) {
-                    sItemId = that.getItemNotificationId(this);
+                if (itemOffsetTop >= iTopOffset) {
+                    sItemId = this.getItemNotificationId(item);
                     return false;
                 }
             });
             return { topItemId: sItemId, offSetTop: itemOffsetTop };
         },
 
-        //*********************************************************************************************************
-        //***************************************** Error Handling ************************************************
-
-        handleError: function () {
-            _errorMessage(resources.i18n.getText("errorOccurredMsg"));
-        },
-
         //*********************************************************************************************************
         //****************************************** Busy Indicator ***********************************************
 
         addBusyIndicatorToTabFilter: function (sSortingType) {
-            var oList = this.getNotificationList(sSortingType);
+            const oList = this.getNotificationList(sSortingType);
             oList.setBusy(true);
             // during the loading we don't need to show noData text, because the data is not still loaded
             oList.setShowNoData(false);
         },
 
         removeBusyIndicatorToTabFilter: function (sSortingType) {
-            var oList = this.getNotificationList(sSortingType);
+            const oList = this.getNotificationList(sSortingType);
             oList.setBusy(false);
             oList.setShowNoData(true);
         },
@@ -702,25 +645,23 @@ sap.ui.define([
         //***************************************** Model functions ***********************************************
 
         addNotificationToModel: function (oNotification, index) {
-            var oModel = this.getView().getModel(),
-                notifications = oModel.getProperty("/" + this.sCurrentSorting + "/aNotifications");
-            notifications.splice(index, 0, oNotification);
-            oModel.setProperty("/" + this.sCurrentSorting + "/aNotifications", notifications);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aNotifications = oModel.getProperty(`/${this.sCurrentSorting}/aNotifications`);
+            aNotifications.splice(index, 0, oNotification);
+            oModel.setProperty(`/${this.sCurrentSorting}/aNotifications`, aNotifications);
         },
 
         removeNotificationFromModel: function (notificationId) {
-            var oModel = this.getView().getModel(),
-                aGroups,
-                notifications,
-                sNotificationsModelPath,
-                oRemovedNotification = {};
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            let aNotifications;
+            const oRemovedNotification = {};
 
             if (this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING ||
-                this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_DATE_ASCENDING ||
                 this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING) {
-                sNotificationsModelPath = "/" + this.sCurrentSorting + "/aNotifications";
-                notifications = oModel.getProperty(sNotificationsModelPath);
-                notifications.some(function (notification, index, array) {
+                aNotifications = oModel.getProperty(`/${this.sCurrentSorting}/aNotifications`);
+                aNotifications.some((notification, index, array) => {
                     if (notification.Id && notification.Id === notificationId) {
                         oRemovedNotification.obj = array.splice(index, 1)[0];
                         oRemovedNotification.index = index;
@@ -728,18 +669,18 @@ sap.ui.define([
                     }
                     return false;
                 });
-                oModel.setProperty(sNotificationsModelPath, notifications);
+                oModel.setProperty(`/${this.sCurrentSorting}/aNotifications`, aNotifications);
                 return oRemovedNotification;
             }
 
-            aGroups = oModel.getProperty("/notificationsByTypeDescending");
-            for (var index = 0; index < aGroups.length; index++) {
-                notifications = aGroups[index].aNotifications;
-                if (notifications) {
-                    if (notifications.length === 1 && notifications[0].Id === notificationId) {
+            const aGroups = oModel.getProperty("/notificationsByTypeDescending");
+            for (let index = 0; index < aGroups.length; index++) {
+                aNotifications = aGroups[index].aNotifications;
+                if (aNotifications) {
+                    if (aNotifications.length === 1 && aNotifications[0].Id === notificationId) {
                         aGroups.splice(index, 1);
                     } else {
-                        notifications.some(function (notification, index, array) {
+                        aNotifications.some((notification, index, array) => {
                             if (notification.Id && notification.Id === notificationId) {
                                 oRemovedNotification.obj = array.splice(index, 1)[0];
                                 oRemovedNotification.index = index;
@@ -747,7 +688,7 @@ sap.ui.define([
                             }
                             return false;
                         });
-                        aGroups[index].aNotifications = notifications;
+                        aGroups[index].aNotifications = aNotifications;
                     }
                 }
             }
@@ -763,18 +704,15 @@ sap.ui.define([
          * @returns {int} the index of the notification item in the model
          */
         getIndexInModelByItemId: function (sNotificationId) {
-            var aNotifications,
-                index;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const bByTypeDescending = this.notificationsByTypeDescending === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING;
+            const aNotifications = oModel.getProperty(`${bByTypeDescending ? this.sCurrentExpandedType : this.sCurrentSorting}/aNotifications`);
 
-            if (this.notificationsByTypeDescending === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
-                aNotifications = this.getView().getModel().getProperty("/" + this.sCurrentExpandedType + "/aNotifications");
-            } else {
-                aNotifications = this.getView().getModel().getProperty("/" + this.sCurrentSorting + "/aNotifications");
-            }
             if (aNotifications === undefined || aNotifications.length === 0) {
                 return 0;
             }
-            for (index = 0; index < aNotifications.length; index++) {
+            for (let index = 0; index < aNotifications.length; index++) {
                 if (aNotifications[index].Id === sNotificationId) {
                     return index;
                 }
@@ -785,47 +723,46 @@ sap.ui.define([
          * Initializes (i.e. empties) the branched in the model of the tabs/sorting which are not the current one
          */
         cleanModel: function () {
-            var that = this,
-                oSortingTypesArray = this.getView().getModel().getProperty("/");
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oSortingTypesArray = oModel.getProperty("/");
 
-            Object.keys(oSortingTypesArray).forEach(function (sSortKey) {
-                if (sSortKey !== that.sCurrentSorting && sSortKey !== that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
-                    oSortingTypesArray[sSortKey] = that.getInitialSortingModelStructure();
+            Object.keys(oSortingTypesArray).forEach((sSortKey) => {
+                if (sSortKey !== this.sCurrentSorting && sSortKey !== this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
+                    oSortingTypesArray[sSortKey] = this.getInitialSortingModelStructure();
                 }
             });
 
-            this.getView().getModel().setProperty("/", oSortingTypesArray);
+            oModel.setProperty("/", oSortingTypesArray);
         },
 
         replaceItemsInModel: function (sSortingType, oResult, iNumberOfItemsToFetch) {
-            var aCurrentItems = this.getItemsFromModel(sSortingType),
-                iCurrentNumberOfItems = aCurrentItems.length,
-                hasMoreItemsToFetch = oResult.length >= iNumberOfItemsToFetch;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aCurrentItems = this.getItemsFromModel(sSortingType);
+            const iCurrentNumberOfItems = aCurrentItems.length;
+            const bHasMoreItemsToFetch = oResult.length >= iNumberOfItemsToFetch;
             if (iCurrentNumberOfItems) {
                 this._oTopNotificationData = this.getTopItemOnTheScreen();
             }
 
-            this.getView().getModel().setProperty("/" + sSortingType + "/hasMoreItemsInBackend", hasMoreItemsToFetch);
-
-            this.getView().getModel().setProperty("/" + sSortingType + "/aNotifications", oResult);
-
-            this.getView().getModel().setProperty("/" + sSortingType + "/inUpdate", false);
+            oModel.setProperty(`/${sSortingType}/hasMoreItemsInBackend`, bHasMoreItemsToFetch);
+            oModel.setProperty(`/${sSortingType}/aNotifications`, oResult);
+            oModel.setProperty(`/${sSortingType}/inUpdate`, false);
             this.handleMaxReached(sSortingType);
         },
 
         setMarkReadOnModel: function (notificationId, bIsRead) {
-            var oModel = this.getView().getModel(),
-                sPath = "/" + this.sCurrentSorting,
-                aNotifications,
-                oData,
-                bGroupFound,
-                i;
-
-            oData = oModel.getProperty(sPath);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            let sPath = `/${this.sCurrentSorting}`;
+            let bGroupFound;
+
+            const oData = oModel.getProperty(sPath);
             if (this.sCurrentSorting === "notificationsByTypeDescending") {
-                for (i = 0; i < oData.length; i++) {
+                for (let i = 0; i < oData.length; i++) {
                     if (oData[i].Id === this.sCurrentExpandedType) {
-                        sPath = sPath + "/" + i;
+                        sPath = `${sPath}/${i}`;
                         bGroupFound = true;
                         break;
                     }
@@ -834,10 +771,10 @@ sap.ui.define([
                     return;
                 }
             }
-            sPath = sPath + "/aNotifications";
+            sPath = `${sPath}/aNotifications`;
 
-            aNotifications = oModel.getProperty(sPath);
-            aNotifications.some(function (notification) {
+            const aNotifications = oModel.getProperty(sPath);
+            aNotifications.some((notification) => {
                 if (notification.Id === notificationId) {
                     notification.IsRead = bIsRead;
                     return true;
@@ -851,7 +788,8 @@ sap.ui.define([
         //**************************************** Handler functions ***********************************************
 
         onTabSelected: function (evt) {
-            var key = evt.getParameter("key");
+            const oView = this.getView();
+            const key = evt.getParameter("key");
 
             if (key === "sapUshellNotificationIconTabByDate") { // Specification: By Date is sorted always by date descending
                 this.sCurrentSorting = this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING;
@@ -860,7 +798,7 @@ sap.ui.define([
                 this.sCurrentSorting = this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING;
                 this.addBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
                 this.reloadGroupHeaders();
-                this.getView().byId("notificationIconTabBar").addStyleClass("sapUshellNotificationIconTabByTypeWithBusyIndicator");
+                oView.byId("notificationIconTabBar").addStyleClass("sapUshellNotificationIconTabByTypeWithBusyIndicator");
             } else { // by Priority
                 this.sCurrentSorting = this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING;
                 if (this.getItemsFromModel(this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING).length === 0) {
@@ -870,142 +808,131 @@ sap.ui.define([
             this.oPreviousTabKey = key;
         },
 
-        _changeDateListBinding: function (sSortingType, oTab) {
-            var oLoadListItem = new Promise(function (resolve, reject) {
-                sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
-                    Fragment.load({
-                        name: "sap.ushell.components.shell.Notifications.NotificationsListItem",
-                        type: "XML",
-                        controller: this
-                    }).then(resolve).catch(reject);
-                }.bind(this), reject);
-            }.bind(this));
-
-            if (sSortingType === this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING) {
-                oTab.$("text").attr("aria-label", resources.i18n.getText("Notifications.ByDateDescending.AriaLabel"));
-
-                oLoadListItem.then(function (fragment) {
-                    this.getView().byId("sapUshellNotificationsListDate").bindItems(
-                        "/notificationsByDateDescending/aNotifications",
-                        fragment
-                    );
-                }.bind(this));
-            } else {
-                oTab.$("text").attr("aria-label", resources.i18n.getText("Notifications.ByDateAscending.AriaLabel"));
-
-                oLoadListItem.then(function (fragment) {
-                    this.getView().byId("sapUshellNotificationsListDate").bindItems(
-                        "/notificationsByDateAscending/aNotifications",
-                        fragment
-                    );
-                }.bind(this));
-            }
-        },
-
         onNotificationItemPress: function (oEvent) {
-            var oModelPath = oEvent.getSource().getBindingContextPath(),
-                oModelPart = this.getView().getModel().getProperty(oModelPath),
-                sSemanticObject = oModelPart.NavigationTargetObject,
-                sAction = oModelPart.NavigationTargetAction,
-                aParameters = oModelPart.NavigationTargetParams,
-                sNotificationId = oModelPart.Id;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oItem = oEvent.getSource();
+            const oBindingContext = oItem.getBindingContext();
+            const sPath = oBindingContext.getPath();
+            const oModelPart = oModel.getProperty(sPath);
+            const sSemanticObject = oModelPart.NavigationTargetObject;
+            const sAction = oModelPart.NavigationTargetAction;
+            const aParameters = oModelPart.NavigationTargetParams;
+            const sNotificationId = oModelPart.Id;
             this.onListItemPress(sNotificationId, sSemanticObject, sAction, aParameters);
         },
 
         onNotificationItemClose: function (oEvent) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
             this._retainFocus();
 
-            var sNotificationPathInModel = oEvent.getSource().getBindingContextPath(),
-                oNotificationModelEntry = this.getView().getModel().getProperty(sNotificationPathInModel),
-                sNotificationId = oNotificationModelEntry.Id;
+            const oItem = oEvent.getSource();
+            const oBindingContext = oItem.getBindingContext();
+            const sPath = oBindingContext.getPath();
+            const oNotificationModelEntry = oModel.getProperty(sPath);
+            const sNotificationId = oNotificationModelEntry.Id;
             this.dismissNotification(sNotificationId);
         },
 
         onNotificationItemButtonPress: function (oEvent) {
             this._retainFocus();
 
-            var sNotificationPathInModel = oEvent.getSource().getBindingContext().getPath(),
-                oModel = this.getView().getModel(),
-                oNotificationModelPart = oModel.getProperty(sNotificationPathInModel),
-                aPathParts = sNotificationPathInModel.split("/"),
-                bTypeTabSelected = this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING,
-                sPathToNotification = bTypeTabSelected
-                    ? "/" + aPathParts[1] + "/" + aPathParts[2] + "/" + aPathParts[3] + "/" + aPathParts[4]
-                    : "/" + aPathParts[1] + "/" + aPathParts[2] + "/" + aPathParts[3],
-                oNotificationModelEntry = oModel.getProperty(sPathToNotification),
-                sNotificationId = oNotificationModelEntry.Id;
-
-            oModel.setProperty(sPathToNotification + "/Busy", true);
-
-            this.executeAction(sNotificationId, oNotificationModelPart.ActionId).then(function (responseAck) {
-                if (responseAck && responseAck.isSucessfull) {
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oItem = oEvent.getSource();
+            const oBindingContext = oItem.getBindingContext();
+            const sPath = oBindingContext.getPath();
+            const oNotificationModelPart = oModel.getProperty(sPath);
+            const aPathParts = sPath.split("/");
+            const bTypeTabSelected = this.sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING;
+            const sPathToNotification = bTypeTabSelected
+                ? `/${aPathParts[1]}/${aPathParts[2]}/${aPathParts[3]}/${aPathParts[4]}`
+                : `/${aPathParts[1]}/${aPathParts[2]}/${aPathParts[3]}`;
+            const oNotificationModelEntry = oModel.getProperty(sPathToNotification);
+            const sNotificationId = oNotificationModelEntry.Id;
+
+            oModel.setProperty(`${sPathToNotification}/Busy`, true);
+
+            return this.executeAction(sNotificationId, oNotificationModelPart.ActionId)
+                .then((responseAck) => {
+                    if (responseAck && responseAck.isSucessfull) {
                         if (responseAck.message && responseAck.message.length) {
                             MessageToast.show(responseAck.message, { duration: 4000 });
                         } else {
-                            var sActionText = oNotificationModelPart.ActionText;
+                            const sActionText = oNotificationModelPart.ActionText;
                             MessageToast.show(resources.i18n.getText("ActionAppliedToNotification", [sActionText]), { duration: 4000 });
                         }
-                    });
 
-                    // Notification should remain in the UI (after action executed) only if DeleteOnReturn flag exists, and equals false
-                    if (responseAck.DeleteOnReturn !== false) {
-                        this.removeNotificationFromModel(sNotificationId);
-                        this.oNotificationsService._addDismissNotifications(sNotificationId);
+                        // Notification should remain in the UI (after action executed) only if DeleteOnReturn flag exists, and equals false
+                        if (responseAck.DeleteOnReturn !== false) {
+                            this.removeNotificationFromModel(sNotificationId);
+                            this.oNotificationsService._addDismissNotifications(sNotificationId);
 
-                        // There is need to load again the other 2 tabs, therefore we need to "clean" other models.
-                        this.cleanModel();
+                            // There is need to load again the other 2 tabs, therefore we need to "clean" other models.
+                            this.cleanModel();
+                        }
+                    } else if (responseAck) {
+                        _errorMessage(responseAck.message);
+                    } else {
+                        _errorMessage(resources.i18n.getText("notificationsFailedExecuteAction"));
                     }
-                } else if (responseAck) {
-                    _errorMessage(responseAck.message);
-                } else {
+                })
+                .catch(() => {
                     _errorMessage(resources.i18n.getText("notificationsFailedExecuteAction"));
-                }
-                oModel.setProperty(sPathToNotification + "/Busy", false);
-            }.bind(this)).catch(function () {
-                oModel.setProperty(sPathToNotification + "/Busy", false);
-                _errorMessage(resources.i18n.getText("notificationsFailedExecuteAction"));
-            });
+                })
+                .finally(() => {
+                    oModel.setProperty(`${sPathToNotification}/Busy`, false);
+                });
         },
 
         onNotificationGroupItemClose: function (oEvent) {
-            var sNotificationPathInModel = oEvent.getSource().getBindingContext().getPath(),
-                aPathParts = sNotificationPathInModel.split("/"),
-                sPathToNotification = "/" + aPathParts[1] + "/" + aPathParts[2],
-                oNotificationModelEntry = this.getView().getModel().getProperty(sPathToNotification);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oGroup = oEvent.getSource();
+            const sPath = oGroup.getBindingContextPath();
+            const aPathParts = sPath.split("/");
+            const sPathToNotification = `/${aPathParts[1]}/${aPathParts[2]}`;
+            const oNotificationModelEntry = oModel.getProperty(sPathToNotification);
 
             this.dismissBulkNotifications(oNotificationModelEntry);
         },
 
         onNotificationGroupItemCollapse: function (oEvent) {
-            var group = oEvent.getSource(),
-                path = group.getBindingContext().getPath();
-            if (!group.getCollapsed()) {
-                this.getView().getModel().setProperty(path + "/Busy", true);
-                this.expandedGroupIndex = path.substring(path.lastIndexOf("/") + 1);
-                this.onExpandGroup(group);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oGroup = oEvent.getSource();
+            const sPath = oGroup.getBindingContextPath();
+            if (!oGroup.getCollapsed()) {
+                oModel.setProperty(`${sPath}/Busy`, true);
+                this.expandedGroupIndex = sPath.substring(sPath.lastIndexOf("/") + 1);
+                this.onExpandGroup(oGroup);
             }
         },
 
         onNotificationGroupItemButtonPress: function (oEvent) {
-            var oModel = this.getView().getModel(),
-                sNotificationPathInModel = oEvent.getSource().getBindingContext().getPath(),
-                oNotificationModelPart = oModel.getProperty(sNotificationPathInModel),
-                aPathParts = sNotificationPathInModel.split("/"),
-                sPathToNotification = "/" + aPathParts[1] + "/" + aPathParts[2],
-                oNotificationModelEntry = oModel.getProperty(sPathToNotification);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oGroup = oEvent.getSource();
+            const sPath = oGroup.getBindingContextPath();
+            const oNotificationModelPart = oModel.getProperty(sPath);
+            const aPathParts = sPath.split("/");
+            const sPathToNotification = `/${aPathParts[1]}/${aPathParts[2]}`;
+            const oNotificationModelEntry = oModel.getProperty(sPathToNotification);
 
             this._retainFocus();
 
             // mark the notification group as busy
-            oModel.setProperty(sPathToNotification + "/Busy", true);
+            oModel.setProperty(`${sPathToNotification}/Busy`, true);
 
-            this.executeBulkAction(oNotificationModelPart.ActionId, oEvent.getSource().getProperty("text"), oNotificationModelEntry, sPathToNotification);
+            this.executeBulkAction(oNotificationModelPart.ActionId, oGroup.getProperty("text"), oNotificationModelEntry, sPathToNotification);
         },
 
         onListUpdateStarted: function (oEvent) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
             if (oEvent.getParameter("reason") === "Growing") {
-                if (!this.getView().getModel().getProperty("/" + this.sCurrentSorting + "/inUpdate")) {
+                if (!oModel.getProperty(`/${this.sCurrentSorting}/inUpdate`)) {
                     this.getNextBuffer();
                 }
             }
@@ -1015,10 +942,8 @@ sap.ui.define([
         //**************************************** Helper functions ***********************************************
 
         getNumberOfItemsInScreen: function () {
-            var iItemsInScreen,
-                iHeight = this.getWindowSize();
-
-            iItemsInScreen = (iHeight - this.oPagingConfiguration.TAB_BAR_HEIGHT) / this.oPagingConfiguration.NOTIFICATION_ITEM_HEIGHT;
+            const iHeight = jQuery(window).height();
+            const iItemsInScreen = (iHeight - this.oPagingConfiguration.TAB_BAR_HEIGHT) / this.oPagingConfiguration.NOTIFICATION_ITEM_HEIGHT;
             return Math.ceil(iItemsInScreen);
         },
 
@@ -1026,10 +951,6 @@ sap.ui.define([
             return Math.max(this.getNumberOfItemsInScreen() * 3, this.oPagingConfiguration.MIN_NOTIFICATION_ITEMS_PER_BUFFER);
         },
 
-        getWindowSize: function () {
-            return jQuery(window).height();
-        },
-
         /**
          * Calculates and returns the number of items that should be requested from notification service, as part of the paging policy.
          * The function performs the following:
@@ -1043,8 +964,8 @@ sap.ui.define([
          * @returns {int} Basic buffer size
          */
         getNumberOfItemsToFetchOnScroll: function (sSortingType) {
-            var iCurrentNumberOfItems = (this.getItemsFromModel(sSortingType) || []).length,
-                iBasicBufferSize = this.getBasicBufferSize();
+            const iCurrentNumberOfItems = (this.getItemsFromModel(sSortingType) || []).length;
+            const iBasicBufferSize = this.getBasicBufferSize();
 
             if (iCurrentNumberOfItems >= this.iMaxNotificationItemsForDevice) {
                 return 0;
@@ -1067,59 +988,51 @@ sap.ui.define([
          *   2. iMaxNotificationItemsForDevice
          */
         getNumberOfItemsToFetchOnUpdate: function (iNumberOfItemsInModel) {
-            var iBasicBufferSize = this.getBasicBufferSize(),
-                iNumberOfRequiredBasicBuffers = Math.ceil(iNumberOfItemsInModel / iBasicBufferSize),
-                iReturnedValue;
+            const iBasicBufferSize = this.getBasicBufferSize();
+            const iNumberOfRequiredBasicBuffers = Math.ceil(iNumberOfItemsInModel / iBasicBufferSize);
 
             // If the number is less then one basic buffer - then one basic buffer is required
-            iReturnedValue = iNumberOfRequiredBasicBuffers > 0 ? iNumberOfRequiredBasicBuffers * iBasicBufferSize : iBasicBufferSize;
+            const iReturnedValue = iNumberOfRequiredBasicBuffers > 0 ? iNumberOfRequiredBasicBuffers * iBasicBufferSize : iBasicBufferSize;
 
             // Return no more then the maximum number of items for this device
             return iReturnedValue > this.iMaxNotificationItemsForDevice ? this.iMaxNotificationItemsForDevice : iReturnedValue;
         },
 
         getItemsFromModel: function (sortingType) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
             if (sortingType === undefined) {
                 sortingType = this.sCurrentSorting;
             }
-            return this.getView().getModel().getProperty("/" + sortingType + "/aNotifications");
-        },
-
-        getItemsOfTypeFromModel: function (sTypeHeader) {
-            var oGroup = this.getGroupFromModel(sTypeHeader);
-            if (oGroup) {
-                return oGroup.aNotifications ? oGroup.aNotifications : [];
-            }
-            return [];
+            return oModel.getProperty(`/${sortingType}/aNotifications`);
         },
 
         getGroupFromModel: function (sTypeHeader) {
-            var aGroupHeaders = this.getView().getModel().getProperty("/" + this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
-            return aGroupHeaders.find(function (group) {
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aGroupHeaders = oModel.getProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`);
+            return aGroupHeaders.find((group) => {
                 return group.Id === sTypeHeader;
             });
         },
 
         getGroupIndexFromModel: function (sTypeHeader) {
-            var aGroupHeaders = this.getView().getModel().getProperty("/" + this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING),
-                iIndex;
-            aGroupHeaders.forEach(function (group, index) {
-                if (group.Id === sTypeHeader) {
-                    iIndex = index;
-                    return true;
-                }
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const aGroupHeaders = oModel.getProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}`);
+            return aGroupHeaders.findIndex((group) => {
+                return group.Id === sTypeHeader;
             });
-            return iIndex;
         },
 
         // Return the Notification Id of the given notification item
         getItemNotificationId: function (elNotificationItem) {
-            var sItemModelPath,
-                sItemNotificationId;
-            sItemModelPath = Element.getElementById(elNotificationItem.getAttribute("Id")).getBindingContext().sPath;
-
-            sItemNotificationId = this.getView().getModel().getProperty(sItemModelPath + "/Id");
-            return sItemNotificationId;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oItem = Element.getElementById(elNotificationItem.getAttribute("Id"));
+            const oBindingContext = oItem.getBindingContext();
+            const sPath = oBindingContext.getPath();
+            return oModel.getProperty(`${sPath}/Id`);
         },
 
         getInitialSortingModelStructure: function () {
@@ -1133,68 +1046,61 @@ sap.ui.define([
         },
 
         onExpandGroup: function (groupElement) {
-            var listItems = this.getView().byId("sapUshellNotificationsListType").getItems(),
-                groupElementId = groupElement.getId(),
-                oGroup = this.getView().getModel().getProperty(groupElement.getBindingContextPath()),
-                that = this;
-            that.sCurrentExpandedType = oGroup.Id;
-            that.getView().getModel().setProperty(groupElement.getBindingContextPath() + "/aNotifications", []);
-            that.getView().getModel().setProperty(groupElement.getBindingContextPath() + "/hasMoreItems", true);
-            listItems.forEach(function (item, index) {
-                if (item.getId() === groupElementId) {
-                    that.getNextBufferForType();
-                } else if (item.getId() !== groupElementId && !item.getCollapsed()) {
-                    item.setCollapsed(true);
-                    that.getView().getModel().setProperty(item.getBindingContextPath() + "/hasMoreItems", true);
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oNotificationList = oView.byId("sapUshellNotificationsListType");
+            const aListItems = oNotificationList.getItems();
+            const sGroupElementId = groupElement.getId();
+            const sPath = groupElement.getBindingContextPath();
+            const oGroup = oModel.getProperty(sPath);
+            this.sCurrentExpandedType = oGroup.Id;
+            oModel.setProperty(`${sPath}/aNotifications`, []);
+            oModel.setProperty(`${sPath}/hasMoreItems`, true);
+            aListItems.forEach((oItem) => {
+                if (oItem.getId() === sGroupElementId) {
+                    this.getNextBufferForType();
+                } else if (oItem.getId() !== sGroupElementId && !oItem.getCollapsed()) {
+                    oItem.setCollapsed(true);
+                    oModel.setProperty(`${oItem.getBindingContextPath()}/hasMoreItems`, true);
                 }
             });
         },
 
         notificationsUpdateCallbackForType: function () {
-            var selectedTypeId = this.sCurrentExpandedType,
-                sSortingType = this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING,
-                oGroup = this.getGroupFromModel(selectedTypeId),
-                aCurrentItems = oGroup ? oGroup.aNotifications : undefined,
-                iNumberOfItemsInModel = 0,
-                oPromise;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const selectedTypeId = this.sCurrentExpandedType;
+            const oGroup = this.getGroupFromModel(selectedTypeId);
+            const iNumberOfItemsInModel = oGroup && oGroup.aNotifications.length;
 
-
-            if (aCurrentItems !== undefined) {
-                iNumberOfItemsInModel = aCurrentItems.length;
-            }
-
-            this.getView().getModel().setProperty("/" + sSortingType + "/inUpdate", true);
+            oModel.setProperty(`/${this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING}/inUpdate`, true);
 
             // First Fetch the Groups Headers
             this.updateGroupHeaders();
 
             // Fetch a buffer of notification items from notification service
             if (selectedTypeId) {
-                oPromise = this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, 0, this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel));
-
-                oPromise.then(function (oResult) {
-                    this.addTypeBufferToModel(selectedTypeId, oResult, true);
-                }.bind(this));
-
-                oPromise.catch(function (oResult) {
-                    this.getNextBufferFailHandler(oResult);
-                }.bind(this));
+                this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, 0, this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel))
+                    .then((oResult) => {
+                        this.addTypeBufferToModel(selectedTypeId, oResult, true);
+                    })
+                    .catch((oResult) => {
+                        this.getNextBufferFailHandler(oResult);
+                    });
             }
         },
 
         getNotificationList: function (sSortingType) {
-            var oList;
-
-            if (sSortingType === this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING ||
-                sSortingType === this.oSortingType.NOTIFICATIONS_BY_DATE_ASCENDING) {
-                oList = this.getView().byId("sapUshellNotificationsListDate");
-            } else if (sSortingType === this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING) {
-                oList = this.getView().byId("sapUshellNotificationsListPriority");
-            } else {
-                oList = this.getView().byId("sapUshellNotificationsListType");
+            const oView = this.getView();
+
+            switch (sSortingType) {
+                case this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING:
+                    return oView.byId("sapUshellNotificationsListDate");
+                case this.oSortingType.NOTIFICATIONS_BY_PRIORITY_DESCENDING:
+                    return oView.byId("sapUshellNotificationsListPriority");
+                default:
+                    return oView.byId("sapUshellNotificationsListType");
             }
-
-            return oList;
         },
 
         /**
@@ -1204,56 +1110,62 @@ sap.ui.define([
          *   See "oOperationEnum" from "sap/ushell/services/Notifications.js".
          */
         removeTabIndexFromList: function (sSortingType) {
-            var oListControl = this.getNotificationList(sSortingType);
-            var oListTag = oListControl.$().children().get(1);
+            const oListControl = this.getNotificationList(sSortingType);
+            const oListTag = oListControl.$().children().get(1);
             if (oListTag) {
                 oListTag.removeAttribute("tabindex");
             }
         },
 
         getMoreCircle: function (sType) {
-            var oMoreText = new Text({ text: resources.i18n.getText("moreNotifications") }),
-                oNotificationCountText = new Text({ text: "" }).addStyleClass("sapUshellNotificationsMoreCircleCount"),
-                oMoreCircle = new VBox({
-                    items: [oNotificationCountText, oMoreText],
-                    alignItems: FlexAlignItems.Center
-                }).addStyleClass("sapUshellNotificationsMoreCircle"),
-                oBelowCircleTextPart1 = new Text({
-                    text: resources.i18n.getText("moreNotificationsAvailable_message"),
-                    textAlign: "Center"
-                }).addStyleClass("sapUshellNotificationsMoreHelpingText"),
-                oBelowCircleTextPart2 = new Text({
-                    text: resources.i18n.getText("processNotifications_message"),
-                    textAlign: "Center"
-                }).addStyleClass("sapUshellNotificationsMoreHelpingText"),
-                oVBox = new VBox({
-                    items: [oMoreCircle, oBelowCircleTextPart1, oBelowCircleTextPart2]
-                }).addStyleClass("sapUshellNotificationsMoreVBox"),
-                oListItem = new CustomListItem({
-                    type: ListType.Inactive,
-                    content: oVBox
-                }).addStyleClass("sapUshellNotificationsMoreListItem");
-
-            oNotificationCountText.setModel(this.getView().getModel());
-            oNotificationCountText.bindText("/" + sType + "/moreNotificationCount");
-            this.oMoreListItem = oListItem;
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oListItem = new CustomListItem({
+                type: ListType.Inactive,
+                content: new VBox({
+                    items: [
+                        new VBox({
+                            items: [
+                                new Text({
+                                    text: `{/${sType}/moreNotificationCount}`
+                                })
+                                    .addStyleClass("sapUshellNotificationsMoreCircleCount")
+                                    .setModel(oModel),
+                                new Text({
+                                    text: resources.i18n.getText("moreNotifications")
+                                })
+                            ],
+                            alignItems: FlexAlignItems.Center
+                        }).addStyleClass("sapUshellNotificationsMoreCircle"),
+                        new Text({
+                            text: resources.i18n.getText("moreNotificationsAvailable_message"),
+                            textAlign: "Center"
+                        }).addStyleClass("sapUshellNotificationsMoreHelpingText"),
+                        new Text({
+                            text: resources.i18n.getText("processNotifications_message"),
+                            textAlign: "Center"
+                        }).addStyleClass("sapUshellNotificationsMoreHelpingText")
+                    ]
+                }).addStyleClass("sapUshellNotificationsMoreVBox")
+            }).addStyleClass("sapUshellNotificationsMoreListItem");
 
+            this.oMoreListItem = oListItem;
             return oListItem;
         },
 
         // When the notifications view is opened in a popup, keep focus on an active tab to avoid the popup close due to focus loss
         _retainFocus: function () {
-            var oIconTabBar = this.getView().byId("notificationIconTabBar"),
-                sKey = oIconTabBar.getSelectedKey(),
-                aItems = oIconTabBar.getItems(),
-                iSelected = 0;
-
-            aItems.forEach(function (oItem, index) {
-                if (oItem.getKey() === sKey) {
-                    iSelected = index;
-                }
+            const oView = this.getView();
+            const oIconTabBar = oView.byId("notificationIconTabBar");
+            const sKey = oIconTabBar.getSelectedKey();
+            const aItems = oIconTabBar.getItems();
+            const iSelected = aItems.findIndex((oItem) => {
+                return oItem.getKey() === sKey;
             });
-            aItems[iSelected].focus();
+            const oFocusableItem = aItems[iSelected];
+            if (oFocusableItem) {
+                oFocusableItem.focus();
+            }
         },
 
         //*********************************************************************************************************