deploy: abap2UI5/abap2UI5@0f155af

Author: github-actions[bot]

app/webapp/Component.js

@@ -16,9 +16,9 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server"
             z2ui5.oConfig.ComponentData = this.getComponentData();
 
             try {                                                                                                                                                                                                                                           
-                z2ui5.oLaunchpadService = await this.getService("ShellUIService");                                                                                                                                                                                                                                                                                                                                                                                       
-             } catch (e) {}  
-             
+                z2ui5.oLaunchpadService = await this.getService("ShellUIService");
+            } catch (e) {}  
+            
             let oVersionInfo = await VersionInfo.load();
             z2ui5.oConfig.UI5VersionInfo = {
                 version : oVersionInfo.version,

app/webapp/controller/App.controller.js

@@ -639,7 +639,7 @@ sap.ui.define("z2ui5/MultiInputExt", ["sap/ui/core/Control", "sap/m/Token", "sap
       let table = z2ui5.oView.byId(this.getProperty("MultiInputId"));
       if (!table) {
         try {
-          table = Core.byId(Element.getElementsByName(this.getProperty("MultiInputName"))[0].id.replace('-inner', ''));
+         // table = Core.byId(Element.getElementsByName(this.getProperty("MultiInputName"))[0].id.replace('-inner', ''));
         } catch (e) {
           return;
         }
@@ -667,8 +667,10 @@ sap.ui.define("z2ui5/MultiInputExt", ["sap/ui/core/Control", "sap/m/Token", "sap
 );
 
 sap.ui.define("z2ui5/CameraPicture" , [
-  "sap/ui/core/Control"
-], function (Control) {
+  "sap/ui/core/Control",
+  "sap/m/Dialog",
+  "sap/m/Button"
+], function (Control, Dialog, Button) {
   "use strict";
   return Control.extend("z2ui5.CameraPicture", {
       metadata: {
@@ -708,30 +710,30 @@ sap.ui.define("z2ui5/CameraPicture" , [
       onPicture: function (oEvent) {
 
           if (!this._oScanDialog) {
-              this._oScanDialog = new sap.m.Dialog({
+              this._oScanDialog = new Dialog({
                   title: "Device Photo Function",
                   contentWidth: "640px",
                   contentHeight: "480px",
                   horizontalScrolling: false,
                   verticalScrolling: false,
-                  stretchOnPhone: true,
+                  stretch: true,
                   content: [
-                      new sap.ui.core.HTML({
+                      new HTML({
                           id: this.getId() + 'PictureContainer',
                           content: '<video width="600px" height="400px" autoplay="true" id="zvideo">'
                       }),
-                      new sap.m.Button({
+                      new Button({
                           text: "Capture",
                           press: function (oEvent) {
                               this.capture();
                               this._oScanDialog.close();
                           }.bind(this)
                       }),
-                      new sap.ui.core.HTML({
+                      new HTML({
                           content: '<canvas hidden id="zcanvas" style="overflow:auto"></canvas>'
                       }),
                   ],
-                  endButton: new sap.m.Button({
+                  endButton: new Button({
                       text: "Cancel",
                       press: function (oEvent) {
                           this._oScanDialog.close();
@@ -759,7 +761,7 @@ sap.ui.define("z2ui5/CameraPicture" , [
 
       renderer: function (oRM, oControl) {
 
-          var oButton = new sap.m.Button({
+          var oButton = new Button({
               icon: "sap-icon://camera",
               text: "Camera",
               press: oControl.onPicture.bind(oControl),
@@ -817,7 +819,7 @@ sap.ui.define("z2ui5/Util", [], () => {
   "use strict";
   return {
     DateCreateObject: (s) => new Date(s),
-    DateAbapTimestampToDate: (sTimestamp) => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp),
+  //  DateAbapTimestampToDate: (sTimestamp) => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp), commented for UI5 2.x compatibility
     DateAbapDateToDateObject: (d) => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8)),
     DateAbapDateTimeToDateObject: (d, t = '000000') => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8), t.slice(0, 2), t.slice(2, 4), t.slice(4, 6)),
   };

app/webapp/controller/View1.controller.js

@@ -248,26 +248,40 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                         a.click();
                         break;
                     case 'CROSS_APP_NAV_TO_PREV_APP':
-                        oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
-                        oCrossAppNavigator.backToPreviousApp();
+                            sap.ui.require([
+                                "sap/ushell/Container"
+                              ], async (ushellContainer)  => {
+                               // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");     
+                                z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation"); 
+                                z2ui5.oCrossAppNavigator.backToPreviousApp();
+                              });
+                 
+                        //oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
+                        
                         break;
                     case 'CROSS_APP_NAV_TO_EXT':
-                        oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
-                        const hash = (oCrossAppNavigator.hrefForExternal({
-                            target: args[1],
-                            params: args[2]
-                        })) || "";
-                        if (args[3] === 'EXT') {
-                            let url = window.location.href.split('#')[0] + hash;
-                            //todo
-                            //URLHelper.redirect(url, true);
-                        } else {
-                            oCrossAppNavigator.toExternal({
-                                target: {
-                                    shellHash: hash
-                                }
-                            });
-                        }
+                        z2ui5.args = args;
+                        sap.ui.require([
+                            "sap/ushell/Container"
+                          ], async (ushellContainer)  => {
+                           // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");     
+                            z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation"); 
+                            const hash = (z2ui5.oCrossAppNavigator.hrefForExternal({
+                                target: z2ui5.args[1],
+                                params: z2ui5.args[2]
+                            })) || "";
+                            if (z2ui5.args[3] === 'EXT') {
+                                let url = window.location.href.split('#')[0] + hash;
+                                //todo
+                                //URLHelper.redirect(url, true);
+                            } else {
+                                z2ui5.oCrossAppNavigator.toExternal({
+                                    target: {
+                                        shellHash: hash
+                                    }
+                                });
+                            }
+                          });
                         break;
                     case 'LOCATION_RELOAD':
                         window.location = args[1];