@openui5/sap.ui.support 1.93.3 → 1.96.2

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -376,7 +370,7 @@ License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
 
-Component: Adaptive Cards, version: 1.2.3
+Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -450,12 +450,6 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.support",
-  "version": "1.93.3",
+  "version": "1.96.2",
   "description": "OpenUI5 UI Library sap.ui.support",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.93.3",
-    "@openui5/sap.ui.codeeditor": "1.93.3",
-    "@openui5/sap.ui.core": "1.93.3",
-    "@openui5/sap.ui.fl": "1.93.3",
-    "@openui5/sap.ui.layout": "1.93.3"
+    "@openui5/sap.m": "1.96.2",
+    "@openui5/sap.ui.codeeditor": "1.96.2",
+    "@openui5/sap.ui.core": "1.96.2",
+    "@openui5/sap.ui.fl": "1.96.2",
+    "@openui5/sap.ui.layout": "1.96.2"
   }
 }

package/src/sap/ui/support/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.93.3</version>
+	<version>1.96.2</version>
 
 	<documentation>UI5 library: sap.ui.support</documentation>
 

package/src/sap/ui/support/RuleAnalyzer.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @namespace
 		 * @alias sap.ui.support.RuleAnalyzer
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 * @public
 		 */
 		var RuleAnalyzer = {

package/src/sap/ui/support/jQuery.sap.support.js

@@ -32,7 +32,7 @@ sap.ui.define(["sap/ui/support/supportRules/Main",
 		 * @deprecated Since version 1.60.0. Please use sap/ui/support/RuleAnalyzer instead.
 		 * @alias jQuery.sap.support
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 * @public
 		 */
 		jQuery.sap.support = {

package/src/sap/ui/support/library.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/ui/core/library"],
 	 * @namespace
 	 * @name sap.ui.support
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @since 1.50
 	 * @public
 	 */
@@ -41,7 +41,7 @@ sap.ui.define(["sap/ui/core/library"],
 		controls: [],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.93.3",
+		version: "1.96.2",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {
@@ -53,7 +53,7 @@ sap.ui.define(["sap/ui/core/library"],
 	/**
 	 * Defines severity types.
 	 * @enum {string}
-	 * @since 1.93.3
+	 * @since 1.96.2
 	 * @public
 	 */
 	sap.ui.support.Severity = {
@@ -77,7 +77,7 @@ sap.ui.define(["sap/ui/core/library"],
 	/**
 	 * Defines the Audiences.
 	 * @enum {string}
-	 * @since 1.93.3
+	 * @since 1.96.2
 	 * @public
 	 */
 	sap.ui.support.Audiences = {
@@ -101,7 +101,7 @@ sap.ui.define(["sap/ui/core/library"],
 	/**
 	 * Issue Categories.
 	 * @enum {string}
-	 * @since 1.93.3
+	 * @since 1.96.2
 	 * @public
 	 */
 	sap.ui.support.Categories = {
@@ -170,7 +170,7 @@ sap.ui.define(["sap/ui/core/library"],
 	/**
 	 * Analysis history formats.
 	 * @enum {string}
-	 * @since 1.93.3
+	 * @since 1.96.2
 	 * @public
 	 */
 	sap.ui.support.HistoryFormats = {
@@ -189,7 +189,7 @@ sap.ui.define(["sap/ui/core/library"],
 	/**
 	 * Contains the available system presets.
 	 * @enum {object}
-	 * @since 1.93.3
+	 * @since 1.96.2
 	 * @public
 	 */
 	sap.ui.support.SystemPresets = {

package/src/sap/ui/support/supportRules/IssueManager.js

@@ -337,26 +337,26 @@ sap.ui.define(["jquery.sap.global", "sap/ui/base/Object", "sap/ui/support/librar
 			 * @returns {string} String containing the formatted name.
 			 */
 			_getFormattedName: function(oValues) {
-				var sHighColor = "",
-					sMediumColor = "",
-					sLowColor = "";
+				var sHighClass = "",
+					sMediumClass = "",
+					sLowClass = "";
 
 				if (oValues.highCount > 0) {
-					sHighColor = "color: " + constants.SUPPORT_ASSISTANT_SEVERITY_HIGH_COLOR + ";";
+					sHighClass = "issueSeverityHigh";
 				}
 
 				if (oValues.mediumCount > 0) {
-					sMediumColor = "color: " + constants.SUPPORT_ASSISTANT_SEVERITY_MEDIUM_COLOR + ";";
+					sMediumClass = "issueSeverityMedium";
 				}
 
 				if (oValues.lowCount > 0) {
-					sLowColor = "color: " + constants.SUPPORT_ASSISTANT_SEVERITY_LOW_COLOR + ";";
+					sLowClass = "issueSeverityLow";
 				}
 
 				return oValues.name +
-					" (<span style=\"" + sHighColor + "\"> " + oValues.highCount + " " + oValues.highName + ", </span> " +
-					"<span style=\"" + sMediumColor + "\"> " + oValues.mediumCount + " " + oValues.mediumName + ", </span> " +
-					"<span style=\"" + sLowColor + "\"> " + oValues.lowCount + " " + oValues.lowName + "</span> )";
+					" (<span class=\"" + sHighClass + "\"> " + oValues.highCount + " " + oValues.highName + ", </span> " +
+					"<span class=\"" + sMediumClass + "\"> " + oValues.mediumCount + " " + oValues.mediumName + ", </span> " +
+					"<span class=\"" + sLowClass + "\"> " + oValues.lowCount + " " + oValues.lowName + "</span> )";
 			},
 
 			/**

package/src/sap/ui/support/supportRules/RuleSet.js

@@ -38,7 +38,7 @@ function (jQuery, library, storage, constants) {
 	 * @name sap.ui.support.RuleSet
 	 * @memberof sap.ui.support
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @param {object} oSettings Name of the initiated
 	 * @returns {void}
 	 */
@@ -141,8 +141,7 @@ function (jQuery, library, storage, constants) {
 			return "Support rule with the id " + oSettings.id + " needs a description.";
 		}
 
-		// eslint-disable-next-line no-unsafe-negation
-		if (!oSettings.resolution && (!oSettings.resolutionurls || !oSettings.resolutionurls.length > 0)) {
+		if (!oSettings.resolution && (!oSettings.resolutionurls || oSettings.resolutionurls.length === 0)) {
 			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " needs either a resolution or resolutionurls or should have a ticket handler function");
 			return "Support rule with the id " + oSettings.id + " needs either a resolution or resolutionurls or should have a ticket handler function";
 		}

package/src/sap/ui/support/supportRules/Storage.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @name sap.ui.support.Storage
 	 * @alias sap.ui.support.Storage
 	 * @author SAP SE.
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/support/supportRules/WindowCommunicationBus.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @name sap.ui.support.WindowCommunicationBus
 	 * @memberof sap.ui.support
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 */
 	var WindowCommunicationBus = BaseObject.extend("sap.ui.support.supportRules.WindowCommunicationBus", {

package/src/sap/ui/support/supportRules/report/IssueRenderer.js

@@ -10,8 +10,6 @@
 sap.ui.define(['jquery.sap.global'], function(jQuery) {
 	'use strict';
 
-	var _OPARenderingInitialized = false;
-
 	function getEscapedString(value) {
 		if (value) {
 			if (Array.isArray(value)) {
@@ -179,49 +177,7 @@ sap.ui.define(['jquery.sap.global'], function(jQuery) {
 		return '<div>' + content + '</div>';
 	}
 
-	/* eslint-disable no-undef */
-	/**
-	 * Creates an html string containing the issues and appends it to the OPA html page
-	 * @param {Object} issues - the issues in viewmodel format
-	 * @returns {String}
-	 */
-	function renderIssuesForOPA(issues) {
-		if (!jQuery("#qunit") || !issues) {
-			return;
-		}
-
-		// TODO: Add rendered issues to a buffer and render all of them at the same time at the end of the OPA test.
-		var element = jQuery(this.render(issues));
-		jQuery("#qunit").append(element);
-
-		if (!_OPARenderingInitialized) {
-			var styles = [
-				jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources/styles.css'),
-				jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources/collapseExpand.css'),
-				jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources/filter.css')
-			];
-			var collapseExpandUrl = jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources/collapseExpand.js');
-			var filterUrl = jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources/filter.js');
-
-			jQuery.each(styles, function (index, value) {
-				jQuery('<link>').appendTo('head').attr({ type: 'text/css', rel: 'stylesheet', href: value });
-			});
-			jQuery.getScript(collapseExpandUrl, function () {
-				window.sapUiSupportReport.collapseExpand.init();
-			});
-			jQuery.getScript(filterUrl, function () {
-				window.sapUiSupportReport.filter.init();
-			});
-			_OPARenderingInitialized = true;
-		} else {
-			window.sapUiSupportReport.collapseExpand.init();
-			window.sapUiSupportReport.filter.init();
-		}
-	}
-	/* eslint-enable no-undef */
-
 	return {
-		render: render,
-		renderIssuesForOPA: renderIssuesForOPA
+		render: render
 	};
 }, true);

package/src/sap/ui/support/supportRules/report/ReportProvider.js

@@ -7,20 +7,12 @@
 /**
  * Creates a report from data.
  */
-sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/support/supportRules/report/Archiver',
-	'sap/ui/support/supportRules/report/IssueRenderer'], function(jQuery, Handlebars, Archiver, IssueRenderer) {
+sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver',
+	'sap/ui/support/supportRules/report/IssueRenderer'], function(jQuery, Archiver, IssueRenderer) {
 	'use strict';
 
 	// Private fields
 	var resourcesBaseUrl = jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources');
-	var resources = [
-		{ url: resourcesBaseUrl + '/ReportTemplate.html', type: 'template' },
-		{ url: resourcesBaseUrl + '/styles.css', type: 'css' },
-		{ url: resourcesBaseUrl + '/filter.css', type: 'css' },
-		{ url: resourcesBaseUrl + '/collapseExpand.css', type: 'css' },
-		{ url: resourcesBaseUrl + '/filter.js', type: 'js' },
-		{ url: resourcesBaseUrl + '/collapseExpand.js', type: 'js' }
-	];
 
 	/*
 	 * Functions taken from core.support.plugins.TechInfo.js
@@ -63,21 +55,13 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 	function getResource(resource) {
 		return jQuery.ajax({
 			type: 'GET',
-			url: resource.url,
+			url: resourcesBaseUrl + "/" + resource,
 			dataType: 'text'
 		}).then(function (text) {
-			return { content: text, type: resource.type };
+			return text;
 		});
 	}
 
-	function getResources() {
-		var deferreds = [];
-		for (var i = 0; i < resources.length; i++) {
-			deferreds.push(getResource(resources[i]));
-		}
-		return jQuery.when.apply(jQuery, deferreds);
-	}
-
 	/*
 	 * Modified version of the function onsapUiSupportTechInfoData from core.support.plugins.TechInfo.js
 	 */
@@ -85,7 +69,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 		var content = '';
 
 		if (!technicalInfo) {
-			return new Handlebars.SafeString(content);
+			return content;
 		}
 
 		try {
@@ -141,7 +125,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 			jQuery.sap.log.warning('There was a problem extracting technical info.');
 		}
 
-		return new Handlebars.SafeString(content);
+		return content;
 	}
 
 	function getComponentPart(value) {
@@ -157,7 +141,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 		var content = '';
 
 		if (!appInfo) {
-			return new Handlebars.SafeString(content);
+			return content;
 		}
 
 		content += '<table class="sapUiTable"><tr><th>Component ID</th><th>Type</th><th>Title</th><th>Subtitle</th><th>Application version</th><th>Description</th><th>BCP Component</th></tr>';
@@ -186,7 +170,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 			content = '';
 		}
 
-		return new Handlebars.SafeString(content);
+		return content;
 	}
 
 	function getGlobalScope(displaySettings) {
@@ -249,14 +233,14 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 			content = '';
 		}
 
-		return new Handlebars.SafeString(content);
+		return content;
 	}
 
 	function getRules(groups) {
 		var content = '';
 
 		if (!groups) {
-			return new Handlebars.SafeString(content);
+			return content;
 		}
 
 		try {
@@ -302,115 +286,110 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 			content = '';
 		}
 
-		return new Handlebars.SafeString(content);
+		return content;
 	}
 
-	function getResourcesHtml(resources, type) {
-		var content = '';
-
-		if (type !== 'script' && type !== 'style') {
-			return content;
-		}
+	function getIssues(issues) {
+		return IssueRenderer.render(issues, true);
+	}
 
-		for (var i = 0; i < resources.length; i++) {
-			switch (type) {
-				case 'script': content += '<script>' + resources[i] + '</script>\n'; break;
-				case 'style': content += '<style type="text/css">' + resources[i] + '</style>\n'; break;
-			}
+	function getRulePreset(oRulePreset) {
+		if (!oRulePreset) {
+			return "none";
 		}
 
-		return new Handlebars.SafeString(content);
+		return "<strong>" + oRulePreset.title + "/" + oRulePreset.id + "</strong>";
 	}
 
-	Handlebars.registerHelper('getTechnicalInformation', function (technicalInfo) {
-		return getTechnicalInformation(technicalInfo);
-	});
-	Handlebars.registerHelper('getRules', function (rules) {
-		return getRules(rules);
-	});
-	Handlebars.registerHelper('getIssues', function (issues) {
-		return new Handlebars.SafeString(IssueRenderer.render(issues, true));
-	});
-	Handlebars.registerHelper('getAppInfo', function (appInfo) {
-		return getAppInfo(appInfo);
-	});
-	Handlebars.registerHelper('getScope', function (scope) {
-		return getScope(scope);
-	});
-	Handlebars.registerHelper('getScripts', function (scripts) {
-		return getResourcesHtml(scripts, 'script');
-	});
-	Handlebars.registerHelper('getStyles', function (styles) {
-		return getResourcesHtml(styles, 'style');
-	});
-
 	// Public functions
 
 	/**
 	 * Creates an html string containing the whole report.
 	 * @param {Object} oData - the data required to create a report
-	 * @returns {String}
+	 * @param {String} [sBaseUrl] - the base path to javascript and css resources
+	 * @returns {String} the complete html.
 	 */
-	function getReportHtml(oData) {
-		return getResources().then(function () {
-			var styles = [],
-				scripts = [],
-				html = '',
-				i,
-				template = {},
-				reportContext = {};
-
-			for (i = 0; i < arguments.length; i++) {
-				switch (arguments[i].type) {
-					case 'template': html = arguments[i].content; break;
-					case 'css': styles.push(arguments[i].content); break;
-					case 'js': scripts.push(arguments[i].content); break;
-				}
-			}
+	function getReportHtml(oData, sBaseUrl) {
+		if (!sBaseUrl) {
+			sBaseUrl = resourcesBaseUrl + "/";
+		}
 
-			template = Handlebars.compile(html);
-
-			reportContext = {
-				technicalInfo: oData.technical,
-				issues: oData.issues,
-				appInfo: oData.application,
-				rules: oData.rules,
-				rulePreset: oData.rulePreset,
-				metadata: {
-					title: oData.name + ' Analysis Results',
-					title_TechnicalInfo: 'Technical Information',
-					title_Issues: 'Issues',
-					title_AppInfo: 'Application Information',
-					title_SelectedRules: 'Available and (<span class="checked"></span>) Selected Rules',
-					timestamp: new Date(),
-					scope: oData.scope,
-					analysisDuration: oData.analysisDuration,
-					analysisDurationTitle: oData.analysisDurationTitle,
-					styles: styles,
-					scripts: scripts
-				}
+		return getResource("ReportTemplate.html").then(function(sTemplate) {
+			var oContext = {
+				baseUrl: sBaseUrl,
+				technicalInfo: getTechnicalInformation(oData.technical),
+				issues: getIssues(oData.issues),
+				appInfo: getAppInfo(oData.application),
+				rules: getRules(oData.rules),
+				rulePreset: getRulePreset(oData.rulePreset),
+				metadataTitle: oData.name + ' Analysis Results',
+				metadataTitleTechnicalInfo: 'Technical Information',
+				metadataTitleIssues: 'Issues',
+				metadataTitleAppInfo: 'Application Information',
+				metadataTitleSelectedRules: 'Available and (<span class="checked"></span>) Selected Rules',
+				metadataTimestamp: new Date(),
+				metadataScope: getScope(oData.scope),
+				metadataAnalysisDuration: oData.analysisDuration,
+				metadataAnalysisDurationTitle: oData.analysisDurationTitle
 			};
 
-			return template(reportContext);
+			return replacePlaceholders(sTemplate, oContext);
 		});
 	}
 
+	/**
+	 * Replace any placeholder like {{placeholder}} with the corresponding value from oContext.
+	 * @param {String} sTemplate the string template containing the placeholders.
+	 * @param {Object} oContext the object containing the values for the placeholders.
+	 * @returns {String} the processed template.
+	 */
+	function replacePlaceholders(sTemplate, oContext) {
+		var sPlaceholder,
+			sValue;
+
+		for (sPlaceholder in oContext) {
+			sValue = oContext[sPlaceholder];
+			sTemplate = sTemplate.replace(new RegExp("\{\{" + sPlaceholder + "\}\}", "ig"), sValue);
+		}
+
+		return sTemplate;
+	}
+
 	/**
 	 * Creates a zip file containing the report.html, appInfo.json, technicalInfo.json, issues.json.
 	 * @param {Object} oData - the data required to create a report
 	 */
 	function downloadReportZip(oData) {
-		this.getReportHtml(oData).done(function (html) {
-			var report = '<!DOCTYPE HTML><html><head><title>Report</title></head><body><div id="sap-report-content">' + html + '</div></body></html>';
-			var issues = { 'issues': oData.issues };
-			var appInfos = { 'appInfos': oData.application };
-			var technicalInfo = { 'technicalInfo': oData.technical };
-			var archiver = new Archiver();
+		var aPromises = [
+			this.getReportHtml(oData, "./"),
+			getResource("styles.css"),
+			getResource("index.js"),
+			getResource("images/checked.svg"),
+			getResource("images/collapsed.svg"),
+			getResource("images/expanded.svg"),
+			getResource("images/unchecked.svg")
+		];
+
+		Promise.all(aPromises).then(function (resources) {
+			var issues = { 'issues': oData.issues },
+				appInfos = { 'appInfos': oData.application },
+				technicalInfo = { 'technicalInfo': oData.technical },
+				archiver = new Archiver();
+
 			archiver.add('technicalInfo.json', technicalInfo, 'json');
 			archiver.add('issues.json', issues, 'json');
 			archiver.add('appInfos.json', appInfos, 'json');
-			archiver.add('report.html', report);
+			archiver.add('report.html', resources[0]);
 			archiver.add('abap.json', oData.abap, 'json');
+			archiver.add('styles.css', resources[1], 'css');
+			archiver.add('index.js', resources[2], 'js');
+
+
+			archiver.add('images/checked.svg', resources[3], 'svg');
+			archiver.add('images/collapsed.svg', resources[4], 'svg');
+			archiver.add('images/expanded.svg', resources[5], 'svg');
+			archiver.add('images/unchecked.svg', resources[6], 'svg');
+
 			archiver.download("SupportAssistantReport");
 			archiver.clear();
 		});
@@ -423,21 +402,19 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/handlebars', 'sap/ui/supp
 	function openReport(oData) {
 		// Create a hidden anchor. Open window outside of the promise otherwise browsers blocks the window.open.
 		var content = '';
-		var a = jQuery('<a style="display: none;"></a>');
+		var a = jQuery('<a class="sapUiHidden"></a>');
 		a.on('click', function () {
 			var reportWindow = window.open('', '_blank');
 			reportWindow.opener = null;
 
 			jQuery(reportWindow.document).ready(function () {
-				// Sometimes document.write overwrites the document html and sometimes it appends to it so we need a wrapper div.
-				if (reportWindow.document.getElementById('sap-report-content')) {
-					reportWindow.document.getElementById('sap-report-content').innerHtml = content;
-				} else {
-					reportWindow.document.write('<div id="sap-report-content">' + content + '</div>');
-				}
-				reportWindow.document.title = 'Report';
+				// make sure everything is cleared before writing the new report
+				reportWindow.document.documentElement.innerHTML = '';
+
+				reportWindow.document.write(content);
 			});
 		});
+
 		jQuery('body').append(a);
 
 		this.getReportHtml(oData).then(function (html) {

package/src/sap/ui/support/supportRules/report/resources/ReportTemplate.html

@@ -1,97 +1,45 @@
-<style type="text/css">
-	body {
-		font-family: "72-Web", Arial, Helvetica, sans-serif;
-	}
-	main > header > h1 {
-		font-size: 1.8em;
-	}
-	section h1 {
-		font-size: 1.2em;
-	}
-	table {
-		font-size: 0.9em;
-	}
-	.sapUiSupportTechInfoCntnt td:first-child {
-		width: 12%;
-	}
-	.sapUiSupportTechInfoCntnt .sapUiSupportTitle td {
-		padding-top: 10px;
-	}
-	.sapUiSupportTechInfoCntnt .sapUiSupportTitle label {
-		padding-left: 4px;
-		font-size: 18px;
-		font-weight: bold;
-	}
-	.sapUiIssueGroupContent {
-		margin-top: 8px;
-	}
-	.unchecked::before {
-		vertical-align: middle;
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		content: "";
-		background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23333333'><path d='M42,3 C42.8125041,3 43.515622,3.28124719 44.109375,3.84375 C44.703128,4.40625281 45,5.12499563 45,6 L45,42 C45,42.8750044 44.703128,43.5937472 44.109375,44.15625 C43.515622,44.7187528 42.8125041,45 42,45 L6,45 C5.12499563,45 4.40625281,44.7187528 3.84375,44.15625 C3.28124719,43.5937472 3,42.8750044 3,42 L3,6 C3,5.12499563 3.28124719,4.40625281 3.84375,3.84375 C4.40625281,3.28124719 5.12499563,3 6,3 L42,3 Z M42,6 L6,6 L6,42 L42,42 L42,6 Z'></path></svg>") no-repeat;
-	}
-	.checked::before {
-		vertical-align: middle;
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		content: "";
-		background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23333333'><path d='M42,30 L45,30 L45,42 C45,42.8750044 44.703128,43.5937472 44.109375,44.15625 C43.515622,44.7187528 42.8125041,45 42,45 L6,45 C5.12499563,45 4.40625281,44.7187528 3.84375,44.15625 C3.28124719,43.5937472 3,42.8750044 3,42 L3,6 C3,5.18749594 3.28124719,4.48437797 3.84375,3.890625 C4.40625281,3.29687203 5.12499563,3 6,3 L18,3 L18,6 L6,6 L6,42 L42,42 L42,30 Z M47.625,2.34375 C48.0625022,2.78125219 48.1250016,3.28124719 47.8125,3.84375 L30.46875,29.34375 C30.2812491,29.7187519 29.9687522,29.9374997 29.53125,30 C29.0937478,30.0625003 28.7187516,29.9375016 28.40625,29.625 L16.6875,16.59375 C16.1249972,16.0312472 16.1249972,15.4687528 16.6875,14.90625 L18.65625,12.9375 C19.2812531,12.3124969 19.8749972,12.3124969 20.4375,12.9375 L27.9375,20.4375 C28.2500016,20.7500016 28.609373,20.8750003 29.015625,20.8125 C29.421877,20.7499997 29.7187491,20.5000022 29.90625,20.0625 L43.59375,0.65625 C43.7812509,0.281248125 44.078123,0.0625003125 44.484375,0 C44.890627,-0.0625003125 45.2499984,0.0624984375 45.5625,0.375 L47.625,2.34375 Z'></path></svg>") no-repeat;
-	}
-	td .unchecked::before,
-	td .checked::before {
-		margin-right: 8px;
-	}
-</style>
-
-{{getStyles metadata.styles}}
-
-<main>
-	<header>
-		<h1>{{metadata.title}}</h1>
-		<div>Generated on (<time>{{metadata.timestamp}}</time>)</div>
-		<div class="bottom-margin-small">{{metadata.analysisDurationTitle}}: <time>{{metadata.analysisDuration}}</time></div>
-		<div>{{getScope metadata.scope}}</div>
-	</header>
-	<div>
-		<section id="section_selected-rules">
-			<div class="expandable-control collapsed-content" data-expandableElement="selectedRulesContent"><h1 class="expandable-title">{{{metadata.title_SelectedRules}}}</h1></div>
-			<div id="selectedRulesContent">
+<!DOCTYPE HTML>
+<html>
+	<head>
+		<title>Support Assistant Report</title>
+		<link rel="stylesheet" href="{{baseUrl}}styles.css">
+	</head>
+	<body>
+		<div id="sap-report-content">
+			<main>
+				<header>
+					<h1>{{metadataTitle}}</h1>
+					<div>Generated on (<time>{{metadataTimestamp}}</time>)</div>
+					<div class="bottom-margin-small">{{metadataAnalysisDurationTitle}}: <time>{{metadataAnalysisDuration}}</time></div>
+					<div>{{metadataScope}}</div>
+				</header>
 				<div>
-					Rule Preset / ID :
-					{{#if rulePreset}}
-						<strong>{{rulePreset.title}} / {{rulePreset.id}}</strong>
-					{{else}}
-						none
-					{{/if}}
+					<section id="section_selected-rules">
+						<div class="expandable-control collapsed-content" data-expandableElement="selectedRulesContent"><h1 class="expandable-title">{{metadataTitleSelectedRules}}</h1></div>
+						<div id="selectedRulesContent">
+							<div>
+								Rule Preset / ID : {{rulePreset}}
+							</div>
+							{{rules}}
+						</div>
+					</section>
+					<section id="section_technical-details">
+						<div class="expandable-control collapsed-content" data-expandableElement="technicalInfoContent"><h1 class="expandable-title">{{metadataTitleTechnicalInfo}}</h1></div>
+						<div id="technicalInfoContent">{{technicalInfo}}</div>
+					</section>
+					<section id="section_app-info">
+						<div class="expandable-control collapsed-content" data-expandableElement="appInfoContent"><h1 class="expandable-title">{{metadataTitleAppInfo}}</h1></div>
+						<div id="appInfoContent">{{appInfo}}</div>
+					</section>
+					<section id="section_issues">
+						<div class="expandable-control collapsed-content" data-expandableElement="issuesContent"><h1 class="expandable-title">{{metadataTitleIssues}}</h1></div>
+						<div id="issuesContent">{{issues}}</div>
+					</section>
 				</div>
-				{{getRules rules}}
-			</div>
-		</section>
-		<section id="section_technical-details">
-			<div class="expandable-control collapsed-content" data-expandableElement="technicalInfoContent"><h1 class="expandable-title">{{metadata.title_TechnicalInfo}}</h1></div>
-			<div id="technicalInfoContent">{{getTechnicalInformation technicalInfo}}</div>
-		</section>
-		<section id="section_app-info">
-			<div class="expandable-control collapsed-content" data-expandableElement="appInfoContent"><h1 class="expandable-title">{{metadata.title_AppInfo}}</h1></div>
-			<div id="appInfoContent">{{getAppInfo appInfo}}</div>
-		</section>
-		<section id="section_issues">
-			<div class="expandable-control collapsed-content" data-expandableElement="issuesContent"><h1 class="expandable-title">{{metadata.title_Issues}}</h1></div>
-			<div id="issuesContent">{{getIssues issues}}</div>
-		</section>
-	</div>
-	<footer>
-	</footer>
-</main>
-
-{{getScripts metadata.scripts}}
-
-<script>
-	window.sapUiSupportReport.collapseExpand.init();
-	window.sapUiSupportReport.filter.init();
-</script>
-
+				<footer>
+				</footer>
+			</main>
+		</div>
+		<script src="{{baseUrl}}index.js"></script>
+	</body>
+</html>

package/src/sap/ui/support/supportRules/report/resources/images/checked.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23333333'><path d='M42,30 L45,30 L45,42 C45,42.8750044 44.703128,43.5937472 44.109375,44.15625 C43.515622,44.7187528 42.8125041,45 42,45 L6,45 C5.12499563,45 4.40625281,44.7187528 3.84375,44.15625 C3.28124719,43.5937472 3,42.8750044 3,42 L3,6 C3,5.18749594 3.28124719,4.48437797 3.84375,3.890625 C4.40625281,3.29687203 5.12499563,3 6,3 L18,3 L18,6 L6,6 L6,42 L42,42 L42,30 Z M47.625,2.34375 C48.0625022,2.78125219 48.1250016,3.28124719 47.8125,3.84375 L30.46875,29.34375 C30.2812491,29.7187519 29.9687522,29.9374997 29.53125,30 C29.0937478,30.0625003 28.7187516,29.9375016 28.40625,29.625 L16.6875,16.59375 C16.1249972,16.0312472 16.1249972,15.4687528 16.6875,14.90625 L18.65625,12.9375 C19.2812531,12.3124969 19.8749972,12.3124969 20.4375,12.9375 L27.9375,20.4375 C28.2500016,20.7500016 28.609373,20.8750003 29.015625,20.8125 C29.421877,20.7499997 29.7187491,20.5000022 29.90625,20.0625 L43.59375,0.65625 C43.7812509,0.281248125 44.078123,0.0625003125 44.484375,0 C44.890627,-0.0625003125 45.2499984,0.0624984375 45.5625,0.375 L47.625,2.34375 Z'></path></svg>

package/src/sap/ui/support/supportRules/report/resources/images/collapsed.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23346187'><path d='M31.96875,21.84375 C32.5937531,22.4687531 32.90625,23.1874959 32.90625,24 C32.90625,24.8125041 32.5937531,25.5312469 31.96875,26.15625 L16.5,41.625 C15.7499963,42.3125034 15.0312534,42.3125034 14.34375,41.625 C13.6562466,40.9374966 13.6562466,40.2187538 14.34375,39.46875 L29.34375,24.5625 C29.7187519,24.1874981 29.7187519,23.8125019 29.34375,23.4375 L14.4375,8.53125 C14.1249984,8.21874844 13.96875,7.87500188 13.96875,7.5 C13.96875,7.12499813 14.1249984,6.78125156 14.4375,6.46875 C14.7500016,6.15624844 15.0937481,6 15.46875,6 C15.8437519,6 16.1874984,6.15624844 16.5,6.46875 L31.96875,21.84375 Z'></path></svg>

package/src/sap/ui/support/supportRules/report/resources/images/expanded.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23346187'><path d='M39.46875,17.53125 C40.1562534,16.7812462 40.8749963,16.7812462 41.625,17.53125 C41.9375016,17.8437516 42.09375,18.1874981 42.09375,18.5625 C42.09375,18.9375019 41.9375016,19.2812484 41.625,19.59375 L26.15625,35.0625 C25.5312469,35.6250028 24.8125041,35.90625 24,35.90625 C23.1874959,35.90625 22.5000028,35.6250028 21.9375,35.0625 L6.375,19.59375 C6.06249844,19.2812484 5.90625,18.921877 5.90625,18.515625 C5.90625,18.109373 6.06249844,17.7500016 6.375,17.4375 C6.68750156,17.1249984 7.04687297,16.96875 7.453125,16.96875 C7.85937703,16.96875 8.21874844,17.1249984 8.53125,17.4375 L23.53125,32.4375 C23.8437516,32.8125019 24.1874981,32.8125019 24.5625,32.4375 L39.46875,17.53125 Z'></path></svg>

package/src/sap/ui/support/supportRules/report/resources/images/unchecked.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23333333'><path d='M42,3 C42.8125041,3 43.515622,3.28124719 44.109375,3.84375 C44.703128,4.40625281 45,5.12499563 45,6 L45,42 C45,42.8750044 44.703128,43.5937472 44.109375,44.15625 C43.515622,44.7187528 42.8125041,45 42,45 L6,45 C5.12499563,45 4.40625281,44.7187528 3.84375,44.15625 C3.28124719,43.5937472 3,42.8750044 3,42 L3,6 C3,5.12499563 3.28124719,4.40625281 3.84375,3.84375 C4.40625281,3.28124719 5.12499563,3 6,3 L42,3 Z M42,6 L6,6 L6,42 L42,42 L42,6 Z'></path></svg>

package/src/sap/ui/support/supportRules/report/resources/{filter.js → index.js}

@@ -4,6 +4,59 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
+window.sapUiSupportReport = window.sapUiSupportReport || {};
+window.sapUiSupportReport.collapseExpand = (function() {
+	'use strict';
+
+	function collapseExpandClickHandler(event) {
+		var toExpandElementId = this.getAttribute('data-expandableElement');
+		var expandableElement = document.getElementById(toExpandElementId);
+		var toExpand = expandableElement.classList.contains('collapsed');
+
+		if (toExpand) {
+			expandableElement.classList.remove('collapsed');
+			expandableElement.classList.add('expanded');
+			this.classList.remove('collapsed-content');
+			this.classList.add('expanded-content');
+		} else {
+			expandableElement.classList.remove('expanded');
+			expandableElement.classList.add('collapsed');
+			this.classList.remove('expanded-content');
+			this.classList.add('collapsed-content');
+		}
+	}
+
+	function init() {
+		try {
+			var expandableElements = document.getElementsByClassName('expandable-control');
+			if (!expandableElements) {
+				return;
+			}
+
+			for (var i = 0; i < expandableElements.length; i++) {
+				expandableElements[i].addEventListener('click', collapseExpandClickHandler);
+
+				// Set the default collapsed/expanded state of the expandable content.
+				var elementToExpandId = expandableElements[i].getAttribute('data-expandableElement');
+				var elementToExpand = document.getElementById(elementToExpandId);
+				if (expandableElements[i].classList.contains('collapsed-content')) {
+					elementToExpand.classList.add('collapsed');
+				} else {
+					elementToExpand.classList.add('expanded');
+				}
+			}
+		} catch (ex) {
+			/* eslint-disable no-console */
+			console.log('There was a problem initializing collapse/expand functionality.');
+			/* eslint-enable no-console */
+		}
+	}
+
+	return {
+		init: init
+	};
+}());
+
 window.sapUiSupportReport = window.sapUiSupportReport || {};
 window.sapUiSupportReport.filter = (function () {
 	'use strict';
@@ -109,3 +162,6 @@ window.sapUiSupportReport.filter = (function () {
 		init: init
 	};
 }());
+
+window.sapUiSupportReport.collapseExpand.init();
+window.sapUiSupportReport.filter.init();

package/src/sap/ui/support/supportRules/report/resources/styles.css

@@ -1,3 +1,107 @@
+/* General */
+body {
+        font-family: "72-Web", Arial, Helvetica, sans-serif;
+}
+main > header > h1 {
+        font-size: 1.8em;
+}
+section h1 {
+        font-size: 1.2em;
+}
+table {
+        font-size: 0.9em;
+}
+.sapUiSupportTechInfoCntnt td:first-child {
+        width: 12%;
+}
+.sapUiSupportTechInfoCntnt .sapUiSupportTitle td {
+        padding-top: 10px;
+}
+.sapUiSupportTechInfoCntnt .sapUiSupportTitle label {
+        padding-left: 4px;
+        font-size: 18px;
+        font-weight: bold;
+}
+.sapUiIssueGroupContent {
+        margin-top: 8px;
+}
+.unchecked::before {
+        vertical-align: middle;
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        content: "";
+        background: url("./images/unchecked.svg") no-repeat;
+}
+.checked::before {
+        vertical-align: middle;
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        content: "";
+        background: url("./images/checked.svg") no-repeat;
+}
+td .unchecked::before,
+td .checked::before {
+        margin-right: 8px;
+}
+
+/* Filters functionality */
+ .filters {
+	margin: 10px;
+	font-size: 1em;
+}
+.filter {
+	padding: 5px;
+	display: inline-block;
+	cursor: pointer;
+	border-radius: 5px;
+}
+.filter-active {
+	background-color: #ddd;
+	box-shadow: 1px 1px 5px #888888;
+}
+.filtered {
+	display: none;
+}
+
+/* Expand/Collapse functionality */
+.expandable-control {
+        cursor: pointer;
+}
+.expanded {
+	padding-left: 30px;
+}
+.expanded > tr > td:first-child {
+	padding-left: 35px;
+}
+.collapsed {
+	display: none;
+}
+.expanded-content > .expandable-title::before {
+	margin-right: 8px;
+	vertical-align: middle;
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	content: "";
+	background: url("./images/expanded.svg") no-repeat;
+}
+.collapsed-content > .expandable-title::before {
+	margin-right: 8px;
+	vertical-align: middle;
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	content: "";
+	background: url("./images/collapsed.svg") no-repeat;
+}
+.expanded-content > h1.expandable-title::before,
+.collapsed-content > h1.expandable-title::before {
+	width: 22px;
+	height: 22px;
+}
+
 /* Table */
 table.sapUiTable {
         margin-top: 5px;

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

@@ -315,11 +315,11 @@ sap.ui.define([
 			var currentPreset = this.model.getProperty("/selectionPresetsCurrent"),
 				oExecutionContext = this._getExecutionContext();
 
-			// eslint-disable-next-line no-unsafe-negation
-			if (!currentPreset.selections.length > 0) {
+			if (currentPreset.selections.length === 0) {
 				MessageToast.show("Select some rules to be analyzed.");
 				return;
 			}
+
 			if (oExecutionContext.type === "components" && oExecutionContext.components.length === 0) {
 				MessageToast.show("Please select some components to be analyzed.");
 				return;

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

@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.support.supportRules.ui.controllers.BaseController
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @alias sap.ui.support.supportRules.ui.controllers.PresetsController
 	 */

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

@@ -60,7 +60,7 @@ sap.ui.define(["jquery.sap.global"],
 		 * @private
 		 */
 		function _getElementTreeLeftColumnOfListItem(controls, paddingLeft) {
-			var html = "<offset style=\"padding-left:" + paddingLeft + "px\" >";
+			var html = "<offset data-indent=\"" + paddingLeft + "\" >";
 
 			if (controls.content.length > 0) {
 				html += "<arrow down=\"true\"></arrow>";
@@ -334,6 +334,25 @@ sap.ui.define(["jquery.sap.global"],
 			var controls = this.getData().controls;
 
 			this._treeContainer.innerHTML = this._createTreeHTML(controls);
+
+			this._provideIndentation();
+		};
+
+		/**
+		 * Sets the padding for each row in the element tree.
+		 * @private
+		 */
+		ElementTree.prototype._provideIndentation = function () {
+			var aOffsets = this._treeContainer.getElementsByTagName("offset"),
+				oOffset,
+				iIndex;
+
+			for (iIndex = 0; iIndex < aOffsets.length; iIndex++) {
+				oOffset = aOffsets[iIndex];
+				if (oOffset.dataset && oOffset.dataset.indent) {
+					oOffset.style.paddingLeft = oOffset.dataset.indent + "px";
+				}
+			}
 		};
 
 		/**

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

@@ -196,7 +196,7 @@ sap.ui.define([
 		},
 
 		_getContextByIndex: function(iRowIndex) {
-			return this._getBinding().getContexts(iRowIndex, 1)[0];
+			return this._getBinding().getContexts(iRowIndex, 1, undefined, true)[0];
 		},
 
 		_getSelectionModel: function(bForceInit) {
@@ -405,4 +405,4 @@ sap.ui.define([
 
 	return Selection;
 
-});
+});

package/src/sap/ui/support/supportRules/ui/overlay.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html style="height: 100%;">
+<html>
 
 	<head>
 		<meta charset="UTF-8">
@@ -17,8 +17,8 @@
 		</script>
 	</head>
 
-	<body class="sapUiBody" style="height: 100%; background-color: #3f5161; overflow: hidden">
-		<div id="content" style="height: 100%"></div>
+	<body class="sapUiBody">
+		<div id="content" class="sapUiSupportToolContent"></div>
 	</body>
 
 </html>

package/src/sap/ui/support/supportRules/ui/styles/overlay.css

@@ -1,10 +1,20 @@
 @import url("ControlTree.css");
 
+html {
+	height: 100%;
+}
+
 body {
-	background: #fff;
+	height: 100%;
+	background-color: #3f5161;
+	overflow: hidden;
 	content: "SupportTools loading...";
 }
 
+.sapUiSupportToolContent {
+	height: 100%;
+}
+
 .sapUiSupportToolSettingsPopoverPadding {
 	padding-left: 1rem;
 	padding-bottom: 0.5rem;
@@ -213,3 +223,12 @@ body {
 	padding-right: 0.2rem;
 }
 
+.issueSeverityHigh {
+	color: #bb0000;
+}
+.issueSeverityMedium {
+	color: #e78c07;
+}
+.issueSeverityLow {
+	color:#5e696e;
+}

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "1.1"
+specVersion: "2.0"
 type: library
 metadata:
   name: sap.ui.support
@@ -7,3 +7,6 @@ metadata:
    OpenUI5
     * (c) Copyright 2009-${currentYear} SAP SE or an SAP affiliate company.
     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+resources:
+  configuration:
+    propertiesFileSourceEncoding: ISO-8859-1

package/src/sap/ui/support/supportRules/report/resources/collapseExpand.css

@@ -1,33 +0,0 @@
- /* Expand/Collapse functionality */
-.expanded {
-	padding-left: 30px;
-}
-.expanded > tr > td:first-child {
-	padding-left: 35px;
-}
-.collapsed {
-	display: none;
-}
-.expanded-content > .expandable-title::before {
-	margin-right: 8px;
-	vertical-align: middle;
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	content: "";
-	background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23346187'><path d='M39.46875,17.53125 C40.1562534,16.7812462 40.8749963,16.7812462 41.625,17.53125 C41.9375016,17.8437516 42.09375,18.1874981 42.09375,18.5625 C42.09375,18.9375019 41.9375016,19.2812484 41.625,19.59375 L26.15625,35.0625 C25.5312469,35.6250028 24.8125041,35.90625 24,35.90625 C23.1874959,35.90625 22.5000028,35.6250028 21.9375,35.0625 L6.375,19.59375 C6.06249844,19.2812484 5.90625,18.921877 5.90625,18.515625 C5.90625,18.109373 6.06249844,17.7500016 6.375,17.4375 C6.68750156,17.1249984 7.04687297,16.96875 7.453125,16.96875 C7.85937703,16.96875 8.21874844,17.1249984 8.53125,17.4375 L23.53125,32.4375 C23.8437516,32.8125019 24.1874981,32.8125019 24.5625,32.4375 L39.46875,17.53125 Z'></path></svg>") no-repeat;
-}
-.collapsed-content > .expandable-title::before {
-	margin-right: 8px;
-	vertical-align: middle;
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	content: "";
-	background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='%23346187'><path d='M31.96875,21.84375 C32.5937531,22.4687531 32.90625,23.1874959 32.90625,24 C32.90625,24.8125041 32.5937531,25.5312469 31.96875,26.15625 L16.5,41.625 C15.7499963,42.3125034 15.0312534,42.3125034 14.34375,41.625 C13.6562466,40.9374966 13.6562466,40.2187538 14.34375,39.46875 L29.34375,24.5625 C29.7187519,24.1874981 29.7187519,23.8125019 29.34375,23.4375 L14.4375,8.53125 C14.1249984,8.21874844 13.96875,7.87500188 13.96875,7.5 C13.96875,7.12499813 14.1249984,6.78125156 14.4375,6.46875 C14.7500016,6.15624844 15.0937481,6 15.46875,6 C15.8437519,6 16.1874984,6.15624844 16.5,6.46875 L31.96875,21.84375 Z'></path></svg>") no-repeat;
-}
-.expanded-content > h1.expandable-title::before,
-.collapsed-content > h1.expandable-title::before {
-	width: 22px;
-	height: 22px;
-}

package/src/sap/ui/support/supportRules/report/resources/collapseExpand.js

@@ -1,60 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-window.sapUiSupportReport = window.sapUiSupportReport || {};
-window.sapUiSupportReport.collapseExpand = (function() {
-	'use strict';
-
-	function collapseExpandClickHandler(event) {
-		var toExpandElementId = this.getAttribute('data-expandableElement');
-		var expandableElement = document.getElementById(toExpandElementId);
-		var toExpand = expandableElement.classList.contains('collapsed');
-
-		if (toExpand) {
-			expandableElement.classList.remove('collapsed');
-			expandableElement.classList.add('expanded');
-			this.classList.remove('collapsed-content');
-			this.classList.add('expanded-content');
-		} else {
-			expandableElement.classList.remove('expanded');
-			expandableElement.classList.add('collapsed');
-			this.classList.remove('expanded-content');
-			this.classList.add('collapsed-content');
-		}
-	}
-
-	function init() {
-		try {
-			var expandableElements = document.getElementsByClassName('expandable-control');
-			if (!expandableElements) {
-				return;
-			}
-
-			for (var i = 0; i < expandableElements.length; i++) {
-				expandableElements[i].addEventListener('click', collapseExpandClickHandler);
-
-				// Set the default collapsed/expanded state of the expandable content.
-				var elementToExpandId = expandableElements[i].getAttribute('data-expandableElement');
-				var elementToExpand = document.getElementById(elementToExpandId);
-				if (expandableElements[i].classList.contains('collapsed-content')) {
-					elementToExpand.classList.add('collapsed');
-				} else {
-					elementToExpand.classList.add('expanded');
-				}
-
-				expandableElements[i].style = 'cursor: pointer;';
-			}
-		} catch (ex) {
-			/* eslint-disable no-console */
-			console.log('There was a problem initializing collapse/expand functionality.');
-			/* eslint-enable no-console */
-		}
-	}
-
-	return {
-		init: init
-	};
-}());

package/src/sap/ui/support/supportRules/report/resources/filter.css

@@ -1,19 +0,0 @@
- /* Filters functionality */
-.filters {
-	margin: 10px;
-	font-size: 1em;
-}
-.filter {
-	padding: 5px;
-	display: inline-block;
-	cursor: pointer;
-	border-radius: 5px;
-}
-.filter-active {
-	background-color: #ddd;
-	box-shadow: 1px 1px 5px #888888;
-}
-.filtered {
-	display: none;
-}
-