@sapui5/sap.ui.vk 1.135.0 → 1.136.1

package/src/sap/ui/vk/tools/SceneOrientationToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/Tool.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [oScope] scope An object for resolving string-based type and formatter references in bindings.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.tools.Tool
 	 */

package/src/sap/ui/vk/tools/TooltipTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TooltipTool
 	 */

package/src/sap/ui/vk/tools/TooltipToolGizmo.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/TransformSvgElementTool.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TransformSvgElementTool
 	 */

package/src/sap/ui/vk/tools/TransformSvgElementToolGizmo.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/totara/TotaraLoader.js

@@ -434,12 +434,12 @@ sap.ui.define([
 	};
 
 	TotaraLoader.prototype.processSetSceneCommand = function(jsonContent) {
-		var context = this.getContext(jsonContent.veid);
+		const context = this.getContext(jsonContent.id);
 
 		if (context) {
 			context.defaultViewId = jsonContent.defaultViewId;
 			context.defaultViewGroupId = jsonContent.defaultViewGroupId;
-			context.sceneThumbnailId = jsonContent.imageId;
+			context.sceneThumbnailId = jsonContent.thumbnailId;
 			context.dimension = jsonContent.dimension;
 			context.defaultRootEntityId = jsonContent.defaultRootEntityId;
 

package/src/sap/ui/vk/totara/TotaraLoaderWorker.js

@@ -485,27 +485,24 @@
 		return result;
 	}
 
-	function sendGetScene(data) {
-		// NB: parameter `sid=1` is a temporary hack not to retrieve the whole scene tree which can be huge; in future
-		// we will add an explicit parameter for that purpose.
-		var request = "scenes/" + data.sceneId + "?sid=1";
-		sendRequest(request, data, "text")
-			.then(function(response) {
-				var json;
-				try {
-					json = JSON.parse(response);
-				} catch (err) {
-					reportError({
-						errorText: "Failed to parse JSON"
-					});
-					return;
-				}
-
-				processCommands([{
-					name: "setScene",
-					jsonContent: json.scene
-				}]);
-			});
+	async function sendGetScene(data) {
+		const [json, sceneResponse] = await Promise.all([
+			sendRequest(`scenes/${data.sceneId}/info?includeInMetering=true`, data, "json"),
+
+			// NOTE: The scene metadata is returned by the `scenes/{sceneId}` endpoint.
+			//
+			// That endpoint also returns the full scene tree by default. We use sid 9223372036854775807 (Java
+			// Long.MAX_VALUE) to limit the scene tree to one node only. As there is no node with this sid in the
+			// database, no scene tree is actually returned.
+			sendRequest(`scenes/${data.sceneId}?sid=9223372036854775807`, data, "json")
+		]);
+
+		json.metadata = sceneResponse.scene.metadata;
+
+		processCommands([{
+			name: "setScene",
+			jsonContent: json
+		}]);
 	}
 
 	function sendGetView(data) {

package/src/sap/ui/vk/totara/TotaraUtils.js

@@ -324,6 +324,11 @@ sap.ui.define([
 			contentTypes.push("parametric");
 		}
 
+		if (context.includeMetadata) {
+			$expand.push("metadata");
+			contentTypes.push("metadata");
+		}
+
 		if (context.includeUsageId) {
 			$expand = $expand.concat(IncludeUsageIdType.to$expandQueryParameter(context.includeUsageId));
 		}