@sapui5/sap.ushell 1.118.0 → 1.119.2

package/src/main/js/sap/ushell/services/_UserRecents/RecentActivity.js

@@ -5,7 +5,6 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/extend",
     "sap/ui/Device",
-    "sap/ui/thirdparty/jquery",
     "sap/ushell/EventHub",
     "sap/ushell/library"
 ], function (
@@ -13,7 +12,6 @@ sap.ui.define([
     Log,
     extend,
     Device,
-    jQuery,
     EventHub,
     ushellLibrary
 ) {
@@ -23,7 +21,7 @@ sap.ui.define([
     var AppType = ushellLibrary.AppType;
 
     /**
-     * @constructor
+     * @class
      * @private
      */
     var RecentActivity = UserRecentsBase.extend("sap.ushell.services.RecentActivity", {
@@ -127,38 +125,37 @@ sap.ui.define([
     };
 
     RecentActivity.prototype.newItem = function (oItem) {
-        var oDeferred = new jQuery.Deferred();
-        var iTimestampNow = Date.now();
-        var sIcon = this.getActivityIcon(oItem.appType, oItem.icon);
-        var bAlreadyIn;
-        var currentDay = this.getDayFromDateObj(new Date());
-
-        this._load()
-            .done(function (aLoadedRecents) {
-                this.oRecentActivities = this.getRecentActivitiesFromLoadedData(aLoadedRecents);
-                // If the current day is different than the recent one -
-                // add a new entry (for the current day's usage) to each usage array
-                if (currentDay !== this.oRecentActivities.recentDay) {
-                    this.addNewDay();
-                    this.oRecentActivities.recentDay = currentDay;
-                }
-
-                bAlreadyIn = this._updateIfAlreadyIn(oItem, iTimestampNow);
-                if (!bAlreadyIn) {
-                    this._insertNew(oItem, iTimestampNow, sIcon);
-                }
+        const iTimestampNow = Date.now();
+        const sIcon = this.getActivityIcon(oItem.appType, oItem.icon);
+        let bAlreadyIn;
+        const currentDay = this.getDayFromDateObj(new Date());
+
+        return new Promise((resolve, reject) => {
+            this._load()
+                .then((aLoadedRecents) => {
+                    this.oRecentActivities = this.getRecentActivitiesFromLoadedData(aLoadedRecents);
+                    // If the current day is different than the recent one -
+                    // add a new entry (for the current day's usage) to each usage array
+                    if (currentDay !== this.oRecentActivities.recentDay) {
+                        this.addNewDay();
+                        this.oRecentActivities.recentDay = currentDay;
+                    }
 
-                this._save(this.oRecentActivities)
-                    .done(function () {
-                        EventHub.emit("newUserRecentsItem", this.oRecentActivities);
-                        oDeferred.resolve();
-                    }.bind(this))
-                    .fail(function () {
-                        oDeferred.reject();
-                    });
-            }.bind(this));
+                    bAlreadyIn = this._updateIfAlreadyIn(oItem, iTimestampNow);
+                    if (!bAlreadyIn) {
+                        this._insertNew(oItem, iTimestampNow, sIcon);
+                    }
 
-        return oDeferred.promise();
+                    this._save(this.oRecentActivities)
+                        .then(() => {
+                            EventHub.emit("newUserRecentsItem", this.oRecentActivities);
+                            resolve();
+                        })
+                        .catch(errorMessage => {
+                            reject(errorMessage);
+                        });
+                });
+        });
     };
 
     RecentActivity.prototype.getActivityIcon = function (sAppType, sIcon) {
@@ -175,18 +172,16 @@ sap.ui.define([
     };
 
     RecentActivity.prototype.clearAllActivities = function () {
-        var oDeferred = new jQuery.Deferred();
-
-        this._save([])
-            .done(function () {
-                EventHub.emit("userRecentsCleared", Date.now());
-                oDeferred.resolve();
-            })
-            .fail(function () {
-                oDeferred.reject();
-            });
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this._save([])
+                .then(() => {
+                    EventHub.emit("userRecentsCleared", Date.now());
+                    resolve();
+                })
+                .catch(errorMessage => {
+                    reject(errorMessage);
+                });
+        });
     };
 
     /*
@@ -197,14 +192,13 @@ sap.ui.define([
      *   - return the last <maxNumOfActivities> entries or all entries supported by current device (if maxNumOfActivities was not provided).
      */
     RecentActivity.prototype.getRecentItemsHelper = function (maxNumOfActivities) {
-        var oDeferred = new jQuery.Deferred();
-        var activityIndex;
-        var oActivity;
-        var sCurrentDevice;
-        var bIsResolved = false;
-        var aIntentsToResolve = [];
-        var aURL = [];
-        var currentDay = this.getDayFromDateObj(new Date());
+        let activityIndex;
+        let oActivity;
+        let sCurrentDevice;
+        let bIsResolved = false;
+        const aIntentsToResolve = [];
+        const aURL = [];
+        const currentDay = this.getDayFromDateObj(new Date());
 
         if (Device.system.desktop) {
             sCurrentDevice = "desktop";
@@ -214,131 +208,137 @@ sap.ui.define([
             sCurrentDevice = "mobile";
         }
 
-        this._load()
-            .done(function (aLoadedRecents) {
-                this.oRecentActivities = this.getRecentActivitiesFromLoadedData(aLoadedRecents);
-                // If the current day is different than the recent one -
-                // add a new entry (for the current day's usage) to each usage array
-                var bNewDayAdded = false;
-                var sMandatoryParams;
-                if (currentDay !== this.oRecentActivities.recentDay) {
-                    this.addNewDay();
-                    this.oRecentActivities.recentDay = currentDay;
-                    bNewDayAdded = true;
-                }
+        return new Promise((resolve, reject) => {
+            this._load()
+                .then((aLoadedRecents) => {
+                    this.oRecentActivities = this.getRecentActivitiesFromLoadedData(aLoadedRecents);
+                    // If the current day is different than the recent one -
+                    // add a new entry (for the current day's usage) to each usage array
+                    var bNewDayAdded = false;
+                    var sMandatoryParams;
+                    if (currentDay !== this.oRecentActivities.recentDay) {
+                        this.addNewDay();
+                        this.oRecentActivities.recentDay = currentDay;
+                        bNewDayAdded = true;
+                    }
+
+                    //collect all unresolved activities for current device.
+                    for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length && !bIsResolved; activityIndex++) {
+                        const oIntent = {
+                            target: {
+                                shellHash: ""
+                            }
+                        };
+                        oActivity = this.oRecentActivities.recentUsageArray[activityIndex];
+                        if (oActivity[sCurrentDevice] === undefined) {
+                            // collect URLs without intent
+                            if (!(oActivity.oItem.url[0] === "#")) {
+                                aURL.push(oActivity.oItem.url);
+                                // check if url contains the mandatory parameters then add it to intents
+                            } else if (oActivity.oItem.url.indexOf("?") > -1) {
+                                sMandatoryParams = oActivity.oItem.url.substring(oActivity.oItem.url.indexOf("?"));
+                                // remove search app parameters
+                                if (sMandatoryParams.indexOf("&/") > -1) {
+                                    sMandatoryParams = sMandatoryParams.substring(0, sMandatoryParams.indexOf("&/"));
+                                }
+                                const sShellHash = oActivity.oItem.appId.split("#")[1];
+                                oIntent.target.shellHash = sShellHash + sMandatoryParams;
+                                aIntentsToResolve.push(oIntent);
+                            } else {
+                                const sShellHash = oActivity.oItem.appId.split("#")[1];
+                                oIntent.target.shellHash = sShellHash;
+                                aIntentsToResolve.push(oIntent);
 
-                //collect all unresolved activities for current device.
-                for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length && !bIsResolved; activityIndex++) {
-                    oActivity = this.oRecentActivities.recentUsageArray[activityIndex];
-                    if (oActivity[sCurrentDevice] === undefined) {
-                        // collect URLs without intent
-                        if (!(oActivity.oItem.url[0] === "#")) {
-                            aURL.push(oActivity.oItem.url);
-                            // check if url contains the mandatory parameters then add it to intents
-                        } else if (oActivity.oItem.url.indexOf("?") > -1) {
-                            sMandatoryParams = oActivity.oItem.url.substring(oActivity.oItem.url.indexOf("?"));
-                            // remove search app parameters
-                            if (sMandatoryParams.indexOf("&/") > -1) {
-                                sMandatoryParams = sMandatoryParams.substring(0, sMandatoryParams.indexOf("&/"));
                             }
-                            aIntentsToResolve.push(oActivity.oItem.appId + sMandatoryParams);
                         } else {
-                            aIntentsToResolve.push(oActivity.oItem.appId);
+                            //we have resolved the activities from here, no need to continue.
+                            bIsResolved = true;
                         }
-                    } else {
-                        //we have resolved the activities from here, no need to continue.
-                        bIsResolved = true;
                     }
-                }
 
-                // update current device for URLs without intent
-                if (aURL.length > 0) {
-                    var urlItem;
-                    for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length; activityIndex++) {
-                        if (!(this.oRecentActivities.recentUsageArray[activityIndex].oItem.url[0] === "#")) {
-                            urlItem = this.oRecentActivities.recentUsageArray[activityIndex];
-                            urlItem[sCurrentDevice] = true;
+                    // update current device for URLs without intent
+                    if (aURL.length > 0) {
+                        var urlItem;
+                        for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length; activityIndex++) {
+                            if (!(this.oRecentActivities.recentUsageArray[activityIndex].oItem.url[0] === "#")) {
+                                urlItem = this.oRecentActivities.recentUsageArray[activityIndex];
+                                urlItem[sCurrentDevice] = true;
+                            }
+                        }
+                        if (aIntentsToResolve.length <= 0) {
+                            // persist it.
+                            this._save(this.oRecentActivities)
+                                .then(() => {
+                                    const aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
+                                    resolve(aItems);
+                                })
+                                .catch(errorMessage => {
+                                    reject(errorMessage);
+                                });
                         }
                     }
-                    if (aIntentsToResolve.length <= 0) {
-                        // persist it.
-                        this._save(this.oRecentActivities)
-                            .done(function () {
-                                var aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
-
-                                oDeferred.resolve(aItems);
-                            }.bind(this))
-                            .fail(function () {
-                                oDeferred.reject();
-                            });
-                    }
-                }
 
-                if (aIntentsToResolve.length > 0) {
-                    sap.ushell.Container.getServiceAsync("CrossApplicationNavigation")
-                        .then(function (CrossApplicationNavigationService) {
-                            //resolve intent support for current device.
-                            CrossApplicationNavigationService.isIntentSupported(aIntentsToResolve)
-                                .done(function (oResolved) {
-                                    //save resolutions in aLoadedRecents
-                                    bIsResolved = false;
-                                    for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length && !bIsResolved; activityIndex++) {
-                                        oActivity = this.oRecentActivities.recentUsageArray[activityIndex];
-                                        if (oActivity[sCurrentDevice] === undefined) {
-                                            sMandatoryParams = "";
-                                            if (oActivity.oItem.url.indexOf("?") > -1) {
-                                                sMandatoryParams = oActivity.oItem.url.substring(oActivity.oItem.url.indexOf("?"));
-                                                // remove search app parameters
-                                                if (sMandatoryParams.indexOf("&/") > -1) {
-                                                    sMandatoryParams = sMandatoryParams.substring(0, sMandatoryParams.indexOf("&/"));
+                    if (aIntentsToResolve.length > 0) {
+                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation")
+                            .then(CrossApplicationNavigationService => {
+                                //resolve intent support for current device.
+                                CrossApplicationNavigationService.isNavigationSupported(aIntentsToResolve)
+                                    .done(aResolved => {
+                                        //save resolutions in aLoadedRecents
+                                        bIsResolved = false;
+                                        for (activityIndex = 0; activityIndex < this.oRecentActivities.recentUsageArray.length && !bIsResolved; activityIndex++) {
+                                            oActivity = this.oRecentActivities.recentUsageArray[activityIndex];
+                                            if (oActivity[sCurrentDevice] === undefined) {
+                                                sMandatoryParams = "";
+                                                if (oActivity.oItem.url.indexOf("?") > -1) {
+                                                    sMandatoryParams = oActivity.oItem.url.substring(oActivity.oItem.url.indexOf("?"));
+                                                    // remove search app parameters
+                                                    if (sMandatoryParams.indexOf("&/") > -1) {
+                                                        sMandatoryParams = sMandatoryParams.substring(0, sMandatoryParams.indexOf("&/"));
+                                                    }
                                                 }
+                                                var oItem = aResolved[activityIndex];
+                                                oActivity[sCurrentDevice] = !!(oItem && oItem.supported);
+                                            } else if (oActivity.oItem.url[0] === "#") {
+                                                bIsResolved = true;
                                             }
-                                            var oItem = oResolved[oActivity.oItem.appId + sMandatoryParams];
-                                            oActivity[sCurrentDevice] = !!(oItem && oItem.supported);
-                                        } else if (oActivity.oItem.url[0] === "#") {
-                                            bIsResolved = true;
                                         }
-                                    }
-
-                                    // persist it.
-                                    this._save(this.oRecentActivities)
-                                        .done(function () {
-                                            var aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
-
-                                            oDeferred.resolve(aItems);
-                                        }.bind(this))
-                                        .fail(function () {
-                                            oDeferred.reject();
-                                        });
-                                }.bind(this))
-                                .fail(function (sMsg) {
-                                    oDeferred.reject(sMsg);
-                                });
-                        }.bind(this));
-                } else if ((aIntentsToResolve.length <= 0) && (aURL.length <= 0)) {
-                    if (bNewDayAdded) {
-                        // If a new day was added, persist it.
-                        this._save(this.oRecentActivities)
-                            .done(function () {
-                                var aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
-
-                                oDeferred.resolve(aItems);
-                            }.bind(this))
-                            .fail(function () {
-                                oDeferred.reject();
-                            });
-                    } else {
-                        var aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
 
-                        oDeferred.resolve(aItems);
+                                        // persist it.
+                                        this._save(this.oRecentActivities)
+                                            .then(() => {
+                                                const aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
+                                                resolve(aItems);
+                                            })
+                                            .catch(errorMessage => {
+                                                reject(errorMessage);
+                                            });
+                                    })
+                                    .catch(sMsg => {
+                                        reject(sMsg);
+                                    });
+                            });
+                    } else if ((aIntentsToResolve.length <= 0) && (aURL.length <= 0)) {
+                        if (bNewDayAdded) {
+                            // If a new day was added, persist it.
+                            this._save(this.oRecentActivities)
+                                .then(() => {
+                                    const aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
+                                    resolve(aItems);
+                                })
+                                .catch(errorMessage => {
+                                    reject(errorMessage);
+                                });
+                        } else {
+                            const aItems = this._getRecentItemsForDevice(sCurrentDevice, this.oRecentActivities, maxNumOfActivities);
+                            resolve(aItems);
+                        }
                     }
-                }
-            }.bind(this))
-            .fail(function () {
-                oDeferred.reject();
-            });
-
-        return oDeferred.promise();
+                })
+                .catch((errormessage) => {
+                    reject(errormessage);
+                });
+        });
     };
 
     RecentActivity.prototype._getRecentItemsForDevice = function (device, recents, maxNumOfActivities) {
@@ -361,61 +361,53 @@ sap.ui.define([
     };
 
     RecentActivity.prototype.getRecentItems = function () {
-        var oDeferred = new jQuery.Deferred();
-
-        this.getRecentItemsHelper(RecentActivity.ITEM_COUNT)
-            .done(function (recentItems) {
-                oDeferred.resolve(jQuery.map(recentItems, function (oRecentEntry) {
-                    return oRecentEntry.oItem;
-                }));
-            })
-            .fail(function () {
-                oDeferred.reject();
-            });
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this.getRecentItemsHelper(RecentActivity.ITEM_COUNT)
+                .then(recentItems => {
+                    resolve(recentItems.map(oRecentEntry => oRecentEntry.oItem));
+                })
+                .catch(errorMessage => {
+                    reject(errorMessage);
+                });
+        });
     };
 
     RecentActivity.prototype.getFrequentItems = function () {
-        var oDeferred = new jQuery.Deferred();
-
-        this.getRecentItemsHelper()
-            .done(function (recentItems) {
-                var activityIndex;
-                var iWorkingDaysCounter = 0;
-                var aFrequentActivity = [];
-                var oActivity;
-                var previousActivityDate = recentItems[0] ? new Date(recentItems[0].iTimestamp) : undefined;
-                var currentActivityDate;
-                // Go through the recent activities list and leave only activities from the last MAX_DAYS working days
-                for (activityIndex = 0; activityIndex < recentItems.length && iWorkingDaysCounter < RecentActivity.MAX_DAYS; activityIndex++) {
-                    oActivity = recentItems[activityIndex];
-                    // Add only activities that happened more than once
-                    if (oActivity.iCount > 1) {
-                        aFrequentActivity.push(oActivity);
-                    }
-                    currentActivityDate = new Date(oActivity.iTimestamp);
-                    if (previousActivityDate.toDateString() !== currentActivityDate.toDateString()) {
-                        // If found an activity with a different date than the previous one, increase the days counter
-                        iWorkingDaysCounter++;
-                        previousActivityDate = currentActivityDate;
+        return new Promise((resolve, reject) => {
+            this.getRecentItemsHelper()
+                .then(recentItems => {
+                    var activityIndex;
+                    var iWorkingDaysCounter = 0;
+                    var aFrequentActivity = [];
+                    var oActivity;
+                    var previousActivityDate = recentItems[0] ? new Date(recentItems[0].iTimestamp) : undefined;
+                    var currentActivityDate;
+                    // Go through the recent activities list and leave only activities from the last MAX_DAYS working days
+                    for (activityIndex = 0; activityIndex < recentItems.length && iWorkingDaysCounter < RecentActivity.MAX_DAYS; activityIndex++) {
+                        oActivity = recentItems[activityIndex];
+                        // Add only activities that happened more than once
+                        if (oActivity.iCount > 1) {
+                            aFrequentActivity.push(oActivity);
+                        }
+                        currentActivityDate = new Date(oActivity.iTimestamp);
+                        if (previousActivityDate.toDateString() !== currentActivityDate.toDateString()) {
+                            // If found an activity with a different date than the previous one, increase the days counter
+                            iWorkingDaysCounter++;
+                            previousActivityDate = currentActivityDate;
+                        }
                     }
-                }
-                // Sort in descending order according to the count
-                aFrequentActivity.sort(function (a, b) {
-                    return b.iCount - a.iCount;
+                    // Sort in descending order according to the count
+                    aFrequentActivity.sort(function (a, b) {
+                        return b.iCount - a.iCount;
+                    });
+                    // Take only first items (ITEM_COUNT most frequent items)
+                    aFrequentActivity = aFrequentActivity.slice(0, RecentActivity.ITEM_COUNT);
+                    resolve(aFrequentActivity.map(oRecentEntry => oRecentEntry.oItem));
+                })
+                .catch(errorMessage => {
+                    reject(errorMessage);
                 });
-                // Take only first items (ITEM_COUNT most frequent items)
-                aFrequentActivity = aFrequentActivity.slice(0, RecentActivity.ITEM_COUNT);
-                oDeferred.resolve(jQuery.map(aFrequentActivity, function (oRecentEntry) {
-                    return oRecentEntry.oItem;
-                }));
-            })
-            .fail(function () {
-                oDeferred.reject();
-            });
-
-        return oDeferred.promise();
+        });
     };
 
     RecentActivity.prototype.addNewDay = function () {