@sapui5/sap.suite.ui.generic.template 1.114.0 → 1.114.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.114.0",
+  "version": "1.114.2",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.114.0</version>
+	<version>1.114.2</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/Component.js

@@ -337,13 +337,17 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				}
 
 				oAlpSettings.bInsightsEnabled = false;
-				CardHelper.getServiceAsync("UIService").then(function(oInstance){
-					oAlpSettings.bInsightsEnabled = true;
-					var oTemplatePrivate = oComponent.getModel("_templPriv");
-					oTemplatePrivate.setProperty("/oInsightsInstance", oInstance);
-				}).catch(function(response) {
-					oAlpSettings.bInsightsEnabled = false;
-				});
+				// If app is running in Microsoft Teams environment then Insight should not execute
+				var oTemplatePrivateGlobal = oComponent.getModel("_templPrivGlobal");
+				if (!oTemplatePrivateGlobal.getProperty("/generic/isTeamsModeActive")) {
+					CardHelper.getServiceAsync("UIService").then(function(oInstance){
+						oAlpSettings.bInsightsEnabled = true;
+						var oTemplatePrivate = oComponent.getModel("_templPriv");
+						oTemplatePrivate.setProperty("/oInsightsInstance", oInstance);
+					}).catch(function(response) {
+						oAlpSettings.bInsightsEnabled = false;
+					});
+				}
 
 				return oAlpSettings;
 			},

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -32,12 +32,14 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 	"sap/ui/model/json/JSONModel",
 	"sap/suite/ui/generic/template/listTemplates/controller/DetailController",
 	"sap/ui/comp/personalization/Util",
-	"sap/suite/ui/generic/template/lib/AddCardsHelper"
+	"sap/suite/ui/generic/template/lib/AddCardsHelper",
+	"sap/m/MessageBox",
+	"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper"
 ], function(SelectionVariant, ExtensionAPI,
 			FilterBarController, ToolbarController, VisualFilterBarController, VisualFilterDialogController, AnalyticGridController, AnalyticalTable,
 			ODataAnnotationHelper, Analytics, ContentAreaController, IappStateHandler, Device, SegmentedButtonItem, SegmentedButton,
 			OverflowToolbar, ToolbarSpacer, SapMLibrary, Context, ALPHelper, controlHelper, FeLogger, FilterUtil, ObjectPath, ShareUtils, merge, deepExtend,
-			ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, DetailController, PersonalizationControllerUtil, AddCardsHelper) {
+			ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, DetailController, PersonalizationControllerUtil, AddCardsHelper, MessageBox, semanticDateRangeTypeHelper) {
 
 		"use strict";
 
@@ -334,20 +336,6 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 					// });
 				}
 
-				function fnOpenCardMessagesDialog(oModel){
-					var oCardMessagesPromise =  oTemplateUtils.oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.listTemplates.fragments.CardMessages", {
-						onClose: function(oEvent) {
-							var oDialog = oEvent.getSource().getParent();
-							oDialog.close();
-						}
-					}, "cardMessages");
-
-					oCardMessagesPromise.then(function (oDialog) {
-						oDialog.setModel(oModel, "list");
-						oDialog.open();
-					});
-				}
-
 				// Generation of Event Handlers
 				return {
 					onInit: function() {
@@ -905,13 +893,6 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 						onBeforeRebindChart: function(oEvent) {
 							var oSmartChart = oEvent.getSource();
 							setNoDataChartTextIfRequired(oSmartChart);
-							var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-							var oChartSelectionVariant = oSmartChart.getUiState().getSelectionVariant();
-							if (oChartSelectionVariant && oChartSelectionVariant.SelectOptions && oChartSelectionVariant.SelectOptions.length) {
-								oTemplatePrivateModel.setProperty("/alp/chartFiltersActive", true);
-							} else {
-								oTemplatePrivateModel.setProperty("/alp/chartFiltersActive", false);
-							}
 							//oState.oSmartChart.oModels = oState.oSmartChart.getChart().oPropagatedProperties.oModels;
 							var oBindingParams = oEvent.getParameters().bindingParams;
 							oState.oMultipleViewsHandler.aTableFilters =  deepExtend({}, oBindingParams.filters);
@@ -1224,18 +1205,10 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							var oView = oState.oController.getView();
 							var oEntitySet = oModel.getMetaModel().getODataEntitySet(sEntitySet);
 							var oEntityType = oModel.getMetaModel().getODataEntityType(oEntitySet.entityType);
-							var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-							var chartFiltersActive = oTemplatePrivateModel.getProperty("/alp/chartFiltersActive");
 							var oRb = oComponent.getModel("i18n").getResourceBundle();
 							var oCardDefinition = {};
-							if (oState.oSmartFilterbar.getUiState().getSemanticDates() || chartFiltersActive) {
-								var oModel = new JSONModel({
-									items: [
-										{text: oRb.getText("ST_CARDS_INFO_TEXT_2")},
-										{text: oRb.getText("ST_CARDS_INFO_TEXT_6")}
-									]
-								});
-								fnOpenCardMessagesDialog(oModel);
+							if (semanticDateRangeTypeHelper.hasSemanticDateValue(oState)) {
+								MessageBox.error(oRb.getText("ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS"));
 							} else {
 								oCardDefinition['currentControlHandler'] = oPresentationControlHandler;
 								oCardDefinition['component'] = oComponent;
@@ -1243,6 +1216,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 								oCardDefinition['entitySet'] = oEntitySet;
 								oCardDefinition['entityType'] = oEntityType;
 								oCardDefinition['oSmartFilterbar'] = oState.oSmartFilterbar;
+								oCardDefinition['oTemplateUtils'] = oTemplateUtils;
 								var oAnalyticalCardManifest = AddCardsHelper.createCardForPreview(oCardDefinition);
 								var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 								var oInsightsInstance = oTemplatePrivateModel.getProperty("/oInsightsInstance");

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.114.0"
+			"version": "1.114.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.114.0"
+			"version": "1.114.2"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/Component.js

@@ -443,13 +443,19 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				oLrSettings.isIndicatorRequired = true;
 				oLrSettings.isSemanticallyConnected = false;
 				oLrSettings.bInsightsEnabled = false;
-				CardHelper.getServiceAsync("UIService").then(function(oInstance){
-					oLrSettings.bInsightsEnabled = true;
-					var oTemplatePrivate = oComponent.getModel("_templPriv");
-					oTemplatePrivate.setProperty("/listReport/oInsightsInstance", oInstance);
-				}).catch(function(response) {
-					oLrSettings.bInsightsEnabled = false;
-				});
+				// If app is running in Microsoft Teams environment then Insight should not execute
+				if (oComponent && oComponent.oModels) {
+					var oTemplatePrivateGlobal = oComponent.getModel("_templPrivGlobal");
+					if (!oTemplatePrivateGlobal.getProperty("/generic/isTeamsModeActive")) {
+						CardHelper.getServiceAsync("UIService").then(function(oInstance){
+							oLrSettings.bInsightsEnabled = true;
+							var oTemplatePrivate = oComponent.getModel("_templPriv");
+							oTemplatePrivate.setProperty("/listReport/oInsightsInstance", oInstance);
+						}).catch(function(response) {
+							oLrSettings.bInsightsEnabled = false;
+						});
+					}
+				}
 
 				return oLrSettings;
 			},

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -18,9 +18,11 @@ sap.ui.define([
 	"sap/ui/generic/app/navigation/service/SelectionVariant",
 	"sap/suite/ui/generic/template/lib/AddCardsHelper",
 	"sap/suite/ui/generic/template/listTemplates/filterSettingsPreparationHelper",
-	"sap/ui/model/json/JSONModel"
+	"sap/ui/model/json/JSONModel",
+	"sap/m/MessageBox",
+	"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper"
 ], function (Filter, ExtensionAPI, listUtils, MessageStripHelper, IappStateHandler, MultipleViewsHandler,
-	WorklistHandler, ShareUtils, controlHelper, FeLogger, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, MultiEditHandler, SelectionVariant, AddCardsHelper, filterSettingsPreparationHelper, JSONModel) {
+	WorklistHandler, ShareUtils, controlHelper, FeLogger, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, MultiEditHandler, SelectionVariant, AddCardsHelper, filterSettingsPreparationHelper, JSONModel, MessageBox, semanticDateRangeTypeHelper) {
 	"use strict";
 
 	var oLogger = new FeLogger("ListReport.controller.ControllerImplementation").getLogger();
@@ -446,9 +448,6 @@ sap.ui.define([
 				return oState.oPresentationControlHandler.getVisibleProperties().some(function (oColumn) {
 					var sColumnKey = oColumn.data("p13nData") && oColumn.data("p13nData").columnKey;
 					var oProperty = oMetaModel.getODataProperty(oEntityType, oColumn.data("p13nData").leadingProperty);
-					if (oProperty && (oProperty.type === 'Edm.Date' || oProperty.type === 'Edm.DateTime' || oProperty.type === 'Edm.DateTimeOffset')) {
-						return;
-					}
 					if (oProperty &&  oProperty["sap:label"]) {
 						if (oColumn.getVisible() && ((sColumnKey.indexOf("DataFieldForAnnotation") < 0) && !oColumn.data("p13nData").actionButton && !!oColumn.data("p13nData").leadingProperty)) {
 							return true;
@@ -457,20 +456,6 @@ sap.ui.define([
 				});
 			}
 
-			function fnOpenCardMessagesDialog(oModel){
-				var oCardMessagesPromise =  oTemplateUtils.oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.ListReport.view.fragments.CardMessages", {
-					onClose: function(oEvent) {
-						var oDialog = oEvent.getSource().getParent();
-						oDialog.close();
-					}
-				}, "cardMessages");
-
-				oCardMessagesPromise.then(function (oDialog) {
-					oDialog.setModel(oModel, "list");
-					oDialog.open();
-				});
-			}
-
 			// Generation of Event Handlers
 			return {
 				onInit: function () {
@@ -644,13 +629,6 @@ sap.ui.define([
 						//which can be set directly on the table under 'settings'
 						// we have to remember these filters in order to exclude them later for counts
 						var oBindingParams = oEvent.getParameters().bindingParams;
-						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-						var oTableSelectionVariant = oSmartTable.getUiState().getSelectionVariant();
-						if (oTableSelectionVariant && oTableSelectionVariant.SelectOptions && oTableSelectionVariant.SelectOptions.length) {
-							oTemplatePrivateModel.setProperty("/listReport/tableFiltersActive", true);
-						} else {
-							oTemplatePrivateModel.setProperty("/listReport/tableFiltersActive", false);
-						}
 						oState.oMultipleViewsHandler.aTableFilters = deepExtend({}, oBindingParams.filters);
 						// initial filters from smarttable, a copy
 						var aFiltersFromSmartTable = oBindingParams.filters.slice(0);
@@ -690,7 +668,7 @@ sap.ui.define([
 					onListNavigate: function (oEvent) {
 						// Create a copy of oEvent that can be used asynchronously
 						var oListNavigateEvent = deepExtend({}, oEvent);
-						oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync().then(function() {
+						(oTemplateUtils.oComponentUtils.isDraftEnabled() ? oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync() : Promise.resolve()).then(function() {
 							oTemplateUtils.oCommonEventHandlers.onListNavigate(oListNavigateEvent, oState);
 						});
 					},
@@ -749,16 +727,9 @@ sap.ui.define([
 							var oRb = oComponent.getModel("i18n").getResourceBundle();
 							var bIsSimpleColumnsApplied = checkSimpleTableColumns(oEntityType);
 							var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-							var tableFiltersActive = oTemplatePrivateModel.getProperty("/listReport/tableFiltersActive");
-							if (oState.oSmartFilterbar.getUiState().getSemanticDates() || tableFiltersActive || !bIsSimpleColumnsApplied) {
-								var oModel = new JSONModel({
-									items: [
-										{text: oRb.getText("ST_CARDS_INFO_TEXT_2")},
-										{text: oRb.getText("ST_CARDS_INFO_TEXT_3")},
-										{text: oRb.getText("ST_CARDS_INFO_TEXT_4")}
-									]
-								});
-								fnOpenCardMessagesDialog(oModel);
+							if ( semanticDateRangeTypeHelper.hasSemanticDateValue(oState) || !bIsSimpleColumnsApplied) {
+								MessageBox.error(oRb.getText("ST_CARD_CREATION_FAILURE") + "\n" + oRb.getText("ST_CARD_CREATION_FAILURE_INFO") +
+									"\n" + oRb.getText("ST_CARD_FAILURE_REASON_SEMANTIC_DATE_FILTERS") + "\n" + oRb.getText("ST_CARD_FAILURE_TABLE_REASON_UNSUPPORTED_COLUMNS"));
 							} else {
 								var oView = oController.getView();
 								var oCardDefinition = {};
@@ -768,6 +739,7 @@ sap.ui.define([
 								oCardDefinition.entitySet = oEntitySet;
 								oCardDefinition.entityType = oEntityType;
 								oCardDefinition.oSmartFilterbar = oState.oSmartFilterbar;
+								oCardDefinition.oTemplateUtils = oTemplateUtils;
 								var oInsightsInstance = oTemplatePrivateModel.getProperty("/listReport/oInsightsInstance");
 								var vDraftState = oTemplatePrivateModel.getProperty("/listReport/vDraftState");
 								if (vDraftState && Number(vDraftState)) {

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -599,25 +599,27 @@ sap.ui.define([
 
 		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
 			handleVariantIdPassedViaURLParams(oURLParameters);
-
+			
+			var oSFBUiState = oState.oSmartFilterbar.getUiState();
+			var oSFBSemanticDates = oSFBUiState.getSemanticDates();
 			//oStartupObject to be passed to the extension where urlParameters and selectedQuickVariantSelectionKey are optional
 			var oStartupObject = {
 					viaExternalNavigation: false,
 					selectionVariant: oAppData.oSelectionVariant,
 					urlParameters: oURLParameters,
 					selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
-					// incase semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object
-					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
+					// In case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object.
+					// Moreover, if there is no semanticDates retrieved from NavigationHandler, then the existing values of semantic
+					// dates properties considered by smartfilterbar (from annotation, change handler etc) should be taken into consideration.
+					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || oSFBSemanticDates || {}
 			};
 			//Apply sort order coming from the XAppState to the smart table.
 			if (oAppData.presentationVariant !== undefined) {
 				setControlSortOrder(oAppData.presentationVariant);
 			}
-			var oSFBUiState = oState.oSmartFilterbar.getUiState();
 			var oSFBSelectionVariant = new SelectionVariant(JSON.stringify(oSFBUiState.getSelectionVariant()));
 			fnRemoveCustomAndGenericData(oSFBSelectionVariant);
 			var oSFBSelectionVariantCopy = JSON.parse(JSON.stringify(oSFBSelectionVariant));
-			var oSFBSemanticDates = oSFBUiState.getSemanticDates();
 			if ((oAppData.oSelectionVariant.getSelectOptionsPropertyNames().indexOf("DisplayCurrency") === -1) && (oAppData.oSelectionVariant.getSelectOptionsPropertyNames().indexOf("P_DisplayCurrency") === -1) && (oAppData.oSelectionVariant.getParameterNames().indexOf("P_DisplayCurrency") === -1)) {
 				addDisplayCurrency(oAppData);
 			}
@@ -703,6 +705,12 @@ sap.ui.define([
 			// Remark: within SVM Wrapper, setSuppressSelection is also used - be aware, that this must not be overlapping (as in both cases we set back to fixed-value false)
 			oState.oSmartFilterbar.setSuppressSelection(false);
 			bInitialisation = false;
+			if (sNavType === sap.ui.generic.app.navigation.service.NavType.hybrid){ // incase of hybrid -> take everything from IappState
+				oAppData = oAppData.iAppState;
+				oAppData.controlStates = oAppData.data.permanentEntries.permanentState.data.controlStates;
+				fnAdaptToAppStateIappState(oAppData);
+				return;
+			}
 			// separate 3 different cases
 			// - restore from iAppState
 			// - adapt to navigation parameters

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.114.0"
+			"version": "1.114.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartTableToolbar.fragment.xml

@@ -35,9 +35,10 @@
 			</template:if>
 		</template:with>
 
-		<!-- add Add to cards repository Button-->
-		<template:if test="{= !${parameter>/settings/tableSettings/addCardtoInsightsHidden} &amp;&amp; ${parameter>/templateSpecific/isResponsiveTable} &amp;&amp; !${parameter>/settings/quickVariantSelectionX} }">
-			<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportAction', subType: 'AddCardtoInsights'})}" icon="sap-icon://add-folder" press="._templateEventHandlers.onAddCardsToRepository" text="{i18n>ST_ADD_CARDS_TO_INSIGHTS}" enabled="{= ${_templPriv>/generic/bDataAreShownInTable}}" visible="{= ${parameter>/templateSpecific/bInsightsEnabled} }">
+		<!-- Add to cards repository Button-->
+		<template:if test="{= !${parameter>/settings/tableSettings/addCardtoInsightsHidden} &amp;&amp; ${parameter>/templateSpecific/isResponsiveTable} &amp;&amp; !${parameter>/settings/quickVariantSelectionX} &amp;&amp; !${parameter>/settings/quickVariantSelection} }">
+			<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportAction', subType: 'AddCardtoInsights'})}" icon="sap-icon://add-folder" press="._templateEventHandlers.onAddCardsToRepository" text="{i18n>ST_ADD_CARDS_TO_INSIGHTS}" enabled="{= ${_templPriv>/generic/bDataAreShownInTable}}" 
+				visible="{parts: [{path: 'parameter>/templateSpecific/bInsightsEnabled'}], formatter: 'AH.getInsightsButtonVisibility'}">
 				<layoutData>
 					<OverflowToolbarLayoutData priority="AlwaysOverflow"/>
 				</layoutData>

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -91,14 +91,14 @@ sap.ui.define([
 			// processing is completed
 			var fnInitialStateAppliedResolve = null; // resolve function for oStateAppliedAfterBindPromise
 			
-			var mTablesWithSelectionChangeDuringDraftEdit = Object.create(null); // initialized in draft edit; collects the ids of all tables that have a selction change during the edit session
+			var mTablesWithSelectionChangeDuringDraftEdit = Object.create(null); // initialized in draft edit; collects the ids of all tables that have a selection change during the edit session
 
 			// This represents the global state of object page. There are different things, for which object page sub-sections might be waiting for,
 			// We use this variable to check whether those things have completed or not. This state can only be changed by method fnHandleStateChangeForAllSubSections,
 			// this method changes the flag of state and trigger a side-effect to tell all the subsections that if they are listening for any state value, they can
 			// update themselves.
-			// This state is reset in every rebind cycle and set appropriatly whenever some events happen like, headerdata available, stateApplied, layoutFinished.
-			// currently structre of this state looks like
+			// This state is reset in every rebind cycle and set appropriately whenever some events happen like, headerdata available, stateApplied, layoutFinished.
+			// currently structure of this state looks like
 			// oWaitForState = {
 			// 	bLayoutFinished: boolean,
 			// 	bStateApplied: boolean,
@@ -190,7 +190,7 @@ sap.ui.define([
 						null,
 						oController.getOwnerComponent().getAppComponent().getForceGlobalRefresh(),
 						{
-							draftRootContext : oTemplateUtils.oComponentUtils.getMainComponentDetails().bindingContext, // send the root component binding for exexuting preparation action
+							draftRootContext : oTemplateUtils.oComponentUtils.getMainComponentDetails().bindingContext, // send the root component binding for executing preparation action
 							callPreparationOnDraftRoot : true
 						}
 					);
@@ -373,7 +373,7 @@ sap.ui.define([
 						 * would always be true. Thus, we have to add
 						 * "or (HasActiveEntity = false and IsActiveEntity = false)".
 						 * However, this condition is not evaluated correctly by gateway, so we have to transform it to
-						 * (IsActvieEntity = true and x) or (Is ActvieEntity = false and (x or HasActvieEntity = false)),
+						 * (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
 						 * where x is the condition provided by the user
 						 */
 						var oUserFilter = FilterProcessor.groupFilters(oBindingParams.filters);
@@ -554,8 +554,7 @@ sap.ui.define([
 			var fnDeleteConfirmationOnDelete;
 
 			function getObjectPageDeleteDialog() {
-				fnDeleteConfirmationOnDelete = function (oEvent) {
-					var oDialog = oEvent.getSource().getParent();
+				fnDeleteConfirmationOnDelete = function (oDialog) {
 					var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
 					if (oBusyHelper.isBusy()) {
 						return;
@@ -585,9 +584,10 @@ sap.ui.define([
 						var oDialog = oEvent.getSource().getParent();
 						oDialog.close();
 					},
-					// to be called within a function to asure that fnDeleteConfirmationOnDelete contains correct coding (see below function getTableDeleteDialog)
+					// to be called within a function to assure that fnDeleteConfirmationOnDelete contains correct coding (see below function getTableDeleteDialog)
 					onDelete: function (oEvent) {
-						fnDeleteConfirmationOnDelete(oEvent);
+						var oDialog = oEvent.getSource().getParent();
+						(oTemplateUtils.oComponentUtils.isDraftEnabled() ? oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync() : Promise.resolve()).then(fnDeleteConfirmationOnDelete.bind(null, oDialog));
 					}
 				}, "delete", Function.prototype, true);
 			}
@@ -642,7 +642,7 @@ sap.ui.define([
 					}
 					index -= 1;
 				}
-				//Using seperate loops to work on the array without ignored fields.
+				//Using separate loops to work on the array without ignored fields.
 				var aUnsupportedColumns = aColumnData.reduce(function (aColumns, oColumn) {
 					// Data formats for which paste is not yet supported.
 					if (!oColumn.type && !oColumn.customParseFunction) {
@@ -710,7 +710,7 @@ sap.ui.define([
 							var DraftSavedState = sap.m.DraftIndicatorState.Saved; //Indicator for the footer
 
 							for (var i = 0; i < iParsedDataLength; i++) {
-								bIgnoreTableRefresh = i < iParsedDataLength - 1; //Flag to overcome multiple table refreshs when records are pasted.
+								bIgnoreTableRefresh = i < iParsedDataLength - 1; //Flag to overcome multiple table refreshes when records are pasted.
 								oAddEntryPromise = oTemplateUtils.oCommonEventHandlers.addEntry(oEventSource, true, undefined, aParsedData[i], bIgnoreTableRefresh);
 								aAddEntryPromises.push(oAddEntryPromise);
 							}
@@ -750,7 +750,7 @@ sap.ui.define([
 
 			// END - Functions related to the copy-paste from Excel
 
-			function onDelete(oEvent) {
+			function onDelete() {
 				oTemplateUtils.oCommonUtils.executeIfControlReady(onDeleteImpl, "delete");
 			}
 			
@@ -947,9 +947,8 @@ sap.ui.define([
 			 */
 			function getTableDeleteDialog(oSmartTable, aContexts, sUiElementId) {
 				var aPath = [];
-				fnTableDeleteConfirmationOnDelete = function (oEventSource) {
+				fnTableDeleteConfirmationOnDelete = function (oDialog) {
 					var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
-					var oDialog = oEventSource.getParent();
 					aPath = [];
 					var iSuccessfullyDeletedCount;
 					var iFailedToDeleteCount;
@@ -1005,7 +1004,7 @@ sap.ui.define([
 								sMessage += sMessage && sMessage + "\n";
 								sMessage += oTemplateUtils.oCommonUtils.getContextText("DELETE_ERROR_PLURAL_WITH_COUNT", oSmartTable.getId(), null, [iFailedToDeleteCount]);
 							} else if (iSuccessfullyDeletedCount > 0) {
-								//CASE: There is record failed for delete but some records got deleted succefully
+								//CASE: There is record failed for delete but some records got deleted successfully
 								sMessage += "\n";
 								sMessage += oTemplateUtils.oCommonUtils.getContextText("DELETE_ERROR_WITH_COUNT", oSmartTable.getId(), null, [iFailedToDeleteCount]);
 							} else {
@@ -1045,10 +1044,10 @@ sap.ui.define([
 						var oDialog = oEvent.getSource().getParent();
 						oDialog.close();
 					},
-					// to be called within a function to asure that fnTableDeleteConfirmationOnDelete contains correct coding (see above function getObjectPageDeleteDialog)
+					// to be called within a function to assure that fnTableDeleteConfirmationOnDelete contains correct coding (see above function getObjectPageDeleteDialog)
 					onDelete: function (oEvent) {
-						var oEventSource = oEvent.getSource();
-						oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync().then(fnTableDeleteConfirmationOnDelete.bind(null, oEventSource));
+						var oDialog = oEvent.getSource().getParent();
+						(oTemplateUtils.oComponentUtils.isDraftEnabled() ? oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync() : Promise.resolve()).then(fnTableDeleteConfirmationOnDelete.bind(null, oDialog));
 					}
 				}, "delete", Function.prototype, true);
 			}
@@ -1180,15 +1179,15 @@ sap.ui.define([
 						}
 					};
 				};
-				// Loop over customData and attach changeHandler (if necesary)
+				// Loop over customData and attach changeHandler (if necessary)
 				oObjectPage.getCustomData().forEach(function (oCustomDataElement) {
 					var sKey = oCustomDataElement.getKey();
 					if (sKey === "objectTitle" || sKey === "objectSubtitle") { // check for the two properties handled in the headerInfo segment
 						var oBinding = oCustomDataElement.getBinding("value");
-						// UI5 does not gurantee the binding to be already available at this point in time.
+						// UI5 does not guarantee the binding to be already available at this point in time.
 						// If the binding is not available, we access the binding info as a fallback
 						var oBindingInfo = !oBinding && oCustomDataElement.getBindingInfo("value");
-						if (!oBinding && !oBindingInfo) { // constant -> No change handler needed, but the value must be transfered to the template private model once
+						if (!oBinding && !oBindingInfo) { // constant -> No change handler needed, but the value must be transferred to the template private model once
 							oTemplatePrivateModel.setProperty("/objectPage/headerInfo/" + sKey, oCustomDataElement.getValue());
 							return; // done
 						}
@@ -1445,7 +1444,7 @@ sap.ui.define([
 						if (sSelectedSubSection){ // sSelectedSubSection was not yet processed, but we want to get only subsections that come after that
 							return false;
 						}
-						// Scroll to thwe given subsection and make sure that controls and bindings for this subsection are initialized (necessary because of lazy loading) 
+						// Scroll to the given subsection and make sure that controls and bindings for this subsection are initialized (necessary because of lazy loading) 
 						oSelectedSection.setSelectedSubSection(oControl);
 						fnSubSectionEntered(oControl);
 						return null;
@@ -1805,11 +1804,11 @@ sap.ui.define([
 				var sCategory = bWaitForViewPort ? "subSectionNotWaitingForViewPort" : "subSection";
 				var oView = oController.getView();
 				oTemplateUtils.oInfoObjectHandler.executeForAllInformationObjects(sCategory, function (oSubSectionInfoObj) {
-					// Checking whether a subSection Entered into view port or not is something local state compared to global state. Thus it is tested seperate to
+					// Checking whether a subSection Entered into view port or not is something local state compared to global state. Thus it is tested separate to
 					// to global state
 					var sSubSectionId = oSubSectionInfoObj.getId(); 
 					var bExecuteNow = (bWaitForViewPort || controlHelper.isElementVisibleOnView(sSubSectionId, oView)) && checkGlobalWaitState(oSubSectionInfoObj.getLoadingStrategy());
-					// Checking whether a subSection Entered into view port or not is something local state compared to global state. Thus it is tested seperate to
+					// Checking whether a subSection Entered into view port or not is something local state compared to global state. Thus it is tested separate to
 					// to global state
 					var oStrategy = oSubSectionInfoObj.getLoadingStrategy();
 					bExecuteNow = checkGlobalWaitState(oStrategy);
@@ -2170,7 +2169,7 @@ sap.ui.define([
 					var bHeaderContent = oObjectPage.getShowHeaderContent();
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 					oTemplatePrivateModel.setProperty("/objectPage/headerContentVisible", bHeaderContent);
-					// Create a wrapper around the objectpage
+					// Create a wrapper around the object page
 					// Use this wrapper to store/restore the pinned status of the header.
 					oObjectPageLayoutWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oObjectPage);
 					oObjectPageLayoutWrapper.attachStateChanged(oTemplateUtils.oComponentUtils.stateChanged);
@@ -2238,7 +2237,7 @@ sap.ui.define([
 						oObjectPage._triggerVisibleSubSectionsEvents();
 					};
 					
-					// This is the falback implementation. Note that certain scenarios are already covered inplace (Edit, Save, Cancel)
+					// This is the fallback implementation. Note that certain scenarios are already covered inplace (Edit, Save, Cancel)
 					oViewProxy.setFocus = function(oBeforeData, oAdditionalData){
 						var aActiveComponentsBefore = oBeforeData.activeComponents;
 						if (aActiveComponentsBefore.length > 0 && !(oAdditionalData && (oAdditionalData.isCreate || oAdditionalData.ignorePersistence))){
@@ -2281,11 +2280,11 @@ sap.ui.define([
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 					oTemplatePrivateModel.setProperty("/objectPage/aPasteAttachedTables", []);
 					oTemplateUtils.oComponentUtils.attach(oController, "PageDataLoaded", function (oEvent) {
-						var aStreamEnabledAsscoiatedEntites = oTemplateUtils.oComponentUtils.getParameterModelForTemplating().getObject("/templateSpecific/streamEnabledAssociatedEntites");
-						if (aStreamEnabledAsscoiatedEntites && aStreamEnabledAsscoiatedEntites.length > 0) {
-							for (var i = 0; i < aStreamEnabledAsscoiatedEntites.length; i++) {
-								var oStreamData = oTemplateUtils.oCommonUtils.getStreamData(aStreamEnabledAsscoiatedEntites[i], oEvent.context);
-								oTemplateUtils.oCommonUtils.setStreamData(oStreamData, aStreamEnabledAsscoiatedEntites[i]);
+						var aStreamEnabledAssociatedEntities = oTemplateUtils.oComponentUtils.getParameterModelForTemplating().getObject("/templateSpecific/streamEnabledAssociatedEntites");
+						if (aStreamEnabledAssociatedEntities && aStreamEnabledAssociatedEntities.length > 0) {
+							for (var i = 0; i < aStreamEnabledAssociatedEntities.length; i++) {
+								var oStreamData = oTemplateUtils.oCommonUtils.getStreamData(aStreamEnabledAssociatedEntities[i], oEvent.context);
+								oTemplateUtils.oCommonUtils.setStreamData(oStreamData, aStreamEnabledAssociatedEntities[i]);
 							}
 						} 
 						var oStreamDataSelf = oTemplateUtils.oCommonUtils.getStreamData(null, oEvent.context);
@@ -2340,31 +2339,27 @@ sap.ui.define([
 							oTemplateUtils.oCommonEventHandlers.submitChangesForSmartMultiInput(oEvent);
 						}
 					},
-					
-					contextEditableChanged: function (oEvent) {
+					onModeToggled: function (oEvent) {
 						/* Set the FieldGroupIds of the SmartField(s) which are 1:1 associated with the object page entity set so that side effect annotation targeting
 						   the object entity set would work. Assigning FieldGroupIds to other SmartFields is already taken care by the SmartFields  */
-						if (oEvent.getParameter("editable")) {
-							var oSmartField = oEvent.getSource();
-							oSmartField._getComputedMetadata().then(function (oComputedMetaData) {
-								if (oComputedMetaData && oComputedMetaData.navigationPath && !!oSmartField.getBindingContext()) {
-									var oClonedMetaData = deepExtend({}, oComputedMetaData);
-									var oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
-
-									/* EntitySet and EntityType of the cloned metamodel of smartfield needs to be changed to the parent entity so that when
-									   _calculateFieldGroupIDs looks through the passed metamodel, it should be able to find the corresponding side effect annotation */
-									oClonedMetaData.entitySet = oMetaModel.getODataEntitySet(oController.getOwnerComponent().getEntitySet());
-									oClonedMetaData.entityType = oMetaModel.getODataEntityType(oClonedMetaData.entitySet.entityType);
-
-									var aIDs = oSmartField._calculateFieldGroupIDs(oClonedMetaData);
-									if (aIDs) {
-										oSmartField._setInternalFieldGroupIds(aIDs);
-									}
+						var oSmartField = oEvent.getSource();
+						oSmartField._getComputedMetadata().then(function (oComputedMetaData) {
+							if (oComputedMetaData && oComputedMetaData.navigationPath && !!oSmartField.getBindingContext()) {
+								var oClonedMetaData = deepExtend({}, oComputedMetaData);
+								var oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
+
+								/* EntitySet and EntityType of the cloned metamodel of smartfield needs to be changed to the parent entity so that when
+									_calculateFieldGroupIDs looks through the passed metamodel, it should be able to find the corresponding side effect annotation */
+								oClonedMetaData.entitySet = oMetaModel.getODataEntitySet(oController.getOwnerComponent().getEntitySet());
+								oClonedMetaData.entityType = oMetaModel.getODataEntityType(oClonedMetaData.entitySet.entityType);
+
+								var aIDs = oSmartField._calculateFieldGroupIDs(oClonedMetaData);
+								if (aIDs) {
+									oSmartField._setInternalFieldGroupIds(aIDs);
 								}
-							});
-						}
+							}
+						});
 					},
-
 					deleteEntry: function (oEvent) {
 						var oListItem = oEvent.getParameter("listItem");
 						var oListItemContext = oListItem.getBindingContext();
@@ -2387,7 +2382,7 @@ sap.ui.define([
 					
 					checkUpdateFinished: function (oEvent) {
 						// in case of the table get refreshed through table filter or sort 
-						// onDataRecieved may not be called 
+						// onDataReceived may not be called 
 						oTemplateUtils.oCommonUtils.setEnabledToolbarButtons(oEvent.getSource());
 					},
 					// selectionChange for MultiSelectionPlugin
@@ -2531,9 +2526,9 @@ sap.ui.define([
 					onBeforeRebindDetailTable: function (oEvent) {
 						var oSmartTable = oEvent.getSource();
 						if (!oSmartTable.getModel()) {
-							return; // In Scenarion when Table is not bound on the initial load (Ex. When table is inside moreBlocks sections)
+							return; // In scenario when Table is not bound on the initial load (Ex. When table is inside moreBlocks sections)
 						}
-						// Attach dataRecieved event
+						// Attach dataReceived event
 						oEvent.mParameters.bindingParams.events["dataReceived"] = onDataReceivedForTable.bind(null, oSmartTable);
 						oState.oInlineCreationRowsHelper.onBeforeRebindControl(oEvent);
 						
@@ -2641,7 +2636,7 @@ sap.ui.define([
 					onBeforeRebindChart: function (oEvent) {
 						var oSmartChart = oEvent.getSource();
 						if (!oSmartChart.getModel()) {
-							return; // In Scenarion when Chart is not bound on the initial load (Ex. When chart is inside moreBlocks sections)
+							return; // In scenario when Chart is not bound on the initial load (Ex. When chart is inside moreBlocks sections)
 						}
 						adjustAndProvideBindingParamsForSmartTableOrChart(oEvent);
 						//setNoDataChartTextIfRequired(oSmartChart);
@@ -2764,7 +2759,7 @@ sap.ui.define([
 					},
 
 					/*
-						Formats the Text to be shown in the segmented button used for multple views in object page tables
+						Formats the Text to be shown in the segmented button used for multiple views in object page tables
 					*/
 					formatItemTextForMultipleView: function (oItem) {
 						return oItem && oMultipleViewsHandler ? oMultipleViewsHandler.formatItemTextForMultipleView(oItem) : "";