@openui5/sap.ui.documentation 1.96.11 → 1.96.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.96.11",
+  "version": "1.96.12",
   "description": "OpenUI5 UI Library sap.ui.documentation",
   "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.96.11",
-    "@openui5/sap.ui.core": "1.96.11",
-    "@openui5/sap.ui.layout": "1.96.11",
-    "@openui5/themelib_sap_belize": "1.96.11",
-    "@openui5/themelib_sap_fiori_3": "1.96.11"
+    "@openui5/sap.m": "1.96.12",
+    "@openui5/sap.ui.core": "1.96.12",
+    "@openui5/sap.ui.layout": "1.96.12",
+    "@openui5/themelib_sap_belize": "1.96.12",
+    "@openui5/themelib_sap_fiori_3": "1.96.12"
   }
 }

package/src/sap/ui/documentation/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.11</version>
+  <version>1.96.12</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.96.11',
+		version: '1.96.12',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],
@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.12
 	 * @since 1.48
 	 * @public
 	 */

package/src/sap/ui/documentation/messagebundle.properties

@@ -373,8 +373,6 @@ APP_SETTINGS_DIALOG_CANCEL_BTN = Cancel
 
 #XHED: The title of the dialog for configuring the cookie settings
 COOKIE_SETTINGS_DIALOG_TITLE = Your Cookie Settings
-#XTXT: Summary note that explains why we use cookies
-COOKIE_SETTINGS_DIALOG_SUMMARY = We use cookies and SAP Web Analytics to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
 #XTXT: Title of the section about the required cookies used in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TITLE = Required Cookies
 #XTXT: Summary note that explains what are the required cookies in the application

package/src/sap/ui/documentation/sdk/Component.js

