From 31d9abe28777e5ace776b39c759abbef5c56c679 Mon Sep 17 00:00:00 2001 From: Moshe Libenson Date: Wed, 27 Oct 2021 10:54:50 +0300 Subject: [PATCH 1/3] ATE-293 fix Integration with Kibana 6.x and above --- server/difido-server/config/mapping.json | 241 +++++++++++------------ 1 file changed, 115 insertions(+), 126 deletions(-) diff --git a/server/difido-server/config/mapping.json b/server/difido-server/config/mapping.json index 619af9bf..af59f3fe 100644 --- a/server/difido-server/config/mapping.json +++ b/server/difido-server/config/mapping.json @@ -1,128 +1,117 @@ { - "settings": { - "index": { - "number_of_shards": 2, - "number_of_replicas": 1 - } - }, - "mappings": { - "test": { - "dynamic_templates": [ - { - "long_prop": { - "match": "long_*", - "match_mapping_type": "string", - "mapping": { - "type": "long", - "index": false - } - } - }, - { - "int_prop": { - "match": "int_*", - "match_mapping_type": "string", - "mapping": { - "type": "integer", - "index": false - } - } - }, - { - "double_prop": { - "match": "double_*", - "match_mapping_type": "string", - "mapping": { - "type": "double", - "index": false - } - } - }, - { - "float_prop": { - "match": "float_*", - "match_mapping_type": "string", - "mapping": { - "type": "float", - "index": false - } - } - }, - { - "date_prop": { - "match": "date_*", - "match_mapping_type": "string", - "mapping": { - "type": "date", - "index": false, - "format": "yyyy/MM/dd HH:mm:ss" - } - } - }, - { - "notanalyzed": { - "match": "*", - "unmatch": "^(long_|int_|double_|float_|date_)$", - "match_mapping_type": "string", - "mapping": { - "type": "keyword", - "index": true - } - } - } - ], - "properties": { - "name": { - "type": "keyword", - "index": true - }, - "uid": { - "type": "keyword", - "index": true - }, - "parent": { - "type": "keyword", - "index": true - }, - "status": { - "type": "keyword", - "index": true - }, - "url": { - "type": "keyword", - "index": true - }, - "description": { - "type": "keyword", - "index": true - }, - "execution": { - "type": "keyword", - "index": true - }, - "executionId": { - "type": "long" - }, - "executionDuration": { - "type": "long" - }, - "machine": { - "type": "keyword", - "index": true - }, - "timestamp": { - "type": "date", - "format": "yyyy/MM/dd HH:mm:ss" - }, - "executionTimestamp": { - "type": "date", - "format": "yyyy/MM/dd HH:mm:ss" - }, - "duration": { - "type": "long" - } - } - - } - } + "settings": { + "index": { + "number_of_shards": 2, + "number_of_replicas": 1 + } + }, + "mappings": { + "test": { + "properties": { + "name": { + "type": "keyword", + "index": "true" + }, + "uid": { + "type": "keyword", + "index": "true" + }, + "parent": { + "type": "keyword", + "index": "true" + }, + "status": { + "type": "keyword", + "index": "true" + }, + "url": { + "type": "keyword", + "index": "true" + }, + "description": { + "type": "keyword", + "index": "true" + }, + "execution": { + "type": "keyword", + "index": "true" + }, + "executionId": { + "type": "long" + }, + "executionDuration": { + "type": "long" + }, + "machine": { + "type": "keyword", + "index": "true" + }, + "timestamp": { + "type": "date", + "format": "yyyy/MM/dd HH:mm:ss" + }, + "executionTimestamp": { + "type": "date", + "format": "yyyy/MM/dd HH:mm:ss" + }, + "duration": { + "type": "long" + } + }, + "dynamic_templates": [ + { + "long_prop": { + "match": "long_*", + "match_mapping_type": "string", + "mapping": { + "type": "long", + "index": "true" + } + } + }, + { + "int_prop": { + "match": "int_*", + "match_mapping_type": "string", + "mapping": { + "type": "integer", + "index": "true" + } + } + }, + { + "double_prop": { + "match": "double_*", + "match_mapping_type": "string", + "mapping": { + "type": "double", + "index": "true" + } + } + }, + { + "date_prop": { + "match": "date_*", + "match_mapping_type": "string", + "mapping": { + "type": "date", + "index": "true", + "format": "yyyy/MM/dd HH:mm:ss" + } + } + }, + { + "notanalyzed": { + "match": "*", + "unmatch": "^(long_|int_|double_|date_)$", + "match_mapping_type": "string", + "mapping": { + "type": "keyword", + "index": "true" + } + } + } + ] + } + } } From 9054b85e5cae26170a5aa705b75aaf9e416ce218 Mon Sep 17 00:00:00 2001 From: Moshe Libenson Date: Wed, 27 Oct 2021 10:55:24 +0300 Subject: [PATCH 2/3] ATE-293 show execution comment as tooltip --- .../docRoot/css/indexPageStyle.css | 11 ++++++++ .../docRoot/js/indexPageScript.js | 26 ++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/server/difido-server/docRoot/css/indexPageStyle.css b/server/difido-server/docRoot/css/indexPageStyle.css index 0efbb7fd..88ccbfc8 100644 --- a/server/difido-server/docRoot/css/indexPageStyle.css +++ b/server/difido-server/docRoot/css/indexPageStyle.css @@ -101,4 +101,15 @@ div.dt-buttons { color: black; text-decoration: none; cursor: pointer; +} + +.commentStar { + cursor: pointer; + font-size: 12pt; + color: #337ab7; +} + +.commentStar:hover { + cursor: pointer; + color: #006; } \ No newline at end of file diff --git a/server/difido-server/docRoot/js/indexPageScript.js b/server/difido-server/docRoot/js/indexPageScript.js index fbc9408e..3591e8ea 100644 --- a/server/difido-server/docRoot/js/indexPageScript.js +++ b/server/difido-server/docRoot/js/indexPageScript.js @@ -176,8 +176,28 @@ function populateTable() { }], "fnCreatedRow": function (nRow, aData, iDataIndex) { // Adding attributes to the row. Especially useful for keeping the selected rows after refresh. - $(nRow).attr('id', 'exe' + aData[0]); - $(nRow).attr('exeid', aData[0]); + // Checking if the execution has comments, and if it does, adding the comment as a tooltip that's shown when hovering on the star to the right of the execution description + $.ajax({ + url : 'api/executions/' + aData[0], + type : 'GET', + }) + .done(function(metadataObj) { + + var execId = aData[0]; + + $(nRow).attr('id', 'exe' + execId); + $(nRow).attr('exeid', execId); + + var descCell = $(nRow).find("td")[1]; + var desc = $(descCell).html(); + + if (metadataObj.comment != '') { + $(descCell).html("★  " + desc); + } + else { + $(descCell).html("☆  " + desc); + } + }); }, "drawCallback": function (settings) { // After drawing the table, reselecting all the previously selected rows. @@ -396,4 +416,4 @@ function executePlugin(table) { } ); }); -} \ No newline at end of file +} From 7b5cafd1d59793b7d72d43fb88ab0636a2f26a80 Mon Sep 17 00:00:00 2001 From: Moshe Libenson Date: Wed, 27 Oct 2021 11:04:45 +0300 Subject: [PATCH 3/3] ATE-293 bump version to 3.1.01 --- binders/difido-generic-binder/pom.xml | 2 +- binders/difido-testng/pom.xml | 2 +- difido-parent/pom.xml | 2 +- difido-reports-common/pom.xml | 2 +- examples/jsystem-example/so-project/pom.xml | 2 +- examples/jsystem-example/tests-project/pom.xml | 2 +- examples/testng-example/pom.xml | 2 +- server/difido-server-plugins-common/pom.xml | 2 +- server/difido-server/pom.xml | 2 +- utils/metadata-recovery-utility/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/binders/difido-generic-binder/pom.xml b/binders/difido-generic-binder/pom.xml index e23bfffb..20ce5c93 100644 --- a/binders/difido-generic-binder/pom.xml +++ b/binders/difido-generic-binder/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../difido-parent diff --git a/binders/difido-testng/pom.xml b/binders/difido-testng/pom.xml index d8671cf1..d43e5ff1 100644 --- a/binders/difido-testng/pom.xml +++ b/binders/difido-testng/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../difido-parent diff --git a/difido-parent/pom.xml b/difido-parent/pom.xml index b5824e6a..283faceb 100644 --- a/difido-parent/pom.xml +++ b/difido-parent/pom.xml @@ -3,7 +3,7 @@ 4.0.0 il.co.topq.difido difido-parent - 3.1.00-SNAPSHOT + 3.1.01 Difido Parent pom diff --git a/difido-reports-common/pom.xml b/difido-reports-common/pom.xml index 56dc05c9..68771607 100644 --- a/difido-reports-common/pom.xml +++ b/difido-reports-common/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../difido-parent diff --git a/examples/jsystem-example/so-project/pom.xml b/examples/jsystem-example/so-project/pom.xml index c9b12448..536cd589 100644 --- a/examples/jsystem-example/so-project/pom.xml +++ b/examples/jsystem-example/so-project/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../../difido-parent diff --git a/examples/jsystem-example/tests-project/pom.xml b/examples/jsystem-example/tests-project/pom.xml index 9957676c..88e2ac1e 100644 --- a/examples/jsystem-example/tests-project/pom.xml +++ b/examples/jsystem-example/tests-project/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../../difido-parent diff --git a/examples/testng-example/pom.xml b/examples/testng-example/pom.xml index 650ca023..10326101 100644 --- a/examples/testng-example/pom.xml +++ b/examples/testng-example/pom.xml @@ -6,7 +6,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../difido-parent diff --git a/server/difido-server-plugins-common/pom.xml b/server/difido-server-plugins-common/pom.xml index 7d670f13..97d72d1f 100644 --- a/server/difido-server-plugins-common/pom.xml +++ b/server/difido-server-plugins-common/pom.xml @@ -7,7 +7,7 @@ il.co.topq.difido difido-parent - 3.1.00-SNAPSHOT + 3.1.01 ../../difido-parent diff --git a/server/difido-server/pom.xml b/server/difido-server/pom.xml index 90d053d2..0f88dea7 100644 --- a/server/difido-server/pom.xml +++ b/server/difido-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 il.co.topq.report difido-server - 3.1.00-SNAPSHOT + 3.1.01 Difido Server org.springframework.boot diff --git a/utils/metadata-recovery-utility/pom.xml b/utils/metadata-recovery-utility/pom.xml index 6fcc2046..3054418c 100644 --- a/utils/metadata-recovery-utility/pom.xml +++ b/utils/metadata-recovery-utility/pom.xml @@ -7,7 +7,7 @@ difido-parent il.co.topq.difido - 3.1.00-SNAPSHOT + 3.1.01 ../../difido-parent