@sapui5/sap.fe.navigation 1.96.4 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.navigation",
-	"version": "1.96.4",
+	"version": "1.99.0",
 	"description": "SAPUI5 Library sap.fe.navigation",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -8,6 +8,7 @@
 	"scripts": {
 		"build": "echo 'nothing to do'",
 		"prepare-npm-sources": "babel target/npm-sources/src --out-dir target/npm-sources/src --extensions \".ts\" --config-file ../../.babelrc",
+		"prepare-ui5-build-sources": "mkdirp target/ui5-build-tmp/src && babel src --out-dir target/ui5-build-tmp/src --extensions \".ts\" --config-file ../../.babelrc",
 		"test": "echo 'nothing to do'"
 	},
 	"keywords": [
@@ -16,6 +17,7 @@
 	],
 	"devDependencies": {
 		"@babel/cli": "^7.14.8",
-		"@ui5/cli": "^2.10.0"
+		"@ui5/cli": "^2.14.0",
+		"mkdirp": "^1.0.4"
 	}
 }

package/src/sap/fe/navigation/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.96.4</version>
+    <version>1.99.0</version>
 
     <documentation>UI5 library: sap.fe.navigation</documentation>
 

package/src/sap/fe/navigation/NavError.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 
 sap.ui.define(["sap/ui/base/Object"], function(BaseObject) {

package/src/sap/fe/navigation/NavigationHandler.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -346,7 +347,11 @@ sap.ui.define(
 					throw new NavError("NavigationHandler.INVALID_INPUT");
 				}
 
-				oTmpData.selectionVariant = new SelectionVariant(sSelectionVariant).toJSONObject();
+				oTmpData.selectionVariant = new SelectionVariant(sSelectionVariant);
+				if (typeof vNavigationParameters === "string") {
+					oTmpData.selectionVariant = this._removeTechnicalParameters(oTmpData.selectionVariant);
+				}
+				oTmpData.selectionVariant = oTmpData.selectionVariant && oTmpData.selectionVariant.toJSONObject();
 				oTmpData = this._removeMeasureBasedInformation(oTmpData); // remove eventual measures
 				oTmpData = this._checkIsPotentiallySensitive(oTmpData); // remove eventual sensitive data
 
@@ -518,7 +523,32 @@ sap.ui.define(
 
 				var oMyDeferred = jQuery.Deferred();
 				var oNavHandler = this;
-
+				var parseUrlParams = function(oStartupParameters, aDefaultedParameters, oMyDeferred, sNavType) {
+					// standard URL navigation
+					var oSelVars = oNavHandler._splitInboundNavigationParameters(
+						new SelectionVariant(),
+						oStartupParameters,
+						aDefaultedParameters
+					);
+					if (oSelVars.oNavigationSelVar.isEmpty() && oSelVars.oDefaultedSelVar.isEmpty()) {
+						// Startup parameters contain only technical parameters (SAP system) which were filtered out.
+						// oNavigationSelVar and oDefaultedSelVar are empty.
+						// Thus, consider this type of navigation as an initial navigation.
+						if (sNavType === NavType.xAppState) {
+							var oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
+							oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
+						} else {
+							oMyDeferred.resolve({}, oStartupParameters, NavType.initial);
+						}
+					} else {
+						var oAppStateData = {};
+						oAppStateData.selectionVariant = oSelVars.oNavigationSelVar.toJSONString();
+						oAppStateData.oSelectionVariant = oSelVars.oNavigationSelVar;
+						oAppStateData.oDefaultedSelectionVariant = oSelVars.oDefaultedSelVar;
+						oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
+						oMyDeferred.resolve(oAppStateData, oStartupParameters, sNavType);
+					}
+				};
 				if (sIAppState) {
 					// inner app state is available in the AppHash (back navigation); extract the parameter value
 					this._loadAppState(sIAppState, oMyDeferred);
@@ -557,9 +587,13 @@ sap.ui.define(
 								oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
 								oMyDeferred.resolve(oAppStateData, oStartupParameters, NavType.xAppState);
 							} else {
-								// sap-xapp-state navigation, but ID has already expired, but URL parameters available
-								oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
-								oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
+								if (oStartupParameters) {
+									parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.xAppState);
+								} else {
+									// sap-xapp-state navigation, but ID has already expired, but URL parameters available
+									oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
+									oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
+								}
 							}
 						});
 						oStartupPromise.fail(function() {
@@ -569,25 +603,7 @@ sap.ui.define(
 					} else {
 						// no sap-xapp-state
 						if (oStartupParameters) {
-							// standard URL navigation
-							var oSelVars = oNavHandler._splitInboundNavigationParameters(
-								new SelectionVariant(),
-								oStartupParameters,
-								aDefaultedParameters
-							);
-							if (oSelVars.oNavigationSelVar.isEmpty() && oSelVars.oDefaultedSelVar.isEmpty()) {
-								// Startup parameters contain only technical parameters (SAP system) which were filtered out.
-								// oNavigationSelVar and oDefaultedSelVar are empty.
-								// Thus, consider this type of navigation as an initial navigation.
-								oMyDeferred.resolve({}, oStartupParameters, NavType.initial);
-							} else {
-								var oAppStateData = {};
-								oAppStateData.selectionVariant = oSelVars.oNavigationSelVar.toJSONString();
-								oAppStateData.oSelectionVariant = oSelVars.oNavigationSelVar;
-								oAppStateData.oDefaultedSelectionVariant = oSelVars.oDefaultedSelVar;
-								oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
-								oMyDeferred.resolve(oAppStateData, oStartupParameters, NavType.URLParams);
-							}
+							parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.URLParams);
 						} else {
 							// initial navigation
 							oMyDeferred.resolve({}, {}, NavType.initial);
@@ -648,16 +664,42 @@ sap.ui.define(
 			 */
 			_isTechnicalParameter: function(sParameterName) {
 				if (sParameterName) {
-					if (sParameterName.toLowerCase().indexOf("sap-") === 0) {
-						return true;
-					} else if (this._aTechnicalParamaters.indexOf(sParameterName) >= 0) {
-						return true;
+					if (
+						!(
+							sParameterName === "sap-ui-fe-variant-id" ||
+							sParameterName === "sap-ui-fe-table-variant-id" ||
+							sParameterName === "sap-ui-fe-chart-variant-id" ||
+							sParameterName === "sap-ui-fe-filterbar-variant-id"
+						)
+					) {
+						if (sParameterName.toLowerCase().indexOf("sap-") === 0) {
+							return true;
+						} else if (this._aTechnicalParamaters.indexOf(sParameterName) >= 0) {
+							return true;
+						}
 					}
 				}
-
 				return false;
 			},
 
+			/**
+			 * Rmoves if the passed parameter is considered as technical parameter.
+			 * @param {object} oSelectionVariant Selection Variant which consists of technical Parameters.
+			 * @returns {object} Selection Variant without technical Parameters.
+			 * @private
+			 */
+			_removeTechnicalParameters: function(oSelectionVariant) {
+				var sPropName, i;
+				var aSelVarPropNames = oSelectionVariant.getSelectOptionsPropertyNames();
+				for (i = 0; i < aSelVarPropNames.length; i++) {
+					sPropName = aSelVarPropNames[i];
+					if (this._isTechnicalParameter(sPropName)) {
+						oSelectionVariant.removeSelectOption(sPropName);
+					}
+				}
+				return oSelectionVariant;
+			},
+
 			/**
 			 * Splits the parameters provided during inbound navigation and separates the contextual information between defaulted parameter values and
 			 * navigation parameters.
@@ -2171,7 +2213,6 @@ sap.ui.define(
 						fnIsSensitiveData = function(sProp, esName, mData) {
 							var aPropertyAnnotations;
 							esName = esName || sEntitySet;
-							mData = mData;
 							aPropertyAnnotations = oMetaModel.getObject("/" + esName + "/" + sProp + "@");
 							if (aPropertyAnnotations) {
 								if (

package/src/sap/fe/navigation/PresentationVariant.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./NavError", "sap/ui/base/Object", "sap/base/util/extend", "sap/base/util/each", "sap/base/Log"], function(
 	NavError,

package/src/sap/fe/navigation/SelectionVariant.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	["./NavError", "sap/ui/base/Object", "sap/base/util/each", "sap/base/Log"],

package/src/sap/fe/navigation/library.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 
 /**
@@ -26,7 +27,7 @@ sap.ui.define(
 		// library dependencies
 		sap.ui.getCore().initLibrary({
 			name: "sap.fe.navigation",
-			version: "1.96.4",
+			version: "1.99.0",
 			dependencies: ["sap.ui.core"],
 			types: ["sap.fe.navigation.NavType", "sap.fe.navigation.ParamHandlingMode", "sap.fe.navigation.SuppressionBehavior"],
 			interfaces: [],

package/ui5.yaml

@@ -3,9 +3,6 @@ type: library
 metadata:
     sapInternal: true
     name: sap.fe.navigation
-    copyright: |-
-        SAPUI5
-         * (c) Copyright 2009-${currentYear} SAP SE. All rights reserved.
 framework:
     name: SAPUI5
     libraries: