@sapui5/sap.fe.templates 1.109.0 → 1.110.1

package/src/sap/fe/templates/ListReport/ListReportController.controller.ts

@@ -4,7 +4,6 @@ import ObjectPath from "sap/base/util/ObjectPath";
 import type DynamicPage from "sap/f/DynamicPage";
 import ActionRuntime from "sap/fe/core/ActionRuntime";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import EditFlow from "sap/fe/core/controllerextensions/EditFlow";
 import IntentBasedNavigation from "sap/fe/core/controllerextensions/IntentBasedNavigation";
 import InternalIntentBasedNavigation from "sap/fe/core/controllerextensions/InternalIntentBasedNavigation";
 import InternalRouting from "sap/fe/core/controllerextensions/InternalRouting";
@@ -37,10 +36,8 @@ import FilterUtils from "sap/fe/macros/filter/FilterUtils";
 import TableHelper from "sap/fe/macros/table/TableHelper";
 import MultipleModeControl from "sap/fe/templates/ListReport/controls/MultipleModeControl";
 import ExtensionAPI from "sap/fe/templates/ListReport/ExtensionAPI";
-import EditFlowOverrides from "sap/fe/templates/RootContainer/overrides/EditFlow";
 import TableScroller from "sap/fe/templates/TableScroller";
 import type SegmentedButton from "sap/m/SegmentedButton";
-import Component from "sap/ui/core/Component";
 import type Control from "sap/ui/core/Control";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import { system } from "sap/ui/Device";
@@ -58,6 +55,12 @@ import ViewStateOverrides from "./overrides/ViewState";
 const TemplateContentView = CoreLibrary.TemplateContentView,
 	InitialLoadMode = CoreLibrary.InitialLoadMode;
 
