refector rule engine for support kuiper

Signed-off-by: wshengqi <wshengqi@vmware.com>

Author: wshengqi

cmd/edgex-ui-server/static/css/ruleengine.css

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  *
- * @author: Huaqiao Zhang, <huaqiaoz@vmware.com>
+ * @author: Shengqi Wang, <wshengqi@vmware.com>
  * @version: 0.1.0
  *******************************************************************************/
 @charset "UTF-8";
@@ -29,13 +29,6 @@ div.info_header span {
 	color: #339933;
 }
 
-div#device_list {
-	/* position: relative; */
-	/* min-height: 50%; */
-	/* margin-left: 60px; */
-	
-}
-
 div.select_panle, div#action_device_list select, div#device_command_list select
 {
 	width: 220px;
@@ -67,4 +60,58 @@ div#condition_device_list table tfoot nav {
 .condition_device_list  td, .action_device_list  td {
 	padding: 5px;
 	text-align: left;
+}
+
+#ruleengine_addrules_paramsBox .page-header{
+	margin: 15px 0 20px;
+}
+
+#ruleengine_addrules_paramsBox legend{
+	padding: 0;
+}
+
+#ruleengine_addrules_paramsBox hr{
+	border-top: 2px dashed #987cb9;
+}
+
+#ruleengine_model,#ruleengine_addrules_model .modal-dialog{
+	position:fixed;
+	top:10%;
+	right:0;
+	left:0;
+	bottom:10%;
+	margin:auto;
+}
+
+#ruleengine_model,#ruleengine_addrules_model .modal-content {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+}
+
+#ruleengine_model,#ruleengine_addrules_model .modal-body {
+	max-height:79%;
+	overflow-y:auto;
+	position: absolute;
+	top: 55px;
+	bottom: 65px;
+	width: 100%;
+}
+
+#ruleengine_model,#ruleengine_addrules_model .modal-header .close {margin-right: 15px;}
+#ruleengine_model,#ruleengine_addrules_model .modal-footer {
+	position: absolute;
+	width: 100%;
+	bottom: 0;
+}
+
+#ruleengine_model,#ruleengine_addrules_model #json-renderer {
+	padding-left: 5%;
+}
+
+.modal-backdrop {
+	z-index: -1 !important;
+	opacity: 0 !important;
+	filter: alpha(opacity=0) !important;
 }

cmd/edgex-ui-server/static/data/menu.json

@@ -4,26 +4,17 @@
 		"url": "/pages/devices/deviceService.html",
 		"icon":"fa fa-gears"
 	},{
-			"title":"Scheduler",
-			"url": "/pages/scheduler.html",
-			"icon":"fa fa-clock-o fa-lg",
-			"children":[]
-		},{
-			"title":"Notification",
-			"url": "/pages/notification.html",
-			"icon":"fa fa-envelope",
-			"children":[]
-		},{
-		"title":"Multimedia",
-		"url": "/pages/multimedia.html",
-		"icon":"fa fa-camera",
+		"title":"Scheduler",
+		"url": "/pages/scheduler.html",
+		"icon":"fa fa-clock-o fa-lg",
 		"children":[]
 	},{
-		"title":"Export",
-		"url": "/pages/export.html",
-		"icon":"fa fa-cloud-upload",
+		"title":"Notification",
+		"url": "/pages/notification.html",
+		"icon":"fa fa-envelope",
 		"children":[]
-	},{
+	},
+	{
 		"title":"RuleEngine",
 		"url": "/pages/ruleengine.html",
 		"icon":"fa fa-wrench",
@@ -33,5 +24,5 @@
 	"url": "/pages/appService.html",
 	"icon":"fa fa-asterisk",
 	"children":[]
-}
+	}
 ]

cmd/edgex-ui-server/static/index.html

@@ -28,6 +28,7 @@
     <link rel="stylesheet" href="/vendors/flatpickr/theme/confetti.css">
     <link rel="stylesheet" href="/vendors/bootstrap-table/bootstrap-table.min.css">
     <link rel="stylesheet" href="/vendors/bootstrap-select/css/bootstrap-select.min.css">
+    <link rel="stylesheet" href="/vendors/json-viewer/css/jquery.json-viewer.css">
     <link href="/css/main.css" rel="stylesheet">
     <link href="/css/index.css" rel="stylesheet">
     <link href="/css/edgexfoundry.css" rel="stylesheet">
@@ -105,6 +106,7 @@ <h4></h4>
 <script src="/vendors/bootstrap-table/bootstrap-table.min.js"></script>
 <script src="/vendors/bootstrap-table/bootstrap-table-locale-all.min.js"></script>
 <script src="/vendors/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script src="/vendors/json-viewer/js/jquery.json-viewer.js"></script>
 <script src="/js/edgexfoundry.js"></script>
 <script src="/js/common.js"></script>
 <script src="/js/main.js"></script>

cmd/edgex-ui-server/static/js/main.js

@@ -194,10 +194,10 @@ $(document).ready(function () {
                 break;
             case 'RuleEngine':
                 $.ajax({
-                    url: '/rule-engine/api/v1/ping',
+                    url: '/rule-engine',
                     type: 'GET',
                     success: function (data) {
-                        if (data == "pong") {
+                        if (data.trim() == "OK") {
                             renderByCheckResult(thisTab, "healthy");
                         } else {
                             renderByCheckResult(thisTab, "unhealthy");

cmd/edgex-ui-server/static/js/pages/devices/deviceService.js

@@ -130,6 +130,17 @@ orgEdgexFoundry.deviceService = (function(){
                     }
                 ]
             },
+            {
+                'Protocol': 'HTTP',
+                'Alias': 'HTTP',
+                'Properties': [
+                    {
+                        'Key': 'Address',
+                        'Value': '192.168.1.1',
+                        'Hint': '(required)'
+                    }
+                ]
+            },
             {
                 'Protocol': 'other',
                 'Alias': 'others',