@openui5/sap.ui.support 1.97.1 → 1.98.0

package/src/sap/ui/support/supportRules/ui/controllers/Issues.controller.js

@@ -5,7 +5,6 @@
  */
 
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/ui/support/supportRules/ui/controllers/BaseController",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/support/supportRules/CommunicationBus",
@@ -15,8 +14,9 @@ sap.ui.define([
 	"sap/ui/support/supportRules/WCBChannels",
 	"sap/ui/support/supportRules/ui/models/formatter",
 	"sap/ui/support/supportRules/Constants",
-	"sap/m/OverflowToolbarAssociativePopoverControls"
-], function ($, BaseController, JSONModel, CommunicationBus, SharedModel, ElementTree, IssueManager, channelNames, formatter, constants, OverflowToolbarAssociativePopoverControls) {
+	"sap/m/OverflowToolbarAssociativePopoverControls",
+	"sap/base/util/deepExtend"
+], function (BaseController, JSONModel, CommunicationBus, SharedModel, ElementTree, IssueManager, channelNames, formatter, constants, OverflowToolbarAssociativePopoverControls, deepExtend) {
 	"use strict";
 
 	var mIssueSettings = {
@@ -178,11 +178,11 @@ sap.ui.define([
 			var sevFilter = this.model.getProperty("/severityFilter"),
 				sevFilterApplied = issue.severity === sevFilter || sevFilter === constants.FILTER_VALUE_ALL,
 				catFilter = this.model.getProperty("/categoryFilter"),
-				catFilterApplied = $.inArray( catFilter, issue.categories ) > -1 || catFilter === constants.FILTER_VALUE_ALL,
+				catFilterApplied = (issue.categories && issue.categories.indexOf(catFilter) > -1) || catFilter === constants.FILTER_VALUE_ALL,
 				elementFilter = this.model.getProperty("/elementFilter"),
 				elementFilterApplied =  elementFilter ===  issue.context.id || elementFilter === constants.FILTER_VALUE_ALL,
 				audFilter = this.model.getProperty("/audienceFilter"),
-				audienceFilterApplied =  $.inArray( audFilter, issue.audiences ) > -1 || audFilter === constants.FILTER_VALUE_ALL,
+				audienceFilterApplied = (issue.audiences && issue.audiences.indexOf(audFilter) > -1) || audFilter === constants.FILTER_VALUE_ALL,
 				bEnabledFilterButton = sevFilter === constants.FILTER_VALUE_ALL && catFilter === constants.FILTER_VALUE_ALL && audFilter === constants.FILTER_VALUE_ALL && elementFilter === constants.FILTER_VALUE_ALL;
 
 			this.model.setProperty("/bEnabledFilterButton", !bEnabledFilterButton);
@@ -221,7 +221,7 @@ sap.ui.define([
 				selectionCopy;
 			if (this.model.getProperty("/visibleIssuesCount") > 0) {
 				selectedIssues = this.structuredIssuesModel[selection.ruleLibName][selection.ruleId];
-				selectionCopy = jQuery.extend(true, {}, selection); // clone the model so that the TreeTable will not be affected
+				selectionCopy = deepExtend({}, selection); // clone the model so that the TreeTable will not be affected
 				selectionCopy.issues = selectedIssues;
 				selectionCopy.resolutionUrls = selectedIssues[0].resolutionUrls;
 				this.issueTable.setSelectedIndex(0);

package/src/sap/ui/support/supportRules/ui/controllers/Main.controller.js

@@ -96,7 +96,7 @@ sap.ui.define([
 			VersionInfo.load({ library: "sap.ui.core" }).then(function (oCoreLibInfo) {
 				CommunicationBus.publish(channelNames.POST_UI_INFORMATION, {
 					version: oCoreLibInfo,
-					location: new URI(jQuery.sap.getModulePath("sap.ui.support"), window.location.origin + window.location.pathname).toString()
+					location: new URI(sap.ui.require.toUrl("sap/ui/support"), window.location.origin + window.location.pathname).toString()
 				});
 			});
 

package/src/sap/ui/support/supportRules/ui/controllers/PresetsController.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	"sap/ui/support/supportRules/ui/models/Documentation",
 	"sap/ui/support/supportRules/util/Utils",
 	"sap/m/GroupHeaderListItem",
-	"sap/ui/thirdparty/jquery",
+	"sap/base/util/deepExtend",
 	"sap/ui/core/library"
 ], function (
 	BaseController,
@@ -26,7 +26,7 @@ sap.ui.define([
 	Documentation,
 	Utils,
 	GroupHeaderListItem,
-	jQuery,
+	deepExtend,
 	coreLibrary
 ) {
 	"use strict";
@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.support.supportRules.ui.controllers.BaseController
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @alias sap.ui.support.supportRules.ui.controllers.PresetsController
 	 */
@@ -658,7 +658,7 @@ sap.ui.define([
 		aSelectedPresets.push(oPresetOptions);
 
 		// keep the original version of the preset
-		aCustomPresets.push(jQuery.extend(true, {}, oPresetOptions));
+		aCustomPresets.push(deepExtend({}, oPresetOptions));
 
 		if (PresetsUtils.isPersistingAllowed()) {
 			PresetsUtils.persistCustomPresets();

package/src/sap/ui/support/supportRules/ui/external/ElementTree.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["jquery.sap.global"],
-	function (jQuery) {
+sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"],
+	function (Log, jQuery) {
 		"use strict";
 
 		function _isObject(data) {
@@ -212,7 +212,7 @@ sap.ui.define(["jquery.sap.global"],
 			var isDataAnObject = _isObject(data);
 
 			if (isDataAnObject === false) {
-				jQuery.sap.log.warning("The parameter should be an Object");
+				Log.warning("The parameter should be an Object");
 				return;
 			}
 
@@ -257,14 +257,14 @@ sap.ui.define(["jquery.sap.global"],
 			var selectedElement;
 
 			if (typeof elementID !== "string") {
-				jQuery.sap.log.warning("Please use a valid string parameter");
+				Log.warning("Please use a valid string parameter");
 				return;
 			}
 
 			selectedElement = this._ElementTreeContainer.querySelector("[data-id='" + elementID + "']");
 
 			if (selectedElement === null) {
-				jQuery.sap.log.warning("The selected element is not a child of the ElementTree");
+				Log.warning("The selected element is not a child of the ElementTree");
 				return;
 			}
 
@@ -293,7 +293,7 @@ sap.ui.define(["jquery.sap.global"],
 			html += this._createTreeContainer();
 
 			this._ElementTreeContainer.innerHTML = html;
-			// Save reverences for future use
+			// Save references for future use
 			this._setReferences();
 
 			if (this.getData() !== undefined) {

package/src/sap/ui/support/supportRules/ui/models/CustomListSelection.js

@@ -80,7 +80,7 @@ sap.ui.define([
 
 	function doCallOnHelper(sName, oHelper) {
 		return function() {
-			//jQuery.sap.log.warning("Function called on helper: " + sName);
+			//Log.warning("Function called on helper: " + sName);
 			return TABLESELECTIONADAPTER[sName].apply(oHelper, arguments);
 		};
 	}

package/src/sap/ui/support/supportRules/ui/models/Documentation.js

@@ -5,10 +5,12 @@
  */
 
 sap.ui.define([
-	"jquery.sap.global",
+	"sap/base/Log",
+	"sap/base/util/Version",
+	"sap/ui/thirdparty/jquery",
 	"sap/m/library",
 	"sap/ui/VersionInfo"
-], function (jQuery, mLibrary, VersionInfo) {
+], function (Log, Version, jQuery, mLibrary, VersionInfo) {
 	"use strict";
 
 	var Documentation = {
@@ -21,8 +23,8 @@ sap.ui.define([
 				var sUrl = "",
 					sVersion = "",
 					sFullVersion = oCoreLibInfo.version,
-					iMajorVersion = jQuery.sap.Version(sFullVersion).getMajor(),
-					iMinorVersion = jQuery.sap.Version(sFullVersion).getMinor(),
+					iMajorVersion = Version(sFullVersion).getMajor(),
+					iMinorVersion = Version(sFullVersion).getMinor(),
 					sOrigin = window.location.origin;
 
 				//This check is to make sure that version is even. Example: 1.53 will back down to 1.52
@@ -55,7 +57,7 @@ sap.ui.define([
 			this._pingUrl(sUrl).then(function success() {
 				mLibrary.URLHelper.redirect(sUrl, true);
 			}, function error() {
-				jQuery.sap.log.info("Support Assistant tried to load documentation link in " + sUrl + "but fail");
+				Log.info("Support Assistant tried to load documentation link in " + sUrl + "but fail");
 				sUrl = "https://ui5.sap.com/#/topic/" + sTopicId;
 				mLibrary.URLHelper.redirect(sUrl, true);
 			});

package/src/sap/ui/support/supportRules/ui/models/PresetsUtils.js

@@ -10,9 +10,9 @@ sap.ui.define([
 	"sap/ui/support/supportRules/ui/models/SelectionUtils",
 	"sap/ui/support/supportRules/ui/models/SharedModel",
 	"sap/ui/core/util/File",
-	"sap/ui/thirdparty/jquery",
+	"sap/base/util/extend",
 	"sap/ui/support/library"
-], function (Storage, constants, SelectionUtils, SharedModel, File, jQuery, library) {
+], function (Storage, constants, SelectionUtils, SharedModel, File, extend, library) {
 	"use strict";
 
 	var PresetsUtils = {
@@ -51,7 +51,7 @@ sap.ui.define([
 					if (oSystemPreset.id === oPreset.id) {
 						if (!oPreset.isModified) {
 							var bIsSelected = oPreset.selected;
-							oPreset = jQuery.extend({}, oSystemPreset);
+							oPreset = extend({}, oSystemPreset);
 							oPreset.selected = bIsSelected;
 							if (bIsSelected) {
 								SelectionUtils.setSelectedRules(oPreset.selections);
@@ -66,7 +66,7 @@ sap.ui.define([
 						disableDelete: true,
 						isSystemPreset: true
 					};
-					aPresets.splice(iLastSystemPresetPosition + 1, 0, jQuery.extend(mSystemPresetConfig, oSystemPreset));
+					aPresets.splice(iLastSystemPresetPosition + 1, 0, extend(mSystemPresetConfig, oSystemPreset));
 				}
 
 				iLastSystemPresetPosition++;

package/src/sap/ui/support/supportRules/util/RuleValidator.js

@@ -125,4 +125,4 @@ sap.ui.define([],
 };
 
 return RuleValidator;
-}, false);
+});

package/src/sap/ui/support/supportRules/util/StringAnalyzer.js

@@ -66,4 +66,4 @@ sap.ui.define([],
 	};
 
 	return StringAnalyzer;
-}, false);
+});

package/src/sap/ui/support/supportRules/util/Utils.js

@@ -7,10 +7,10 @@
 /**
  * Contains functionality that may be used trough the whole Support Assistant
  */
-sap.ui.define([],
-	function() {
+sap.ui.define(["sap/ui/thirdparty/jquery"],
+	function(jQuery) {
 		"use strict";
-		var sInternalPingFilePath = jQuery.sap.getModulePath("sap.ui.support").replace(/(^|\/)resources\//, "$1test-resources/") + "/internal/.ping";
+		var sInternalPingFilePath = sap.ui.require.toUrl("sap/ui/support").replace(/(^|\/)resources\//, "$1test-resources/") + "/internal/.ping";
 
 		var Utils = {
 			bCanLoadInternalRules: null,