From 4b5936e2d3b18c3d0ee7fdc820d9d0a143662925 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Sat, 26 Oct 2019 11:46:12 +0200
Subject: [PATCH] Small frontend adjustments
---
.../META-INF/resources/css/dmnEditorTabs.css | 4 ++++
.../META-INF/resources/js/dmnCamundaApi.js | 13 +++++++++++--
.../resources/META-INF/resources/js/dmnVerifier.js | 5 ++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/dmnEditorTabs.css b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/dmnEditorTabs.css
index c84642e9..e08622d3 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/dmnEditorTabs.css
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/dmnEditorTabs.css
@@ -99,3 +99,7 @@
min-height: 20px;
max-height: 20px;
}
+
+.rule-index {
+ width: 47px;
+}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnCamundaApi.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnCamundaApi.js
index afeb3400..6deb51ad 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnCamundaApi.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnCamundaApi.js
@@ -5,9 +5,9 @@ let camundaEngineUrl = '';
let connectionSuccess = false;
let $camundaApiRoot = $('#camunda-api-root');
let $textCamundaUrl = $(`
- <input class="modal-element" type="text" size="60">
+ <input class="modal-element" type="url" size="60" placeholder="Enter Camunda Server">
`);
-$textCamundaUrl.val('localhost');
+
let $buttonConnectCamundaUrl = $(`
<button class="clickable modal-element" size="60" id="camunda-connect"
onclick="connectCamunda()">Connect</button>
@@ -29,7 +29,15 @@ let $camundaApiContainer = $(`<div id="camunda-api-container">`);
// register Button action
$(document).ready(function () {
+ $textCamundaUrl.on('keyup', function (ev) {
+ if (ev.keyCode === 13) {
+ // Cancel the default action, if needed
+ ev.preventDefault();
+ $buttonConnectCamundaUrl.click();
+ }
+ });
clearCamundaApiRoot();
+ $
});
function clearCamundaApiRoot() {
@@ -195,5 +203,6 @@ function loadCamundaDecisionXml(decisionSelect) {
}
});
}
+ decisionSelect.value = 'null';
}
}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
index 5e1fbfc7..f1add96c 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
@@ -49,6 +49,7 @@ function loadAvailableTypes() {
type: 'GET',
error: function (err) {
inactiveBackend = true;
+ types = [];
handleStatus();
},
success: function (data) {
@@ -101,7 +102,8 @@ function cleanDmnVerifierRoot() {
id: -1,
text: "All verifier"
},
- allowClear: true
+ width: 'resolve',
+ allowClear: true,
});
// Add Button Verifications
$header.append($(`
@@ -115,6 +117,7 @@ function cleanDmnVerifierRoot() {
// add header to root
$root.append($header);
+ $('.select2-search__field').css('width', '');
$root.append($(`<div id="dmn-verifier-content">`));
return $root;
}
--
GitLab