[webgui] adjust generic openui5 panel

linev · linev · commit 4fbde627b852 · 2022-03-28T08:57:33.000+02:00
diff --git a/ui5/panel/Controller.js b/ui5/panel/Controller.js
@@ -1,7 +1,6 @@
 sap.ui.define([
-   'sap/ui/core/mvc/Controller',
-   'sap/ui/model/json/JSONModel'
-], function (Controller, JSONModel) {
+   'sap/ui/core/mvc/Controller'
+], function (Controller) {
    "use strict";
 
    return Controller.extend("rootui5.panel.Controller", {
@@ -13,18 +12,16 @@ sap.ui.define([
 
 
       onInit: function() {
-         var data = this.getView().getViewData();
+         let data = this.getView().getViewData();
 
-         if (data && data.handle) {
-            this.websocket = data.handle;
+         this.websocket = data?.handle;
+         if (this.websocket) {
             this.websocket.setReceiver(this); // redirect websocket handling on controller itself
             this.websocket.send("PANEL_READY"); // confirm panel creation, only then GUI can send commands
          }
 
          // TODO: use more specific API between Canvas and Panel
-         if (data && data.masterPanel) {
-            this.masterPanel = data.masterPanel;
-         }
+         this.masterPanel = data?.masterPanel;
 
          if (typeof this.onPanelInit == "function")
             this.onPanelInit();
diff --git a/ui5/panel/panel.html b/ui5/panel/panel.html
@@ -2,9 +2,8 @@
 <!DOCTYPE html>
 <html lang="en">
    <head>
-      <meta charset="UTF-8">
+      <meta charset="utf-8">
       <title>ROOT7 web panel</title>
-      <script type="text/javascript" src="jsrootsys/scripts/JSRoot.core.js"></script>
    </head>
 
    <style>
@@ -22,19 +21,17 @@
 
    <body>
       <div id="PanelDiv">
-         loading scripts...
       </div>
    </body>
 
-   <script type='text/javascript'>
+   <script type='module'>
 
-      JSROOT.connectWebWindow({
-         prereq_logdiv: "PanelDiv",
-         // openui5src: "jsroot",
-         // openui5src: "https://openui5.hana.ondemand.com/1.98.0/",
-         // openui5libs: "sap.ui.core, sap.ui.layout, sap.m",
+      import { connectWebWindow } from '/jsrootsys/modules/webwindow.mjs';
+      import { source_dir } from '/jsrootsys/modules/core.mjs';
+
+      connectWebWindow({
          first_recv: "SHOWPANEL:",
-         prereq2: "openui5" // components which can be loaded during connection establishing
+         ui5: true // components which can be loaded during connection establishing
       }).then(handle => {
 
          if (!handle || !sap) return false;
@@ -46,8 +43,8 @@
             let p = viewName.indexOf(".");
             if ((p > 1) && (p < viewName.length - 1)) {
                let tgtpath = "/currentdir/";
-               let pp = JSROOT.source_dir.indexOf("/jsrootsys/");
-               if (pp > 0) tgtpath = JSROOT.source_dir.slice(0,pp) + "/currentdir/";
+               let pp = source_dir.indexOf("/jsrootsys/");
+               if (pp > 0) tgtpath = source_dir.slice(0, pp) + tgtpath;
                let _paths = {};
                _paths[viewName.slice(0,p)] = tgtpath;
                console.log('Register module path', viewName.slice(0,p), ' as ', tgtpath);
