deploy: abap2UI5/abap2UI5@33e4df3

Author: github-actions[bot]

app/webapp/cc/Server.js

@@ -105,13 +105,15 @@ sap.ui.define(["sap/ui/core/BusyIndicator", "sap/m/MessageBox"
                     }
                     ; if (z2ui5.oResponse.PARAMS?.S_FOLLOW_UP_ACTION?.CUSTOM_JS) {
                         setTimeout(() => {
-                            let mParams = z2ui5.oResponse?.PARAMS.S_FOLLOW_UP_ACTION.CUSTOM_JS.split("'");
+                            for ( let i = 0; i < z2ui5.oResponse?.PARAMS.S_FOLLOW_UP_ACTION.CUSTOM_JS.length ; i++ ){
+                            let mParams = z2ui5.oResponse?.PARAMS.S_FOLLOW_UP_ACTION.CUSTOM_JS[i].split("'");
                             let mParamsEF = mParams.filter((val, index) => index % 2)
                             if (mParamsEF.length) {
                                 z2ui5.oController.eF.apply(undefined, mParamsEF);
                             } else {
                                 Function("return " + mParams[0])();
                             }
+                            }
                         }, 100);
                     };
                     z2ui5.oController.showMessage('S_MSG_TOAST', z2ui5.oResponse.PARAMS);

app/webapp/controller/App.controller.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
       };
 
       z2ui5.oController = new Controller();
-      z2ui5.oController.setApp(this.getView().byId("app"));
+      z2ui5.oApp = this.getView().byId("app");
 
       z2ui5.oControllerNest = new Controller();
       z2ui5.oControllerNest2 = new Controller();

app/webapp/controller/View1.controller.js

@@ -1,9 +1,9 @@
 sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/model/json/JSONModel",
     "sap/ui/core/BusyIndicator", "sap/m/MessageBox", "sap/m/MessageToast", "sap/ui/core/Fragment", "sap/m/BusyDialog",
-    "sap/ui/VersionInfo", "z2ui5/cc/Server",
+    "sap/ui/VersionInfo", "z2ui5/cc/Server",  "sap/ui/model/odata/v2/ODataModel",
 ],
     function (Controller, XMLView, JSONModel, BusyIndicator, MessageBox, MessageToast, Fragment, mBusyDialog, VersionInfo,
-        Server) {
+        Server,  ODataModel) {
         "use strict";
         return Controller.extend("z2ui5.controller.View1", {
 
@@ -242,12 +242,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                         }
                         break;
                     case 'SET_ODATA_MODEL':
-                        sap.ui.require([
-                            "sap/ui/model/odata/v2/ODataModel"
-                          ], async (ODataModel)  => {
+                    //    sap.ui.require([
+                     //       "sap/ui/model/odata/v2/ODataModel"
+                      //    ], async (ODataModel)  => {
                         var oModel = new ODataModel({  serviceUrl : args[1] });
                         z2ui5.oView.setModel( oModel , args[2] );
-                    });
+                 //   });
                         break;
                     case 'DOWNLOAD_B64_FILE':
                         var a = document.createElement("a");
@@ -455,14 +455,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                         }
                 }
             },
-            setApp(oApp) {
-                this._oApp = oApp;
-            },
             async displayView(xml, viewModel) {
                  let oview_model = new JSONModel(viewModel);
                  var oModel = oview_model;
                    if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
-                    oModel = z2ui5.oOwnerComponent.getModel(z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL);
+                    oModel = new ODataModel({  serviceUrl : z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL });
+                  //  oModel = z2ui5.oOwnerComponent.getModel(z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL);
                     }
                 z2ui5.oView = await XMLView.create({
                     definition: xml,
@@ -481,8 +479,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                 if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
                   z2ui5.oView.setModel(oview_model, "http");
                     }
-                this._oApp.removeAllPages();
-                this._oApp.insertPage(z2ui5.oView);
+                z2ui5.oApp.removeAllPages();
+                z2ui5.oApp.insertPage(z2ui5.oView);
             },
         })
     });

app/webapp/manifest.json

@@ -15,15 +15,6 @@
       "toolsId": "3a966e20-9635-4c28-8861-d1b66f79f1de"
     },
     "dataSources": {
-      "test": {
-        "uri": "/sap/opu/odata/DMO/API_TRAVEL_U_V2/",
-        "type": "OData",
-        "settings": {
-          "annotations": [],
-          "localUri": "localService/metadata.xml",
-          "odataVersion": "2.0"
-        }
-      },
       "http": {
         "uri": "/sap/bc/z2ui5",
         "type": "OData",
@@ -83,11 +74,6 @@
       }                                                                                                                                                                                                                                                        
     },          
     "models": {
-      "test": {
-        "dataSource": "test",
-        "preload": true,
-        "settings": {}
-      },
       "http": {
         "dataSource": "http",
         "preload": true,