@sapui5/sap.suite.ui.generic.template 1.130.1 → 1.131.0

package/src/sap/suite/ui/generic/template/lib/RetryAfterHandler.js

@@ -7,14 +7,24 @@ sap.ui.define(["sap/ui/base/Object",
     "sap/m/Text",
     "sap/m/library",
     "sap/ui/core/format/DateFormat",
-    "sap/ui/core/library"
-], function (BaseObject, extend, Formatting, Button, Dialog, ProgressIndicator, Text, mobileLibrary, DateFormat, coreLibrary) {
+    "sap/ui/core/library",
+    "sap/ui/core/Messaging",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/ui/model/json/JSONModel",
+    "sap/suite/ui/generic/template/genericUtilities/testableHelper"
+], function (BaseObject, extend, Formatting, Button, Dialog, ProgressIndicator, Text, mobileLibrary, DateFormat, coreLibrary, 
+    Messaging, Filter, FilterOperator, JSONModel, testableHelper) {
 	"use strict";
 
     /**
-     * This class handles the 503 error (service unavailable) response which includes "retry-after" header. 
+     * This class handles the 503 error (service unavailable) response.
      * 
-     * Whenever the server throws 503 error, it adds "retry-after" (minimum number of seconds need to be waited before the next server call)
+     * ///////////////////////////////////////
+     * Response includes "retry-after" header
+     * ///////////////////////////////////////
+     * 
+     * When the server throws 503 error, sometimes it adds "retry-after" (minimum number of seconds need to be waited before the next server call)
      * to the response header. The model intercepts the error and invokes the error handler registered on "setRetryAfterHandler" method.
      * Model takes care of converting the "retry-after" value to the Date value.
      * 
@@ -25,14 +35,27 @@ sap.ui.define(["sap/ui/base/Object",
      * - If the promise is rejected, it aborts the batch call.
      * 
      * Cases handled here.
-     * 1. When the retry after time is <= 600 seconds
+     * 1. When the retry after time is < 5 seconds
+     *      Shows the busy indicator until retry after time and retries the HTTP request automatically
+     * 2. When the retry after time is <= 600 seconds
      *      Opens up dialog with progress indicator. Once the retry after time is reached, the dialog is automatically closed and the action is retried.
-     * 2. When the retry after time is same day as today, navigate to message page 
+     * 3. When the retry after time is more than 600 seconds, navigate to message page
+     *    a. If the service will be available on same day as today
      *      (Message shown: We expect it to be available again at 7:00 AM)
-     * 3. When the retry after time is some other day in the same year, navigate to message page 
+     *    b. If the service will be available on different day in the same year
      *      (Message shown: We expect it to be available again on October 1 at 7:00 AM)
-     * 4. When the retry after time is in different year (Possibly Jan 01 of next year), navigate to message page 
+     *    c. If the service will be available on next year (Possibly Jan 01 of next year)
      *      (Message shown: We expect it to be available again on January 1, 2022 at 12:00 PM)
+     * 
+     * ///////////////////////////////////////////
+     * Response doesn't have "retry-after" header
+     * ///////////////////////////////////////////
+     * 
+     * When the 503 error response doesn't have "retry-after" header, the model adds a new technical message to the message model.
+     * The message's technical detail contains "statusCode" value as 503. 
+     * 
+     * If such message is added to message model, we need to intercept that and navigate to message page.
+     * The message page would show the message "Please try again later."
      */
 
 	function getMethods(oTemplateContract, oAppComponent) {
@@ -47,9 +70,12 @@ sap.ui.define(["sap/ui/base/Object",
         //  Shortcut for getting i18n text
         var getText = oTemplateContract.getText;
         
-        // Get user's time pattern. If no pattern available on user's settings, use "HH:mm a"
-        var sTimePattern = Formatting.getTimePattern("short") || "HH:mm a";
+        // Get user's time pattern. If no pattern available on user's settings, use "hh:mm a"
+        var sTimePattern = Formatting.getTimePattern("short") || "hh:mm a";
 
+        /**
+         * Section handles retry-after header
+         */
         function fnRetryAfterHandler (oError) {
             var sErrorMessage = oError.message;
             var sAdditionalMessage;
@@ -64,19 +90,29 @@ sap.ui.define(["sap/ui/base/Object",
             var iDifferenceInSeconds = Math.ceil(iDifferenceInMilliSeconds / 1000);
 
             return new Promise((fnResolve, fnReject) => {
-                var sMessagePageText = null,
-                    sMessagePageDescription = null;
-                if (iDifferenceInSeconds <= 600) {
-                    fnOpenAutoRetryDialog(oRetryAfterDate.getTime(), iDifferenceInSeconds, fnResolve, fnReject);
+                if (iDifferenceInSeconds < 5) {
+                    fnShowBusyIndicator(iDifferenceInSeconds, fnResolve);
+                } else if (iDifferenceInSeconds <= 600) {
+                    fnOpenAutoRetryDialog(oNow, oRetryAfterDate, iDifferenceInSeconds, sAdditionalMessage, fnResolve, fnReject);
                 } else {
-                    sMessagePageText = getText("ST_GENERIC_503_SERVICE_UNAVAILABLE");
-                    sMessagePageDescription = fnGetErrorMessageWithTime(oNow, oRetryAfterDate);
-                    fnNavigateToMessagePage(sMessagePageText, sMessagePageDescription, sAdditionalMessage);
+                    fnNavigateToMessagePage(oNow, oRetryAfterDate, sAdditionalMessage);
                     fnReject();
                 }
             });
         }
 
+        function fnShowBusyIndicator(iSecondsToRetryAfter, fnResolveRetry) {
+            var oBusyHandlingPromise = new Promise(function (fnResolve) {
+                setTimeout(function () {
+                    fnResolve();
+                }, iSecondsToRetryAfter * 1000);
+            });
+            oTemplateContract.oBusyHelper.setBusy(oBusyHandlingPromise, undefined, undefined, true);
+            oBusyHandlingPromise.then(function() {
+                fnResolveRetry();
+            });
+        }
+
         /**
          * Opens the auto retry dialog. Dialog contains
          *   - a text containing the number of seconds remaining to retry the action
@@ -88,45 +124,53 @@ sap.ui.define(["sap/ui/base/Object",
          * 
          * If the user presses "Cancel" button, it opens a new confirmation dialog which does the following:
          *   - if user presses "Retry" button, it closes the confirmation dialog and opens the auto retry dialog.
-         *   - if user presses "Cancel" button, it rejects the promise for retry (Retry operation will be aborted)
+         *   - if user presses "Cancel" button, it rejects the promise for retry (Retry operation will be aborted) and navigates to message page
          * 
-         * @param {number} iRetryAfterTimeInMillis Retry after time in milliseconds
-         * @param {number} iSecondsToRetryAfter Number of seconds to reach the retry-after time from now
-         * @param {function} fnResolve Resolve function for retry promise 
-         * @param {function} fnReject Reject function for retry promise
+         * @param {Date} oNow Current date
+         * @param {Date} oRetryAfterDate Retry after date
+         * @param {number} iInitialSecondsToRetryAfter Number of seconds to reach the retry-after time from now
+         * @param {function} fnResolveRetry Resolve function for retry promise 
+         * @param {function} fnRejectRetry Reject function for retry promise
          */
-        function fnOpenAutoRetryDialog (iRetryAfterTimeInMillis, iSecondsToRetryAfter, fnResolve, fnReject) {
+        function fnOpenAutoRetryDialog (oNow, oRetryAfterDate, iInitialSecondsToRetryAfter, sAdditionalMessage, fnResolveRetry, fnRejectRetry) {
+            var iRetryAfterTime = oRetryAfterDate.getTime();
+            var oAutoRetryModel = new JSONModel({
+                lapsedSeconds: 0
+            });
             var oAutoRetryDialog = null;
             var oConfirmRetryDialog = null;
             var oAutoRetryProgressIndicator = null;
             var oAutoRetryText = null;
+            var iAutoRetryInterval = -1;
 
             function getAutoRetryText (iSeconds) {
                 return getText("ST_GENERIC_503_SERVICE_UNAVAILABLE") + " " + getText("ST_GENERIC_503_AUTO_RETRY_MSG", [iSeconds]);
             }
-
-            function updateAutoRetryStatus (iLapsedSeconds) {
-                var iSecondsUntilRetryAfter = iSecondsToRetryAfter - iLapsedSeconds;
-                oAutoRetryProgressIndicator.setPercentValue(iLapsedSeconds / iSecondsToRetryAfter * 100);
-                oAutoRetryText.setText( getAutoRetryText(iSecondsUntilRetryAfter) );
-
-                // Updating the progress indicator state every second
-                if (iRetryAfterTimeInMillis > new Date().getTime()) {
-                    setTimeout(() => {
-                        updateAutoRetryStatus(iLapsedSeconds + 1);
-                    }, 1000);
-                }
-            }
-
+            // Creating the text (which shows the remaining time) and binding with model
             oAutoRetryText = new Text({
-                text: getAutoRetryText(iSecondsToRetryAfter)
+                text: getAutoRetryText(iInitialSecondsToRetryAfter)
             });
-
+            oAutoRetryText.setModel(oAutoRetryModel);
+            oAutoRetryText.bindText({
+                path: "/lapsedSeconds",
+                formatter: function (iLapsedSeconds) {
+                    var iSecondsUntilRetryAfter = iInitialSecondsToRetryAfter - iLapsedSeconds;
+                    return getAutoRetryText(iSecondsUntilRetryAfter);
+                }
+            });
+            // Progress indicator 
             oAutoRetryProgressIndicator = new ProgressIndicator({
                 percentValue : 0,
                 state : ValueState.None
             });
-
+            oAutoRetryProgressIndicator.setModel(oAutoRetryModel);
+            oAutoRetryProgressIndicator.bindProperty("percentValue", {
+                path: "/lapsedSeconds",
+                formatter: function (iLapsedSeconds) {
+                    return iLapsedSeconds / iInitialSecondsToRetryAfter * 100;
+                }
+            });
+            // Auto retry dialog which contains the above text and progress indicator
             oAutoRetryDialog = new Dialog({
                 type : DialogType.Message,
 				state : ValueState.Warning,
@@ -144,7 +188,7 @@ sap.ui.define(["sap/ui/base/Object",
                     })
                 ]
             });
-
+            // Confirmation dialog
             oConfirmRetryDialog = new Dialog({
                 type : DialogType.Message,
 				state : ValueState.Warning,
@@ -166,38 +210,66 @@ sap.ui.define(["sap/ui/base/Object",
                         text: getText("CANCEL"),
                         press: function () {
                             // Abort retry and close the confirmation dialog
-                            fnReject(new Error("Request(s) canceled by user"));
+                            fnRejectRetry(new Error("Request(s) canceled by user"));
                             oConfirmRetryDialog.close();
+                            // Clear the interval for updating the auto-retry model
+                            clearInterval(iAutoRetryInterval);
+                            // Navigate to message page
+                            fnNavigateToMessagePage(oNow, oRetryAfterDate, sAdditionalMessage);
                         }
                     })
                 ]
             });
 
-            //Start the progress indicator and open the auto-retry dialog
-            updateAutoRetryStatus(0);
+            // Open the dialog
             oAutoRetryDialog.open();
-            // Once the retry time is reached, resolve the promise which will trigger retry
-            // and close the dialog.
-            setTimeout(function () {
-                fnResolve();
-                oAutoRetryDialog.close();
-            }, iSecondsToRetryAfter * 1000);
+            // Updates the model on every 1 second
+            var iAutoRetryInterval = setInterval(function () {
+                var iLapsedSeconds = oAutoRetryModel.getProperty("/lapsedSeconds");
+                oAutoRetryModel.setProperty("/lapsedSeconds", iLapsedSeconds + 1);
+                // When the retry after time is reached
+                //   1. Clear the interval
+                //   2. Resolve the promise to retry the request
+                //   3. Close the auto retry dialog
+                if (new Date().getTime() > iRetryAfterTime) {
+                    clearInterval(iAutoRetryInterval);
+                    fnResolveRetry();
+                    oAutoRetryDialog.close();
+                }
+            }, 1000);
         }
 
-        function fnNavigateToMessagePage (sText, sDescription, sAdditionalMessage) {
+        /**
+         * This function navigates the user to message page.
+         * - The message page's text is a constant
+         * - The description is calculated based on the retry after time
+         * 
+         * @param {Date} oNow Current date
+         * @param {Date} oRetryAfterDate Retry after date
+         * @param {string} sAdditionalMessage Additional message to be shown below the description
+         */
+        function fnNavigateToMessagePage (oNow, oRetryAfterDate, sAdditionalMessage) {
             var aAdditionalContent = [];
             if (sAdditionalMessage) {
                 aAdditionalContent.push(new Text({text: sAdditionalMessage}));
             }
+
             oTemplateContract.oNavigationControllerProxy.navigateToMessagePage({
-                title: getText("ST_GENERIC_ERROR_TITLE"),
-                text: sText,
                 messageType: IllustratedMessageType.UnableToLoad,
-                description: sDescription,
+                title: getText("ST_GENERIC_ERROR_TITLE"),
+                text: getText("ST_GENERIC_503_SERVICE_UNAVAILABLE"),
+                description: fnGetErrorMessageWithTime(oNow, oRetryAfterDate),
                 additionalContent: aAdditionalContent
             });
         }
 
+        /**
+         * It derives the retry after message based on the time difference between the current date and retry after date.
+         * 
+         * @param {Date} oNow Current date
+         * @param {Date} oRetryAfterDate Retry after date
+         * @returns {string} Message with the retry after date/time
+         */
         function fnGetErrorMessageWithTime (oNow, oRetryAfterDate) {
             var sResultMessage = null;
             // Date format varies from case to case
@@ -235,6 +307,34 @@ sap.ui.define(["sap/ui/base/Object",
             var oModel = oAppComponent.getModel();
             oModel.setRetryAfterHandler(fnRetryAfterHandler);
         }
+
+        /**
+         * When the response doesn't have "retry-after" header
+         */
+        var oMessageModel = Messaging.getMessageModel();
+        var a503MessageFilters = [
+            new Filter("technical", FilterOperator.EQ, true), // technical message
+            new Filter("technicalDetails/statusCode", FilterOperator.EQ, 503) // status code as 503
+        ];
+        var oMessageListBinding = oMessageModel.bindList("/", null, null, a503MessageFilters);
+        oMessageListBinding.attachChange((oEvent) => {
+            var oMessageBinding = oEvent.getSource();
+            // Navigate to message page when
+            // 1. There's exactly one message with the status code 503 (and)
+            // 2. There's exactly one message present in the message model
+            if (oMessageBinding.getLength() === 1 && oMessageModel.getData()?.length === 1) {
+                oTemplateContract.oNavigationControllerProxy.navigateToMessagePage({
+                    messageType: IllustratedMessageType.UnableToLoad,
+                    title: getText("ST_GENERIC_ERROR_TITLE"),
+                    text: getText("ST_GENERIC_503_SERVICE_UNAVAILABLE"),
+                    description: getText("ST_GENERIC_503_RETRY_MSG_TIME_UNKNOWN")
+                });
+            }
+        });
+
+        /* eslint-disable */
+        testableHelper.testable(fnGetErrorMessageWithTime, "fnGetErrorMessageWithTime");
+        /* eslint-enable */
         
         return {
             registerRetryAfterHandler: fnRegisterRetryAfterHandler

package/src/sap/suite/ui/generic/template/lib/SideEffectUtil.js

@@ -138,11 +138,14 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 	 * Returns the EntitySet name, EntityType name, PropertyName for a given link field
 	 * @param {sap.ui.model.odata.ODataMetaModel.EntitySet} oEntitySet
 	 * @param {object} oTarget
+	 * @param {string} sFieldName
 	 */
-	function fnGetPropsForLinkFields (oEntitySet, oTarget) {
-		var sLinkProperty = oTarget && oTarget.Value && oTarget.Value.Path;
-		if (!sLinkProperty) {
-			return null;
+	function fnGetPropsForLinkFields (oEntitySet, oTarget, sFieldName) {
+		var sLinkProperty;
+		if (oTarget && oTarget.Value && oTarget.Value.Path){
+			sLinkProperty = oTarget.Value.Path;
+		} else {
+			sLinkProperty = oTarget.Target.AnnotationPath.split("/")[0] + "/" + sFieldName;
 		}
 		var oCustomData = {
 			"sEntitySetName": oEntitySet.name,
@@ -174,6 +177,7 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 				return;
 			}
 
+			var oControl = oLink;
 			var oEntityType = oMetaModel.getODataEntityType(sEntityTypeName);
 			var oEntitySet = oMetaModel.getODataEntitySet(sEntitySetName);
 			var oProperty = metadataAnalyser.getPropertyMetadata(oMetaModel, sEntityTypeName, sLinkProperty);
@@ -186,9 +190,20 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 				}
 			};
 
-			//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata, reads the Side Effect annotations configured for it 
-			//and assigns the fieldGroupID accordingly.
-			SharedUtil.applyFieldGroupIDs(oLink, oMetaData);
+			if (sLinkProperty.includes("/")){
+				while (!oControl.isA("sap.ui.comp.smartform.Group")) {
+					oControl = oControl.getParent();
+				}
+				//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata
+				//It then reads the Side Effect annotations configured for it, calculates fieldGroupIds and assigns them to the field
+				
+				//For navigation path link fields, we pass the oLink's parent Group control's binding context when calculating the fieldGroupIds
+				//This makes sure the calculated fieldGroupIds are consistent with the other source fields
+				SharedUtil.applyFieldGroupIDs(oLink, oMetaData, null, oControl.getBindingContext());
+			} else {
+				//For non navigation path link fields, we just pass the oLink along with its metadata
+				SharedUtil.applyFieldGroupIDs(oLink, oMetaData);
+			}
 		}
 	}
 

package/src/sap/suite/ui/generic/template/lib/StableIdDefinition.js

@@ -524,7 +524,10 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError"],functio
 			TableColumn: {
 				DataField: {
 					parameters: ["sSmartTableId", "sProperty"],
-					value: function(oParams){return oParams.sSmartTableId + "-" + oParams.sProperty.replace("/", "_");}
+					// '/' is replaced by '_' instead of encoding it to match the logic in the SmartTable
+					// replaceAll function must be used to replace all occurrences of '/' in the property name
+					// not doing so right now, as it is not breaking anything
+					value: function (oParams) { return oParams.sSmartTableId + "-" + oParams.sProperty.replace("/", "_"); }
 				},
 				DataFieldWithNavigationPath: {
 					parameters: ["sSmartTableId", "sProperty", "sTarget"]

package/src/sap/suite/ui/generic/template/lib/TemplateAssembler.js

@@ -6,25 +6,43 @@
 //   Note that this method cannot be used by any other class.
 // - getExtensionAPIPromise provides access to the instance of the extensionAPI suitable for a certain control
 
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
-		"sap/ui/core/mvc/OverrideExecution",
-		"sap/ui/core/mvc/View",
-		"sap/ui/model/base/ManagedObjectModel",
-		"sap/suite/ui/generic/template/lib/TemplateViewController",
-		"sap/suite/ui/generic/template/lib/TemplateComponent",
-		"sap/suite/ui/generic/template/lib/CRUDManager",
-		"sap/suite/ui/generic/template/lib/CommonUtils",
-		"sap/suite/ui/generic/template/lib/ComponentUtils",
-		"sap/suite/ui/generic/template/lib/CommonEventHandlers",
-		"sap/suite/ui/generic/template/genericUtilities/testableHelper",
-		"sap/suite/ui/generic/template/support/lib/CommonMethods",
-		"sap/suite/ui/generic/template/genericUtilities/FeLogger",
-		"sap/base/util/deepExtend",
-		"sap/suite/ui/generic/template/lib/presentationControl/PresentationControlHandlerFactory",
-		"sap/suite/ui/generic/template/lib/info/InfoObjectHandler",
-		"sap/m/IllustratedMessageType"
-], function(ControllerExtension, OverrideExecution, View, ManagedObjectModel, TemplateViewController, TemplateComponent, CRUDManager, CommonUtils,
-			ComponentUtils, CommonEventHandlers, testableHelper, CommonMethods, FeLogger, deepExtend, PresentationControlHandlerFactory, InfoObjectHandler, IllustratedMessageType) {
+sap.ui.define([
+	"sap/ui/core/mvc/ControllerExtension",
+	"sap/ui/core/mvc/OverrideExecution",
+	"sap/ui/core/mvc/View",
+	"sap/ui/model/base/ManagedObjectModel",
+	"sap/suite/ui/generic/template/lib/TemplateViewController",
+	"sap/suite/ui/generic/template/lib/TemplateComponent",
+	"sap/suite/ui/generic/template/lib/CRUDManager",
+	"sap/suite/ui/generic/template/lib/CommonUtils",
+	"sap/suite/ui/generic/template/lib/ComponentUtils",
+	"sap/suite/ui/generic/template/lib/CommonEventHandlers",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
+	"sap/base/util/deepExtend",
+	"sap/suite/ui/generic/template/lib/presentationControl/PresentationControlHandlerFactory",
+	"sap/suite/ui/generic/template/lib/info/InfoObjectHandler",
+	"sap/m/IllustratedMessageType",
+	"sap/suite/ui/generic/template/lib/ViewCreationHelper"
+], function(
+	ControllerExtension,
+	OverrideExecution,
+	View,
+	ManagedObjectModel,
+	TemplateViewController,
+	TemplateComponent,
+	CRUDManager,
+	CommonUtils,
+	ComponentUtils,
+	CommonEventHandlers,
+	testableHelper,
+	FeLogger,
+	deepExtend,
+	PresentationControlHandlerFactory,
+	InfoObjectHandler,
+	IllustratedMessageType,
+	ViewCreationHelper
+) {
 			"use strict";
 	        var oLogger = new FeLogger("lib.TemplateAssembler").getLogger();
 
@@ -378,28 +396,8 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
 						var oComponentRegistryEntry = oComponentData.registryEntry;
 						var oAppRegistryEntry = getAppRegistryEntry(oComponentRegistryEntry.oAppComponent);
 						var oTemplateContract = oAppRegistryEntry.oTemplateContract;
-						var oTreeNode = oAppRegistryEntry.oTemplateContract.mRoutingTree[oComponentRegistryEntry.route];						
-						oComponentRegistryEntry.viewRegistered = new Promise(function(fnResolve, fnReject) {
-							// Note: oError is faulty in regular situations
-							oComponentRegistryEntry.fnViewRegisteredResolve = function(oError){
-								if (oError){
-									oComponentRegistryEntry.fnViewRegisteredResolve = Function.prototype;
-									fnReject(oError);
-								} else {
-									delete oComponentRegistryEntry.fnViewRegisteredResolve;
-									fnResolve();
-								}
-							};
-						});
-						oComponentRegistryEntry.oViewRenderedPromise = new Promise(function(fnResolve) {
-							oComponentRegistryEntry.fnViewRenderdResolve = fnResolve;
-						});
-						oComponentRegistryEntry.oViewRenderedPromise.then(function () {
-							// Application status needs to be handled here to support use cases where Diagnostics Tool gets loaded after the app itself.
-							CommonMethods.setApplicationStatus(CommonMethods.mApplicationStatus.RENDERED);
-							// When view rendering has finished, publish global event "GetData" at channel "elements".
-							CommonMethods.publishEvent("elements", "ViewRendered", {});
-						});
+						var oTreeNode = oAppRegistryEntry.oTemplateContract.mRoutingTree[oComponentRegistryEntry.route];
+						ViewCreationHelper.initializeViewCreation(oComponentRegistryEntry);
 						oComponentRegistryEntry.componentName = sComponentNameFull;
 						oComponentRegistryEntry.oComponent = this;
 						oComponentRegistryEntry.aKeys = [];

package/src/sap/suite/ui/generic/template/lib/ViewCreationHelper.js

@@ -0,0 +1,39 @@
+sap.ui.define([
+    "sap/suite/ui/generic/template/support/lib/CommonMethods"
+], function(CommonMethods) {
+    "use strict";
+
+    // This class contain methods which plays role in view creation of Template Component.
+    return {
+        initializeViewCreation: function(oComponentRegistryEntry) {
+            // Set the creation view started flag to false, to indicate that the view creation has not started yet.
+            oComponentRegistryEntry.createViewStarted = false;
+
+            // Create a promise for the view registration. This promise will be resolved when the view is registered.
+            oComponentRegistryEntry.viewRegistered = new Promise(function(fnResolve, fnReject) {
+                // Note: oError is faulty in regular situations
+                oComponentRegistryEntry.fnViewRegisteredResolve = function(oError){
+                    if (oError){
+                        oComponentRegistryEntry.fnViewRegisteredResolve = Function.prototype;
+                        fnReject(oError);
+                    } else {
+                        delete oComponentRegistryEntry.fnViewRegisteredResolve;
+                        fnResolve();
+                    }
+                };
+            });
+
+            // Create a promise for the view rendering. This promise will be resolved when the view is rendered.
+            oComponentRegistryEntry.oViewRenderedPromise = new Promise(function(fnResolve) {
+                oComponentRegistryEntry.fnViewRenderdResolve = fnResolve;
+                // Application status needs to be handled here to support use cases where Diagnostics Tool gets loaded after the app itself.
+                CommonMethods.setApplicationStatus(CommonMethods.mApplicationStatus.RENDERED);
+                // When view rendering has finished, publish global event "GetData" at channel "elements".
+                CommonMethods.publishEvent("elements", "ViewRendered", {});
+            });
+
+            // Returns view registered promise as the view creation is completed and process can continue.
+            return oComponentRegistryEntry.viewRegistered;
+        }
+    };
+});

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -82,6 +82,7 @@ sap.ui.define([
                         sortable: false,
                         codeList : bIsCodeListRequired,
                         type: sTokenType,
+                        unit: oProperty["sap:unit"] || "",
                         required: oProperty["sap:required-in-filter"] ? true : false
                     };
                 }
@@ -372,13 +373,8 @@ sap.ui.define([
 			var oSmartFilterbar = oState.oSmartFilterbar;
             fnValueHelpPromiseResolve = oEvent.getParameter("resolve");
 			oSmartFilterbar.associateValueLists();
-			var oInputField =  oSmartFilterbar.getAllFilterItems().find(function(oFilterItem) {
-				if (oFilterItem.getName() === oEvent.getParameter("key")) {
-					return oFilterItem;
-				}
-			});
             try {
-                oInputField.getControl().fireValueHelpRequest();
+                oSmartFilterbar.openValueHelpRequestForFilterItem(oEvent.getParameter("key"));
             } catch (error) {
                 oLogger.error("Value help cannot be triggered for the field " + oEvent.getParameter("key"));
             }

package/src/sap/suite/ui/generic/template/lib/i18n/i18n.properties

@@ -510,9 +510,28 @@ ST_GENERIC_503_RETRY_MSG_SAME_DAY=We expect it to be available again at {0}.
 ST_GENERIC_503_RETRY_MSG_OTHER_DAY=We expect it to be available again on {0} at {1}.
 
 # XMSG: Description of the 503 Error Message Page (Unknown time)
-ST_GENERIC_503_RETRY_MSG_TIME_UNKNWON=Please try again later.
+ST_GENERIC_503_RETRY_MSG_TIME_UNKNOWN=Please try again later.
 
 #XMSG: Label for the error message provided by server
 ST_GENERIC_503_SOURCE_MESSAGE=Source message:
 
 #---End of final block: texts to be redefined by the application ----------------------------------------
+
+#---Texts RTA for Adaptation Projects"----------------------------------------
+
+# XTIT: Title text on Configurations dialog for Table
+RTA_CONFIGURATION_TITLE_TABLE=Configure Table
+
+# XTIT: Title text on Configurations dialog for List Report
+RTA_CONFIGURATION_TITLE_LIST_REPORT=Configure List Report
+
+
+# XMSG: Warning message text in Configurations dialog
+RTA_CONFIGURATION_INFO_MESSAGE=Some settings can only be applied to certain table types. Changes will only be visible after the application reloads.
+
+# XBUT: Button text for Cancel on Configurations dialog
+RTA_CONFIGURATION_CANCEL=Cancel
+
+# XBUT: Button text for Apply on Configurations dialog
+RTA_CONFIGURATION_APPLY=Apply
+

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_ar.properties

@@ -205,6 +205,8 @@ ST_EASY_FILTER_INPUT_PLACEHOLDER=\u0623\u062F\u062E\u0644 \u0627\u0633\u062A\u06
 ST_EASY_FILTER_GO_BUTTON_TEXT=\u0627\u0646\u062A\u0642\u0627\u0644
 
 
+ST_AI_EE_BUTTON_LABEL=\u0625\u0646\u0634\u0627\u0621 \u062A\u0648\u0636\u064A\u062D
+
 
 
 ST_GENERIC_DRAFT_LOCKED_BY_USER=\u0642\u0627\u0645 \u0645\u0633\u062A\u062E\u062F\u0645 \u0622\u062E\u0631 \u0628\u062A\u062D\u0631\u064A\u0631 \u0647\u0630\u0627 \u0627\u0644\u0643\u0627\u0626\u0646 \u0628\u062F\u0648\u0646 \u062D\u0641\u0638 \u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A\: \n{1} \n\u0641\u064A \u062D\u0627\u0644\u0629 \u0627\u0644\u0645\u062A\u0627\u0628\u0639\u0629\u060C \u0641\u0633\u064A\u062A\u0645 \u0641\u0642\u062F\u0627\u0646 \u0623\u064A \u062A\u063A\u064A\u064A\u0631\u0627\u062A.
@@ -316,3 +318,33 @@ DIALOG_ACTION_BUTTON_NEW_ACTION_FOR_CREATE=\u0645\u062A\u0627\u0628\u0639\u0629
 
 CONTENT_SWITCH=\u0645\u0641\u062A\u0627\u062D \u062A\u0628\u062F\u064A\u0644 \u0627\u0644\u0645\u062D\u062A\u0648\u0649
 
+
+ST_GENERIC_503_SERVICE_UNAVAILABLE=\u0639\u0630\u0631\u064B\u0627\u060C \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 \u063A\u064A\u0631 \u0645\u062A\u0648\u0641\u0631\u0629 \u0645\u0624\u0642\u062A\u064B\u0627.
+
+ST_GENERIC_503_AUTO_RETRY_MSG=\u0623\u0639\u062F \u0627\u0644\u0645\u062D\u0627\u0648\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u064B\u0627 \u062E\u0644\u0627\u0644 {0} \u0645\u0646 \u0627\u0644\u062B\u0648\u0627\u0646\u064A.
+
+ST_GENERIC_503_CANCEL_RETRY=\u0639\u0630\u0631\u064B\u0627\u060C \u0644\u0627 \u062A\u0632\u0627\u0644 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 \u063A\u064A\u0631 \u0645\u062A\u0648\u0641\u0631\u0629. \u0647\u0644 \u062A\u0631\u064A\u062F \u0625\u0639\u0627\u062F\u0629 \u0645\u062D\u0627\u0648\u0644\u0629 \u0627\u0644\u0625\u062C\u0631\u0627\u0621 \u0623\u0648 \u0625\u0644\u063A\u0627\u0624\u0647\u061F
+
+RETRY=\u0625\u0639\u0627\u062F\u0629 \u0627\u0644\u0645\u062D\u0627\u0648\u0644\u0629
+
+ST_GENERIC_503_RETRY_MSG_SAME_DAY=\u0646\u062A\u0648\u0642\u0639 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0645\u062A\u0648\u0641\u0631\u064B\u0627 \u0645\u0631\u0629 \u0623\u062E\u0631\u0649 \u0641\u064A {0}.
+
+ST_GENERIC_503_RETRY_MSG_OTHER_DAY=\u0646\u062A\u0648\u0642\u0639 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0645\u062A\u0648\u0641\u0631\u064B\u0627 \u0645\u0631\u0629 \u0623\u062E\u0631\u0649 \u0641\u064A {0} \u0641\u064A {1}.
+
+ST_GENERIC_503_RETRY_MSG_TIME_UNKNOWN=\u0627\u0644\u0631\u062C\u0627\u0621 \u0627\u0644\u0645\u062D\u0627\u0648\u0644\u0629 \u0645\u0631\u0629 \u0623\u062E\u0631\u0649 \u0644\u0627\u062D\u0642\u064B\u0627.
+
+ST_GENERIC_503_SOURCE_MESSAGE=\u0631\u0633\u0627\u0644\u0629 \u0627\u0644\u0645\u0635\u062F\u0631\:
+
+
+
+RTA_CONFIGURATION_TITLE_TABLE=\u062A\u0643\u0648\u064A\u0646 \u0627\u0644\u062C\u062F\u0648\u0644
+
+RTA_CONFIGURATION_TITLE_LIST_REPORT=\u062A\u0643\u0648\u064A\u0646 \u062A\u0642\u0631\u064A\u0631 \u0627\u0644\u0642\u0627\u0626\u0645\u0629
+
+
+RTA_CONFIGURATION_INFO_MESSAGE=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u0637\u0628\u064A\u0642 \u0628\u0639\u0636 \u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0625\u0644\u0627 \u0639\u0644\u0649 \u0623\u0646\u0648\u0627\u0639 \u062C\u062F\u0627\u0648\u0644 \u0645\u0639\u064A\u0646\u0629. \u0648\u0644\u0646 \u062A\u0643\u0648\u0646 \u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A \u0645\u0631\u0626\u064A\u0629 \u0625\u0644\u0627 \u0628\u0639\u062F \u0625\u0639\u0627\u062F\u0629 \u062A\u062D\u0645\u064A\u0644 \u0627\u0644\u062A\u0637\u0628\u064A\u0642.
+
+RTA_CONFIGURATION_CANCEL=\u0625\u0644\u063A\u0627\u0621
+
+RTA_CONFIGURATION_APPLY=\u062A\u0637\u0628\u064A\u0642
+