+/**
+ * Controller class for the list report page, used inside an SAP Fiori elements application.
+ *
+ * @hideconstructor
+ * @public
+ */
 @defineUI5Class("sap.fe.templates.ListReport.ListReportController")
 class ListReportController extends PageController {
 	@usingExtension(
@@ -85,9 +88,6 @@ class ListReportController extends PageController {
 	@usingExtension(Share.override(ShareOverrides))
 	share!: Share;
 
-	@usingExtension(EditFlow.override(EditFlowOverrides))
-	editFlow!: EditFlow;
-
 	@usingExtension(ViewState.override(ViewStateOverrides))
 	viewState!: ViewState;
 
@@ -104,6 +104,12 @@ class ListReportController extends PageController {
 	private hasPendingChartChanges?: boolean;
 	private hasPendingTableChanges?: boolean;
 
+	/**
+	 * Get the extension API for the current page.
+	 *
+	 * @public
+	 * @returns The extension API.
+	 */
 	@publicExtension()
 	@finalExtension()
 	getExtensionAPI(): ExtensionAPI {
@@ -185,7 +191,12 @@ class ListReportController extends PageController {
 			this._updateTableActions(aTables);
 		}
 
-		this.pageReady.waitFor(this.getAppComponent().getAppStateHandler().applyAppState());
+		const internalModelContext = this.getView().getBindingContext("internal") as InternalModelContext;
+		if (!internalModelContext.getProperty("initialVariantApplied")) {
+			const viewId = this.getView().getId();
+			this.pageReady.waitFor(this.getAppComponent().getAppStateHandler().applyAppState(viewId, this.getView()));
+			internalModelContext.setProperty("initialVariantApplied", true);
+		}
 	}
 
 	onBeforeRendering() {
@@ -224,7 +235,7 @@ class ListReportController extends PageController {
 	}
 
 	/**
-	 * Method called when the content of a list report view needs to be refreshed.
+	 * Method called when the content of a custom view used in a list report needs to be refreshed.
 	 * This happens either when there is a change on the FilterBar and the search is triggered,
 	 * or when a tab with custom content is selected.
 	 * This method can be overwritten by the controller extension in case of customization.
@@ -276,6 +287,17 @@ class ListReportController extends PageController {
 		return this._getTable()?.data("targetCollectionPath").slice(1);
 	}
 
+	/**
+	 * Method called when the 'Clear' button on the FilterBar is pressed.
+	 *
+	 * @public
+	 */
+	@publicExtension()
+	@extensible(OverrideExecution.After)
+	onAfterClear() {
+		/* To be overriden */
+	}
+
 	/**
 	 * This method initiates the update of the enabled state of the DataFieldForAction and the visible state of the DataFieldForIBN buttons.
 	 *
@@ -355,7 +377,7 @@ class ListReportController extends PageController {
 		const oManifestEntry = this.getAppComponent().getManifestEntry("sap.app");
 		return {
 			title: oManifestEntry.title,
-			subtitle: oManifestEntry.appSubTitle || "",
+			subtitle: oManifestEntry.subTitle || "",
 			intent: "",
 			icon: ""
 		};
@@ -386,11 +408,6 @@ class ListReportController extends PageController {
 		return controlId && this.getView().byId(controlId);
 	}
 
-	_getPageModel(): JSONModel | undefined {
-		const pageComponent = Component.getOwnerComponentFor(this.getView()) as any;
-		return pageComponent.getModel("_pageModel");
-	}
-
 	_getDynamicListReportControlId(): string {
 		return this._getPageModel()?.getProperty("/dynamicListReportId") || "";
 	}
@@ -664,9 +681,25 @@ class ListReportController extends PageController {
 			const oVM = oEvent.getSource();
 			const currentVariantKey = oEvent.getParameter("key");
 			const oMultiModeControl = this._getMultiModeControl();
+			const initialControlStatesMapper = this.viewState.initialControlStatesMapper;
 
 			oMultiModeControl?.invalidateContent();
 			oMultiModeControl?.setFreezeContent(true);
+			// Reset the Controls Mapped to the selected VM
+			const vmAssociatedControlsToReset = oVM.getFor();
+			Object.keys(initialControlStatesMapper).forEach((controlKey) => {
+				let found = false;
+				for (const vmAssociatedcontrolKey of vmAssociatedControlsToReset) {
+					if (vmAssociatedcontrolKey.indexOf(controlKey) > -1) {
+						found = true;
+						break;
+					}
+				}
+				if (found) {
+					initialControlStatesMapper[controlKey] = {};
+				}
+			});
+
 			// setTimeout cause the variant needs to be applied before judging the auto search or updating the app state
 			setTimeout(() => {
 				if (this._shouldAutoTriggerSearch(oVM)) {
@@ -678,6 +711,8 @@ class ListReportController extends PageController {
 			}, 0);
 		},
 		onVariantSaved(this: ListReportController) {
+			this.viewState.initialControlStatesMapper = {};
+
 			//TODO: Should remove this setTimeOut once Variant Management provides an api to fetch the current variant key on save!!!
 			setTimeout(() => {
 				this.getExtensionAPI().updateAppState();

package/src/sap/fe/templates/ListReport/ListReportTemplating.js

@@ -7,7 +7,6 @@ sap.ui.define(["sap/fe/core/helpers/StableIdHelper"], function (StableIdHelper)
 
   var _exports = {};
   var generate = StableIdHelper.generate;
-
   /**
    * Method returns an VariantBackReference expression based on variantManagement and oConverterContext value.
    *
@@ -17,20 +16,17 @@ sap.ui.define(["sap/fe/core/helpers/StableIdHelper"], function (StableIdHelper)
    * @param {object} oConverterContext Object containing converted context
    * @returns {string}
    */
+
   var getVariantBackReference = function (oViewData, oConverterContext) {
     if (oViewData && oViewData.variantManagement === "Page") {
       return "fe::PageVariantManagement";
     }
-
     if (oViewData && oViewData.variantManagement === "Control") {
       return generate([oConverterContext.filterBarId, "VariantManagement"]);
     }
-
     return undefined;
   };
-
   _exports.getVariantBackReference = getVariantBackReference;
-
   var getDefaultPath = function (aViews) {
     for (var i = 0; i < aViews.length; i++) {
       if (aViews[i].defaultPath) {
@@ -38,8 +34,7 @@ sap.ui.define(["sap/fe/core/helpers/StableIdHelper"], function (StableIdHelper)
       }
     }
   };
-
   _exports.getDefaultPath = getDefaultPath;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJnZXRWYXJpYW50QmFja1JlZmVyZW5jZSIsIm9WaWV3RGF0YSIsIm9Db252ZXJ0ZXJDb250ZXh0IiwidmFyaWFudE1hbmFnZW1lbnQiLCJnZW5lcmF0ZSIsImZpbHRlckJhcklkIiwidW5kZWZpbmVkIiwiZ2V0RGVmYXVsdFBhdGgiLCJhVmlld3MiLCJpIiwibGVuZ3RoIiwiZGVmYXVsdFBhdGgiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkxpc3RSZXBvcnRUZW1wbGF0aW5nLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIFRlbXBsYXRlIEhlbHBlcnMgZm9yIHRoZSBMaXN0IFJlcG9ydFxuaW1wb3J0IHsgZ2VuZXJhdGUgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9TdGFibGVJZEhlbHBlclwiO1xuXG4vKipcbiAqIE1ldGhvZCByZXR1cm5zIGFuIFZhcmlhbnRCYWNrUmVmZXJlbmNlIGV4cHJlc3Npb24gYmFzZWQgb24gdmFyaWFudE1hbmFnZW1lbnQgYW5kIG9Db252ZXJ0ZXJDb250ZXh0IHZhbHVlLlxuICpcbiAqIEBmdW5jdGlvblxuICogQG5hbWUgZ2V0VmFyaWFudEJhY2tSZWZlcmVuY2VcbiAqIEBwYXJhbSB7b2JqZWN0fSBvVmlld0RhdGEgT2JqZWN0IENvbnRhaW5pbmcgVmlldyBEYXRhXG4gKiBAcGFyYW0ge29iamVjdH0gb0NvbnZlcnRlckNvbnRleHQgT2JqZWN0IGNvbnRhaW5pbmcgY29udmVydGVkIGNvbnRleHRcbiAqIEByZXR1cm5zIHtzdHJpbmd9XG4gKi9cblxuZXhwb3J0IGNvbnN0IGdldFZhcmlhbnRCYWNrUmVmZXJlbmNlID0gZnVuY3Rpb24gKG9WaWV3RGF0YTogYW55LCBvQ29udmVydGVyQ29udGV4dDogYW55KSB7XG5cdGlmIChvVmlld0RhdGEgJiYgb1ZpZXdEYXRhLnZhcmlhbnRNYW5hZ2VtZW50ID09PSBcIlBhZ2VcIikge1xuXHRcdHJldHVybiBcImZlOjpQYWdlVmFyaWFudE1hbmFnZW1lbnRcIjtcblx0fVxuXHRpZiAob1ZpZXdEYXRhICYmIG9WaWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCA9PT0gXCJDb250cm9sXCIpIHtcblx0XHRyZXR1cm4gZ2VuZXJhdGUoW29Db252ZXJ0ZXJDb250ZXh0LmZpbHRlckJhcklkLCBcIlZhcmlhbnRNYW5hZ2VtZW50XCJdKTtcblx0fVxuXHRyZXR1cm4gdW5kZWZpbmVkO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldERlZmF1bHRQYXRoID0gZnVuY3Rpb24gKGFWaWV3czogYW55KSB7XG5cdGZvciAobGV0IGkgPSAwOyBpIDwgYVZpZXdzLmxlbmd0aDsgaSsrKSB7XG5cdFx0aWYgKGFWaWV3c1tpXS5kZWZhdWx0UGF0aCkge1xuXHRcdFx0cmV0dXJuIGFWaWV3c1tpXS5kZWZhdWx0UGF0aDtcblx0XHR9XG5cdH1cbn07XG4iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUFBO0FBQUE7Ozs7Ozs7RUFHQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFFTyxJQUFNQSx1QkFBdUIsR0FBRyxVQUFVQyxTQUFWLEVBQTBCQyxpQkFBMUIsRUFBa0Q7SUFDeEYsSUFBSUQsU0FBUyxJQUFJQSxTQUFTLENBQUNFLGlCQUFWLEtBQWdDLE1BQWpELEVBQXlEO01BQ3hELE9BQU8sMkJBQVA7SUFDQTs7SUFDRCxJQUFJRixTQUFTLElBQUlBLFNBQVMsQ0FBQ0UsaUJBQVYsS0FBZ0MsU0FBakQsRUFBNEQ7TUFDM0QsT0FBT0MsUUFBUSxDQUFDLENBQUNGLGlCQUFpQixDQUFDRyxXQUFuQixFQUFnQyxtQkFBaEMsQ0FBRCxDQUFmO0lBQ0E7O0lBQ0QsT0FBT0MsU0FBUDtFQUNBLENBUk07Ozs7RUFVQSxJQUFNQyxjQUFjLEdBQUcsVUFBVUMsTUFBVixFQUF1QjtJQUNwRCxLQUFLLElBQUlDLENBQUMsR0FBRyxDQUFiLEVBQWdCQSxDQUFDLEdBQUdELE1BQU0sQ0FBQ0UsTUFBM0IsRUFBbUNELENBQUMsRUFBcEMsRUFBd0M7TUFDdkMsSUFBSUQsTUFBTSxDQUFDQyxDQUFELENBQU4sQ0FBVUUsV0FBZCxFQUEyQjtRQUMxQixPQUFPSCxNQUFNLENBQUNDLENBQUQsQ0FBTixDQUFVRSxXQUFqQjtNQUNBO0lBQ0Q7RUFDRCxDQU5NIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJnZXRWYXJpYW50QmFja1JlZmVyZW5jZSIsIm9WaWV3RGF0YSIsIm9Db252ZXJ0ZXJDb250ZXh0IiwidmFyaWFudE1hbmFnZW1lbnQiLCJnZW5lcmF0ZSIsImZpbHRlckJhcklkIiwidW5kZWZpbmVkIiwiZ2V0RGVmYXVsdFBhdGgiLCJhVmlld3MiLCJpIiwibGVuZ3RoIiwiZGVmYXVsdFBhdGgiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkxpc3RSZXBvcnRUZW1wbGF0aW5nLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIFRlbXBsYXRlIEhlbHBlcnMgZm9yIHRoZSBMaXN0IFJlcG9ydFxuaW1wb3J0IHsgZ2VuZXJhdGUgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9TdGFibGVJZEhlbHBlclwiO1xuXG4vKipcbiAqIE1ldGhvZCByZXR1cm5zIGFuIFZhcmlhbnRCYWNrUmVmZXJlbmNlIGV4cHJlc3Npb24gYmFzZWQgb24gdmFyaWFudE1hbmFnZW1lbnQgYW5kIG9Db252ZXJ0ZXJDb250ZXh0IHZhbHVlLlxuICpcbiAqIEBmdW5jdGlvblxuICogQG5hbWUgZ2V0VmFyaWFudEJhY2tSZWZlcmVuY2VcbiAqIEBwYXJhbSB7b2JqZWN0fSBvVmlld0RhdGEgT2JqZWN0IENvbnRhaW5pbmcgVmlldyBEYXRhXG4gKiBAcGFyYW0ge29iamVjdH0gb0NvbnZlcnRlckNvbnRleHQgT2JqZWN0IGNvbnRhaW5pbmcgY29udmVydGVkIGNvbnRleHRcbiAqIEByZXR1cm5zIHtzdHJpbmd9XG4gKi9cblxuZXhwb3J0IGNvbnN0IGdldFZhcmlhbnRCYWNrUmVmZXJlbmNlID0gZnVuY3Rpb24gKG9WaWV3RGF0YTogYW55LCBvQ29udmVydGVyQ29udGV4dDogYW55KSB7XG5cdGlmIChvVmlld0RhdGEgJiYgb1ZpZXdEYXRhLnZhcmlhbnRNYW5hZ2VtZW50ID09PSBcIlBhZ2VcIikge1xuXHRcdHJldHVybiBcImZlOjpQYWdlVmFyaWFudE1hbmFnZW1lbnRcIjtcblx0fVxuXHRpZiAob1ZpZXdEYXRhICYmIG9WaWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCA9PT0gXCJDb250cm9sXCIpIHtcblx0XHRyZXR1cm4gZ2VuZXJhdGUoW29Db252ZXJ0ZXJDb250ZXh0LmZpbHRlckJhcklkLCBcIlZhcmlhbnRNYW5hZ2VtZW50XCJdKTtcblx0fVxuXHRyZXR1cm4gdW5kZWZpbmVkO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldERlZmF1bHRQYXRoID0gZnVuY3Rpb24gKGFWaWV3czogYW55KSB7XG5cdGZvciAobGV0IGkgPSAwOyBpIDwgYVZpZXdzLmxlbmd0aDsgaSsrKSB7XG5cdFx0aWYgKGFWaWV3c1tpXS5kZWZhdWx0UGF0aCkge1xuXHRcdFx0cmV0dXJuIGFWaWV3c1tpXS5kZWZhdWx0UGF0aDtcblx0XHR9XG5cdH1cbn07XG4iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUFBO0FBQUE7Ozs7OztFQUdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7RUFFTyxJQUFNQSx1QkFBdUIsR0FBRyxVQUFVQyxTQUFjLEVBQUVDLGlCQUFzQixFQUFFO0lBQ3hGLElBQUlELFNBQVMsSUFBSUEsU0FBUyxDQUFDRSxpQkFBaUIsS0FBSyxNQUFNLEVBQUU7TUFDeEQsT0FBTywyQkFBMkI7SUFDbkM7SUFDQSxJQUFJRixTQUFTLElBQUlBLFNBQVMsQ0FBQ0UsaUJBQWlCLEtBQUssU0FBUyxFQUFFO01BQzNELE9BQU9DLFFBQVEsQ0FBQyxDQUFDRixpQkFBaUIsQ0FBQ0csV0FBVyxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDdEU7SUFDQSxPQUFPQyxTQUFTO0VBQ2pCLENBQUM7RUFBQztFQUVLLElBQU1DLGNBQWMsR0FBRyxVQUFVQyxNQUFXLEVBQUU7SUFDcEQsS0FBSyxJQUFJQyxDQUFDLEdBQUcsQ0FBQyxFQUFFQSxDQUFDLEdBQUdELE1BQU0sQ0FBQ0UsTUFBTSxFQUFFRCxDQUFDLEVBQUUsRUFBRTtNQUN2QyxJQUFJRCxNQUFNLENBQUNDLENBQUMsQ0FBQyxDQUFDRSxXQUFXLEVBQUU7UUFDMUIsT0FBT0gsTUFBTSxDQUFDQyxDQUFDLENBQUMsQ0FBQ0UsV0FBVztNQUM3QjtJQUNEO0VBQ0QsQ0FBQztFQUFDO0VBQUE7QUFBQSJ9