deploy: abap2UI5/abap2UI5@c1ab4e6

Author: github-actions[bot]

app/webapp/Component.js

@@ -13,7 +13,8 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server"
             }
             this.getRouter().initialize();
             z2ui5.oRouter = this.getRouter();
-            this.setModel(Models.createDeviceModel(), "device");
+            z2ui5.oDeviceModel = Models.createDeviceModel();
+            this.setModel(z2ui5.oDeviceModel, "device");
 
             z2ui5.oConfig = {};
             z2ui5.oConfig.ComponentData = this.getComponentData();

app/webapp/controller/App.controller.js

@@ -5,7 +5,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 
     onInit: async function () {
 
-      z2ui5.oModel2 = this.getView().getModel("");
+      z2ui5.oOwnerComponent = this.getOwnerComponent();
       z2ui5.oConfig.pathname = this.getView().getModel("http").sServiceUrl;
       if (z2ui5?.checkLocal == true ) { 
           z2ui5.oConfig.pathname = window.location.href; 

app/webapp/controller/View1.controller.js

@@ -346,7 +346,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                 BusyIndicator.show();
                 z2ui5.oBody = {};
                 if (args[0][3] || z2ui5.oController == this ) {
-                    if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL == true ){
+                    if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
                         var oModel = z2ui5.oView.getModel( "http");
                     }else{ 
                         oModel = z2ui5.oView.getModel();
@@ -461,8 +461,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
             async displayView(xml, viewModel) {
                  let oview_model = new JSONModel(viewModel);
                  var oModel = oview_model;
-                   if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL == true){
-                    oModel = z2ui5.oModel2;
+                   if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
+                    oModel = z2ui5.oOwnerComponent.getModel(z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL);
                     }
                 z2ui5.oView = await XMLView.create({
                     definition: xml,
@@ -478,7 +478,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                     }
                 });
                 z2ui5.oView.setModel(z2ui5.oDeviceModel, "device");
-                if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL == true){
+                if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
                   z2ui5.oView.setModel(oview_model, "http");
                     }
                 this._oApp.removeAllPages();

app/webapp/manifest.json

@@ -15,7 +15,7 @@
       "toolsId": "3a966e20-9635-4c28-8861-d1b66f79f1de"
     },
     "dataSources": {
-      "mainService": {
+      "test": {
         "uri": "/sap/opu/odata/DMO/API_TRAVEL_U_V2/",
         "type": "OData",
         "settings": {
@@ -83,8 +83,8 @@
       }                                                                                                                                                                                                                                                        
     },          
     "models": {
-      "": {
-        "dataSource": "mainService",
+      "test": {
+        "dataSource": "test",
         "preload": true,
         "settings": {}
       },