From 333b23378dcfe02258e419997969d10812d06ea9 Mon Sep 17 00:00:00 2001 From: werner daehn Date: Sun, 16 Feb 2025 19:07:35 +0100 Subject: [PATCH] Separate status page --- WebContent/Controller.controller.js | 3 -- WebContent/View.view.xml | 43 ++------------------- WebContent/ui5/Status.controller.js | 11 ++++++ WebContent/ui5/Status.html | 35 +++++++++++++++++ WebContent/ui5/Status.view.xml | 60 +++++++++++++++++++++++++++++ WebContent/ui5/lib/RulesToolPage.js | 6 +++ docker/Dockerfile | 2 +- docker/tomcat-users-orig.xml | 45 ++++++++++++++++++++++ pom.xml | 2 +- 9 files changed, 163 insertions(+), 44 deletions(-) create mode 100644 WebContent/ui5/Status.controller.js create mode 100644 WebContent/ui5/Status.html create mode 100644 WebContent/ui5/Status.view.xml create mode 100644 docker/tomcat-users-orig.xml diff --git a/WebContent/Controller.controller.js b/WebContent/Controller.controller.js index 99dd016..a18ea70 100644 --- a/WebContent/Controller.controller.js +++ b/WebContent/Controller.controller.js @@ -4,9 +4,6 @@ sap.ui.define([ "sap/ui/core/mvc/Controller"], function(Controller) { return Controller.extend("io.rtdi.bigdata.rulesservice.Controller", { onInit : function() { - var oModel = new sap.ui.model.json.JSONModel(); - oModel.loadData("./rest/config/service"); - this.getView().setModel(oModel); } }); diff --git a/WebContent/View.view.xml b/WebContent/View.view.xml index e04fce2..3156da4 100644 --- a/WebContent/View.view.xml +++ b/WebContent/View.view.xml @@ -67,47 +67,12 @@ - - - - - - - - - - - - - + - - - - - + + + diff --git a/WebContent/ui5/Status.controller.js b/WebContent/ui5/Status.controller.js new file mode 100644 index 0000000..750bb4c --- /dev/null +++ b/WebContent/ui5/Status.controller.js @@ -0,0 +1,11 @@ +sap.ui.define(["sap/ui/core/mvc/Controller"], +function(Controller) {"use strict"; +return Controller.extend("io.rtdi.bigdata.rulesservice.ui5.Status", { + onInit : function() { + var oModel = new sap.ui.model.json.JSONModel(); + oModel.loadData("../rest/config/service"); + this.getView().setModel(oModel); + } +}); +}); + diff --git a/WebContent/ui5/Status.html b/WebContent/ui5/Status.html new file mode 100644 index 0000000..7a82967 --- /dev/null +++ b/WebContent/ui5/Status.html @@ -0,0 +1,35 @@ + + + + + + Topics and rules + + + + + + +

Loading OpenUI5 from here

+ + + diff --git a/WebContent/ui5/Status.view.xml b/WebContent/ui5/Status.view.xml new file mode 100644 index 0000000..43c16ef --- /dev/null +++ b/WebContent/ui5/Status.view.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/ui5/lib/RulesToolPage.js b/WebContent/ui5/lib/RulesToolPage.js index c0bb19c..180b400 100644 --- a/WebContent/ui5/lib/RulesToolPage.js +++ b/WebContent/ui5/lib/RulesToolPage.js @@ -49,6 +49,12 @@ sap.ui.define([ icon: "sap-icon://wrench", href: "./Config.html", tooltip: "Configure the connections" + }), + new sap.tnt.NavigationListItem({ + text: "Config", + icon: "sap-icon://order-status", + href: "./Status.html", + tooltip: "Status of all rules" }) ]} ) diff --git a/docker/Dockerfile b/docker/Dockerfile index 57c3532..7539206 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM rtdi/connectorrootapp LABEL maintainer="info@rtdi.io" -ADD https://raw.githubusercontent.com/rtdi/RulesService/master/docker/global.properties conf/rtdiconfig/RulesService/ +ADD https://raw.githubusercontent.com/rtdi/RulesService/master/docker/tomcat-users-orig.xml conf/ ADD https://github.com/rtdi/RulesService/releases/latest/download/rulesservice.war ./webapps/ EXPOSE 8080 diff --git a/docker/tomcat-users-orig.xml b/docker/tomcat-users-orig.xml new file mode 100644 index 0000000..8a93925 --- /dev/null +++ b/docker/tomcat-users-orig.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f68ff51..bebcd60 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ war UTF-8 - 0.9.29 + 0.9.30 2.24.1 3.8.0 3.1.8