@@ -180,7 +180,6 @@ sap.ui.define([
 					bOpenUI5,
 					sVersionSuffix,
 					bIsInternal,
-					bSupportsSWA,
 					sVersionPrefixPath = ResourcesUtil.getResourcesVersion();
 
 				this.aAllowedMembers = ["public", "protected"];
@@ -193,9 +192,6 @@ sap.ui.define([
 				sVersionSuffix = oVersion.getSuffix();
 				bSnapshot = /-SNAPSHOT$/i.test(sVersionSuffix);
 				bOpenUI5 = oVersionInfo.gav && /openui5/i.test(oVersionInfo.gav);
-				bSupportsSWA = oVersionInfo.libraries.some(function (lib) {
-					return lib.name === "sap.webanalytics.core";
-				});
 
 				// We show restricted members for internal versions
 				if (/internal/i.test(oVersionInfo.name)) {
@@ -204,6 +200,7 @@ sap.ui.define([
 				}
 
 				this.getModel("versionData").setData({
+					enableAdvancedCookieSettings: false, // this flag is left for eventual future advanced cookie settings
 					versionGav: oVersionInfo.gav,
 					versionName: oVersionInfo.name,
 					version: [oVersion.getMajor(), oVersion.getMinor(), oVersion.getPatch()].join("."),
@@ -214,7 +211,6 @@ sap.ui.define([
 					isDevVersion: bSnapshot,
 					isBetaVersion: !bOpenUI5 && !bSnapshot && /-beta$/i.test(sVersionSuffix),
 					isInternal: !!bIsInternal,
-					supportsSWA: bSupportsSWA,
 					libraries: oVersionInfo.libraries,
 					allowedMembers: this.aAllowedMembers
 				});

package/src/sap/ui/documentation/sdk/controller/util/ConfigUtil.js

@@ -17,7 +17,6 @@ sap.ui.define([
 		"COOKIE_NAMES": {
 			"APPROVAL_REQUESTED": "dk_approval_requested",
 			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies",
-			"ALLOW_USAGE_TRACKING": "dk_allow_usage_tracking",
 			"DEMOKIT_IMPORTANT_MESSAGES_READ": "IMR"
 		},
 

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/Component.js

@@ -17,18 +17,9 @@ sap.ui.define([
 
 		"COOKIE_NAMES": {
 			"APPROVAL_REQUESTED": "dk_approval_requested",
-			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies",
-			"ALLOW_USAGE_TRACKING": "dk_allow_usage_tracking"
+			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies"
 		},
 
-		SWA_CONFIG: {
-			pubToken: 'd5a5359b-0b55-415c-acc8-314511b613ca',
-			baseUrl: 'https://webanalytics2.cfapps.eu10.hana.ondemand.com/tracker/',
-			owner: null
-		},
-
-		SWA_TRACKER_URL: "sap/webanalytics/core/tracker/js/track.js",
-
 		metadata : {
 			manifest: "json"
 		},
@@ -44,24 +35,14 @@ sap.ui.define([
 
 			if (this.sCookieSettingsParameterValue === "true" || this.sCookieSettingsParameterValue === "" || !bCookieSettingsParameter) {
 
-				VersionInfo.load().then(function (oVersionInfo) {
-					var bSupportsSWA = oVersionInfo.libraries.some(function (lib) {
-						return lib.name === "sap.webanalytics.core";
-					}),
-					bApprovalRequested = this.getCookieValue(this.COOKIE_NAMES.APPROVAL_REQUESTED) === "1",
-					bHasConsentUseSWA = this.getCookieValue(this.COOKIE_NAMES.ALLOW_USAGE_TRACKING) === "1";
-
-					if (!bApprovalRequested) {
-						this.cookieSettingsDialogOpen({
-							showCookieDetails: false,
-							supportsUsageTracking: bSupportsSWA
-						}, oRootView);
-					}
-
-					if (bSupportsSWA && bHasConsentUseSWA) {
-						this.enableUsageTracking();
-					}
-				}.bind(this));
+				var bApprovalRequested = this.getCookieValue(this.COOKIE_NAMES.APPROVAL_REQUESTED) === "1";
+
+				if (!bApprovalRequested) {
+					this.cookieSettingsDialogOpen({
+						showCookieDetails: false,
+						enableAdvancedSettings: false // this flag is left for eventual future advanced cookie settings
+					}, oRootView);
+				}
 			}
 		},
 
@@ -92,44 +73,6 @@ sap.ui.define([
 			return "";
 		},
 
-		enableUsageTracking: function() {
-			this._loadSWA().then(function(swa) {
-				if (swa && typeof swa.enable === "function") {
-					swa.enable();
-				}
-			});
-		},
-
-		disableUsageTracking: function() {
-			var swa = window['swa'];
-			if (swa && typeof swa.disable === "function") {
-				swa.disable();
-			}
-		},
-
-		_loadSWA: function() {
-			if (!this._oPromiseLoadSWA) {
-				this._oPromiseLoadSWA = new Promise(function(resolve, reject) {
-					var oSWAConfig = merge({}, this.SWA_CONFIG),
-						oDoc = document,
-						oNewScriptEl = oDoc.createElement('script'),
-						oFirstScriptEl = oDoc.getElementsByTagName('script')[0];
-
-					oNewScriptEl.type = 'text/javascript';
-					oNewScriptEl.defer = true;
-					oNewScriptEl.async = true;
-					oNewScriptEl.src = sap.ui.require.toUrl(this.SWA_TRACKER_URL);
-					window.addEventListener("swaLoadSuccess", function(){
-						resolve(window["swa"]);
-					});
-
-					oFirstScriptEl.parentNode.insertBefore(oNewScriptEl, oFirstScriptEl);
-					window["swa"] = oSWAConfig;
-				}.bind(this));
-			}
-			return this._oPromiseLoadSWA;
-		},
-
 		/**
 		 * Opens the cookie settings dialog
 		 * @public

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/controller/CookieSettingsDialog.controller.js

@@ -80,24 +80,20 @@ sap.ui.define([
 
 			onAcceptAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, true);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, this._oModel.getProperty("/supportsUsageTracking"));
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onRejectAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, false);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, false);
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onSaveCookies: function() {
-				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState(),
-					bHasConsentFunctionalCookies = Core.byId("functionalCookiesSwitch").getState();
+				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState();
 
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, bHasConsentRequiredCookies);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, bHasConsentFunctionalCookies);
 
 				this._oCookieSettingsDialog.close();
 			},
@@ -131,21 +127,10 @@ sap.ui.define([
 			onCancelEditCookies: function() {
 				this._oCookieSettingsDialog.close();
 				Core.byId("requiredCookiesSwitch").setState(this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES) === "1");
-				Core.byId("functionalCookiesSwitch").setState(this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING) === "1");
 			},
 
 			_saveCookiePreference: function(sCookieName, bEnable) {
-				var sValue = bEnable ? "1" : "0",
-					sOldValue;
-
-				if (sCookieName === this._oCookieNames.ALLOW_USAGE_TRACKING) {
-					sOldValue = this._oCookiesUtil.getCookieValue(sCookieName);
-
-					if (sOldValue !== sValue) {
-						bEnable && this._oCookiesUtil.enableUsageTracking();
-						!bEnable && this._oCookiesUtil.disableUsageTracking();
-					}
-				}
+				var sValue = bEnable ? "1" : "0";
 
 				this._oCookiesUtil.setCookie(sCookieName, sValue);
 				this._oModel.setProperty("/" + sCookieName, sValue);
@@ -167,10 +152,8 @@ sap.ui.define([
 					// when the user opens the edit dialog for a first time, show the cookies enabled
 					// the user will then edit and save his choice
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = "1";
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = "1";
 				} else {
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES);
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING);
 				}
 
 				this._oModel.setData(oData, true /* merge */);

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/i18n/i18n.properties

@@ -3,20 +3,12 @@
 
 #XHED: The title of the dialog for configuring the cookie settings
 COOKIE_SETTINGS_DIALOG_TITLE = Your Cookie Settings
-#XTXT: Summary note that explains why we use cookies
-COOKIE_SETTINGS_DIALOG_SUMMARY = We use cookies and SAP Web Analytics to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
 #XTXT: Title of the section about the required cookies used in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TITLE = Required Cookies
 #XTXT: Summary note that explains what are the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_SUMMARY = These cookies are required to enable core site functionality.
 #XTXT: Detailed note that explains why we use the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT = We use cookies to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
-#XTXT: Title of the section about the extra functional cookies used in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE = Functional Cookies
-#XTXT: Summary note that explains what are the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY = These cookies are used to analyse site usage for the purpose of measuring and improving site performance.
-#XTXT: Detailed note that explains why we use the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT = This site uses SAP Web Analytics to analyze how users use this site. The information generated (including a part of your IP address and a browser ID) will be transmitted to and stored by SAP on its servers. Cookies are used to identify your repeat visit and your visit origin page. We will use this information only for the purpose of evaluating website usage and compiling reports on website activity for website operators - and finally, to improve the site. If you would like to opt-in for SAP Web Analytics tracking, please specify your preference using the "On"/"Off" switch above. By opt-in, you consent to the processing of analytics data about you in the manner and for the purposes set out above.
 #XTXT: Title of the panel that contains more detailed information
 COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO = More Info
 #XTXT: Title of the button to accept all cookies

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/view/CookieSettingsDialog.fragment.xml

@@ -7,10 +7,8 @@
 	<Dialog title="{i18n>COOKIE_SETTINGS_DIALOG_TITLE}" contentWidth="45rem">
 		<content>
 			<html:div class="sapUiSmallMargin">
-				<Text text="{i18n>COOKIE_SETTINGS_DIALOG_SUMMARY}"
-					  visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/supportsUsageTracking} }"/>
 				<Text text="{i18n>COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT}"
-					  visible="{= !${cookieData>/showCookieDetails} &amp;&amp; !${cookieData>/supportsUsageTracking} }"/>
+					  visible="{= !${cookieData>/showCookieDetails} }"/>
 				<f:GridList visible="{cookieData>/showCookieDetails}">
 					<f:customLayout>
 						<grid:GridBasicLayout gridTemplateColumns="1fr" gridGap="1rem"/>
@@ -28,20 +26,6 @@
 							<Text text="{i18n>COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT}"/>
 						</Panel>
 					</f:GridListItem>
-
-					<f:GridListItem>
-						<HBox justifyContent="SpaceBetween" class="sapUiSmallMarginBeginEnd sapUiSmallMarginTop">
-							<VBox>
-								<Title text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE}"/>
-								<Text text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY}"/>
-							</VBox>
-							<Switch id="functionalCookiesSwitch" class="sapUiSmallMarginBegin"
-								state="{path: 'cookieData>/dk_allow_usage_tracking', type: 'sap.ui.model.type.Boolean', formatter: '.formatCookieValue'}"/>
-						</HBox>
-						<Panel headerText="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO}" expandable="true" class="sapUiTinyMarginTop">
-							<Text text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT}"/>
-						</Panel>
-					</f:GridListItem>
 				</f:GridList>
 			</html:div>
 		</content>
@@ -51,7 +35,7 @@
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>
 			</layoutData>
 		</Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press="showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/supportsUsageTracking} }"></Button>
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press="showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/enableAdvancedSettings} }"></Button>
 		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_REJECT_ALL}" press="onRejectAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
 			<layoutData>
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>

package/src/sap/ui/documentation/sdk/view/App.view.xml

@@ -130,7 +130,7 @@
 										<MenuItem icon="sap-icon://tree" text="{i18n>APP_INFORMATION_BTN_SITEMAP}" key="sitemap" visible="{versionData>/isOpenUI5}"/>
 										<MenuItem icon="sap-icon://hello-world" text="{i18n>APP_SETTINGS_DIALOG_LANGUAGE}" key="settings"/>
 										<MenuItem icon="sap-icon://customize" text="{i18n>APP_SETTINGS_DIALOG_COOKIE_PREFERENCES}" key="cookie_preferences"
-												visible="{= ${versionData>/supportsSWA}}"/>
+												visible="{= ${versionData>/enableAdvancedCookieSettings}}"/>
 									</items>
 								</Menu>
 							</menu>