Skip to content

Commit 102bc58

Browse files
author
Anders Breid
authored
Selector should always be up to date. (#83)
* Fix multiple users may use frontend, request outside web gui. - Funktion to sent backend url as parameter added. - Gui users may now switch backend without affecting each other. - Before saving new instances the code will check if any new instances has been added to not overwrite instances created by other users. - switch-backend delete now recieves the backend to delete and not the backends to not delete. - If file is invalid or non existand it will be recreated. - Default back end properties may be specified in application-properties. - Default parameters may not be removed from gui but must be removed from application-properties first. - Unit tests have been added and updated. * Modified functional tests to work with the new utils changes. * Fixed some functional tests. * fixed code comments * Updated after comments * Fixed minor issues with switching back end * Added unittest for curl commando possibilities. * Extended time out to 11s * fixed some duplicated functions from comments. * updated after comments * updated after comments * Fixed functional tests * Missed to add 2 changes * updated after comments * Improved design for better useability. - Added loading indicator for buttons instead of displaying all then removing few. - Added refresh on change of back end instance. - Added more restfull way of working on front end back end details endpoints. - Better handeling of some error/messages sent to GUI from front end service. - Changed name of "Subscription Handeling" to just "Subscriptions" to be more generic. * Merge * Fix of path variable name * Improved useability and reduced read from disk * Improved useability and reduced read from disk * . * Improved error handeling, added some code comments * Fixed bug with name validation, better validations. * Fixed invalid id on one message * Renamed a class * refactor names of test methods Made name of test methods to start with small letter. Tweaks and fixes to the CSS in EI frontend. (#74) * Tweaks and fixes to the CSS in EI frontend. Update frontend example image (#76) refactor names of test methods Made name of test methods to start with small letter. Tweaks and fixes to the CSS in EI frontend. (#74) * Tweaks and fixes to the CSS in EI frontend. Improved error handeling and added some code comments. (#71) * Fix multiple users may use frontend, request outside web gui. - Funktion to sent backend url as parameter added. - Gui users may now switch backend without affecting each other. - Before saving new instances the code will check if any new instances has been added to not overwrite instances created by other users. - switch-backend delete now recieves the backend to delete and not the backends to not delete. - If file is invalid or non existand it will be recreated. - Default back end properties may be specified in application-properties. - Default parameters may not be removed from gui but must be removed from application-properties first. - Unit tests have been added and updated. * Modified functional tests to work with the new utils changes. * Fixed some functional tests. * fixed code comments * Updated after comments * Fixed minor issues with switching back end * Added unittest for curl commando possibilities. * Extended time out to 11s * fixed some duplicated functions from comments. * updated after comments * updated after comments * Fixed functional tests * Missed to add 2 changes * updated after comments * Improved design for better useability. - Added loading indicator for buttons instead of displaying all then removing few. - Added refresh on change of back end instance. - Added more restfull way of working on front end back end details endpoints. - Better handeling of some error/messages sent to GUI from front end service. - Changed name of "Subscription Handeling" to just "Subscriptions" to be more generic. * Merge * Fix of path variable name * Improved useability and reduced read from disk * Improved useability and reduced read from disk * . * Improved error handeling, added some code comments * Fixed bug with name validation, better validations. * Fixed invalid id on one message * Renamed a class Update frontend example image (#76) * Added error messages from back end when adding subs. * updated after comments * updated after comments * The selector will no update after adding then switching instances * Added comment, removed console prints * Udated after issues with alarm * Update EIBackendInstancesInformation.json
1 parent 44dfc90 commit 102bc58

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

src/functionaltest/java/com/ericsson/ei/frontend/TestAlarm.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public void testAlarm() throws IOException {
2424
testRulesPage.clickRemoveEventNumber(0);
2525

2626
//Click alarm button few times
27-
IntStream.range(0, 5).forEachOrdered(i -> indexPageObject.clickAlarmButton());
27+
for (int i = 0; i < 5; i++) {
28+
indexPageObject.clickAlarmButton();
29+
}
2830
assertTrue(driver.findElements(By.className("dropdown-item")).size() >= 2);
2931
}
3032
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[]
1+
[]

src/main/resources/static/js/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ jQuery(document).ready(function() {
179179
}
180180
});
181181
}
182-
updateBackEndInstanceList();
183182

184183
$('body').on('click', function (e) {
185184
if ($(e.target).data('toggle') !== 'tooltip' && $(e.target)[0].className !== 'tooltip-inner') {

src/main/resources/static/js/switch-instances.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ function multipleInstancesModel(data) {
6464
},
6565
success: function (responseData, XMLHttpRequest, textStatus) {
6666
console.log("Response from IE front end back end: " + responseData.message);
67+
$.getScript( "js/main.js" )
68+
.done(function( script, textStatus ) {
69+
updateBackEndInstanceList();
70+
});
6771
$.jGrowl(responseData.message, {sticky: false, theme: 'Notify'});
6872
$("#navbarResponsive").removeClass("show");
6973
$("#selectInstances").visible();

0 commit comments

Comments
 (0)