Skip to content

Commit ae3b23f

Browse files
elans3elans3
authored
Defect fix 2 (#326)
* Defect fix for query param with array of values * Defect fix for query param with array of values * [maven-release-plugin] prepare release virtualan-project-2.4.1 * [maven-release-plugin] prepare for next development iteration * Next development version updated * UI Defect fix - Fixed Mock data screen overflow - Added Refresh button to reload Mock data
1 parent 3b384dd commit ae3b23f

File tree

6 files changed

+81
-48
lines changed

6 files changed

+81
-48
lines changed

‎modules/virtualan-plugin/src/main/resources/META-INF/resources/static/js/controller/mock_controller.js‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -418,18 +418,19 @@ myApp.controller('MockController', ['$scope', '$filter', '$modal', 'MockService
418418

419419
self.loadData = fetchAllMockRequest();
420420

421-
function fetchAllMsgMockRequest(){
422-
MockService.fetchAllMsgMockRequest()
423-
.then(
424-
function(d) {
425-
self.mockMsgRequests = d;
426-
self.filterMsgList = self.mockMsgRequests;
427-
},
428-
function(errResponse){
429-
console.error('Error while fetching Mocks');
430-
}
431-
);
432-
};
421+
422+
self.reloadData = function(){
423+
MockService.fetchAllMockRequest()
424+
.then(
425+
function(d) {
426+
self.mockRequests = d;
427+
self.filterList = self.mockRequests;
428+
},
429+
function(errResponse){
430+
console.error('Error while fetching Mocks');
431+
}
432+
);
433+
};
433434

434435
function fetchAllMockRequest(){
435436
MockService.fetchAllMockRequest()
@@ -556,15 +557,7 @@ self.showJSONDialog = false;
556557
);
557558
}
558559

559-
function deleteMsgMockRequest(id){
560-
MockService.deleteMockRequest(id)
561-
.then(
562-
fetchAllMsgMockRequest,
563-
function(errResponse){
564-
console.error('Error while deleting Msg MockRequest');
565-
}
566-
);
567-
}
560+
568561

569562
function deleteMockRequest(id){
570563
MockService.deleteMockRequest(id)

‎modules/virtualan-plugin/src/main/resources/META-INF/resources/virtualan-ui.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
data-target="#add-mock"><span
331331
class="glyphicon glyphicon-plus"></span> Add Mock Data</a></li>
332332
<li><a class="dropdown-item" href="#" data-toggle="modal"
333-
data-target="#load-mock" ng-click="ctrl.loadData()"><span
333+
data-target="#load-mock" data-ng-click="ctrl.reloadData()"><span
334334
class="glyphicon glyphicon-th-list"></span> Load Mock Data</a></li>
335335
</ul>
336336
</li>
@@ -417,11 +417,10 @@
417417
<li>
418418
<hr class="line"/>
419419
</li>
420-
<li><a class="dropdown-item menu-color" href="#">v2.4.1</a></li>
420+
<li><a class="dropdown-item menu-color" href="#">v2.4.2</a></li>
421421
<li><a class="dropdown-item menu-color"
422422
href="#"
423-
ng-click="uctrl.loadTutorialsPage('https://tutorials.virtualan.io/#/Virtualan?downloaded=plugin&version=v2.4.1')">Help</a></li>
424-
423+
ng-click="uctrl.loadTutorialsPage('https://tutorials.virtualan.io/#/Virtualan?downloaded=plugin&version=v2.4.2')">Help</a></li>
425424
</ul>
426425
</li>
427426
</ul>
@@ -982,7 +981,7 @@
982981
</div>
983982
</div>
984983
<div class="modal-body">
985-
<div class="tablecontainer">
984+
<div class="tablecontainer" style="overflow-x:scroll;">
986985
<input type="text" ng-model="ctrl.searchText"
987986
class="head-text-black form-control search-icon float-right"
988987
placeholder="Type to filter"> Total items:
@@ -1068,8 +1067,8 @@
10681067
</td>
10691068
<td><span ng-bind="mockRequest.excludeList"></span></td>
10701069
<td>
1071-
<!-- <button type="button" ng-click="ctrl.edit(u.id)"
1072-
class="btn btn-success custom-width">Edit</button> -->
1070+
<!-- <button type="button" ng-click="ctrl.edit(u.id)"-->
1071+
<!-- class="btn btn-success custom-width">Edit</button>-->
10731072
<button type="button" ng-click="ctrl.remove(mockRequest.id)"
10741073
class="btn btn-danger custom-width">Remove
10751074
</button>
@@ -1095,9 +1094,9 @@
10951094
boundary-links="true" max-size="ctrl.maxSize"
10961095
ng-model="ctrl.currentPage" class="pagination-sm"
10971096
items-per-page="ctrl.perPage"></pagination>
1098-
<!-- <button type="button" class="btn btn-info"
1099-
ng-click="ctrl.loadData()">Load Data</button>
1100-
-->
1097+
<button type="button" class="btn btn-info"
1098+
data-target="#load-mock" data-toggle="modal" data-ng-click="ctrl.reloadData()">Refresh</button>
1099+
11011100
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
11021101
</div>
11031102
</div>

‎modules/virtualan-plugin/src/main/resources/META-INF/resources/yaml/VirtualService/virtualservices.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
swagger: '2.0'
22
info:
33
description: Virtual Service API
4-
version: 2.4.1
4+
version: 2.4.2
55
title: Virtual Service API
66
basePath: /
77
schemes:

‎modules/virtualization/src/main/resources/META-INF/resources/static/js/controller/mock_controller.js‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,19 @@ myApp.controller('MockController', ['$scope', '$filter', '$modal', 'MockService
485485
self.loadMsgData = fetchAllMsgMockRequest();
486486
self.loadSoapData = fetchAllSoapMockRequest();
487487

488+
self.reloadSoapData = function(){
489+
MockService.fetchAllSoapMockRequest()
490+
.then(
491+
function(d) {
492+
self.mockSoapRequests = d;
493+
self.filterSoapList = self.mockSoapRequests;
494+
},
495+
function(errResponse){
496+
console.error('Error while fetching Soap Mocks');
497+
}
498+
);
499+
};
500+
488501
function fetchAllSoapMockRequest(){
489502
MockService.fetchAllSoapMockRequest()
490503
.then(
@@ -498,6 +511,19 @@ myApp.controller('MockController', ['$scope', '$filter', '$modal', 'MockService
498511
);
499512
};
500513

514+
self.reloadMsgData = function (){
515+
MockService.fetchAllMsgMockRequest()
516+
.then(
517+
function(d) {
518+
self.mockMsgRequests = d;
519+
self.filterMsgList = self.mockMsgRequests;
520+
},
521+
function(errResponse){
522+
console.error('Error while fetching Mocks');
523+
}
524+
);
525+
};
526+
501527

502528
function fetchAllMsgMockRequest(){
503529
MockService.fetchAllMsgMockRequest()
@@ -529,7 +555,19 @@ myApp.controller('MockController', ['$scope', '$filter', '$modal', 'MockService
529555
}
530556
);
531557
};
532-
558+
559+
self.reloadData = function (){
560+
MockService.fetchAllMockRequest()
561+
.then(
562+
function(d) {
563+
self.mockRequests = filterRestObject(d);
564+
self.filterList = self.mockRequests;
565+
},
566+
function(errResponse){
567+
console.error('Error while fetching Mocks');
568+
}
569+
);
570+
};
533571

534572
function loadAllMockRequest(){
535573
MockService.loadAllMockRequest()

‎modules/virtualization/src/main/resources/META-INF/resources/virtualan-ui.html‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
data-target="#add-mock"><span
330330
class="glyphicon glyphicon-plus"></span> Add Mock Data</a></li>
331331
<li><a class="dropdown-item" href="#" data-toggle="modal"
332-
data-target="#load-mock" ng-click="ctrl.loadData()"><span
332+
data-target="#load-mock" data-ng-click="ctrl.reloadData()"><span
333333
class="glyphicon glyphicon-th-list"></span> Load Mock Data</a></li>
334334
</ul>
335335
</li>
@@ -344,7 +344,7 @@
344344
data-target="#add-message-mock"><span
345345
class="glyphicon glyphicon-plus"></span> Add Mock Data</a></li>
346346
<li><a class="dropdown-item" href="#" data-toggle="modal"
347-
data-target="#load-message-mock" ng-click="ctrl.loadMsgData()"><span
347+
data-target="#load-message-mock" data-ng-click="ctrl.reloadMsgData()"><span
348348
class="glyphicon glyphicon-th-list"></span> Load Mock Data</a></li>
349349
</ul>
350350
</li>
@@ -359,7 +359,7 @@
359359
data-target="#add-soap-mock"><span
360360
class="glyphicon glyphicon-plus"></span> Add Mock Data</a></li>
361361
<li><a class="dropdown-item" href="#" data-toggle="modal"
362-
data-target="#load-soap-mock" ng-click="ctrl.loadSoapData()"><span
362+
data-target="#load-soap-mock" data-ng-click="ctrl.reloadSoapData()"><span
363363
class="glyphicon glyphicon-th-list"></span> Load Mock Data</a></li>
364364
</ul>
365365
</li>
@@ -455,10 +455,10 @@
455455
<li>
456456
<hr class="line"/>
457457
</li>
458-
<li><a class="dropdown-item" href="#">v1.3.1</a></li>
458+
<li><a class="dropdown-item" href="#">v1.3.2</a></li>
459459
<li><a class="dropdown-item"
460460
href="#"
461-
ng-click="uctrl.loadTutorialsPage('https://tutorials.virtualan.io/#/Virtualan-setup?downloaded=plugin&version=v1.3.1')">Help</a></li>
461+
ng-click="uctrl.loadTutorialsPage('https://tutorials.virtualan.io/#/Virtualan-setup?downloaded=plugin&version=v1.3.2')">Help</a></li>
462462
</ul>
463463
</li>
464464
</ul>
@@ -1570,7 +1570,7 @@
15701570
</div>
15711571
</div>
15721572
<div class="modal-body">
1573-
<div class="tablecontainer">
1573+
<div class="tablecontainer" style="overflow-x:scroll;">
15741574
<input type="text" ng-model="ctrl.searchSoapText"
15751575
class="head-text-black form-control search-icon float-right"
15761576
placeholder="Type to filter"> Total items:
@@ -1663,9 +1663,9 @@
16631663
boundary-links="true" max-size="ctrl.maxSoapSize"
16641664
ng-model="ctrl.currentSoapPage" class="pagination-sm"
16651665
items-per-page="ctrl.perSoapPage"></pagination>
1666-
<!-- <button type="button" class="btn btn-info"
1667-
ng-click="ctrl.loadData()">Load Data</button>
1668-
-->
1666+
<button type="button" class="btn btn-info"
1667+
data-target="#load-soap-mock" data-toggle="modal" data-ng-click="ctrl.reloadSoapData()">Refresh</button>
1668+
16691669
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
16701670
</div>
16711671
</div>
@@ -1696,7 +1696,7 @@
16961696
</div>
16971697
</div>
16981698
<div class="modal-body">
1699-
<div class="tablecontainer">
1699+
<div class="tablecontainer" style="overflow-x:scroll;">
17001700
<input type="text" ng-model="ctrl.searchMsgText"
17011701
class="head-text-black form-control search-icon float-right"
17021702
placeholder="Type to filter"> Total items:
@@ -1800,9 +1800,10 @@
18001800
boundary-links="true" max-size="ctrl.maxMsgSize"
18011801
ng-model="ctrl.currentMsgPage" class="pagination-sm"
18021802
items-per-page="ctrl.perMsgPage"></pagination>
1803-
<!-- <button type="button" class="btn btn-info"
1804-
ng-click="ctrl.loadData()">Load Data</button>
1805-
-->
1803+
<button type="button" class="btn btn-info"
1804+
data-target="#load-message-mock" data-toggle="modal" data-ng-click="ctrl.reloadMsgData()">Refresh</button>
1805+
1806+
-->
18061807
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
18071808
</div>
18081809
</div>
@@ -1836,7 +1837,7 @@
18361837
</div>
18371838
</div>
18381839
<div class="modal-body">
1839-
<div class="tablecontainer">
1840+
<div class="tablecontainer" style="overflow-x:scroll;">
18401841
<input type="text" ng-model="ctrl.searchText"
18411842
class="head-text-black form-control search-icon float-right"
18421843
placeholder="Type to filter"> Total items: {{ctrl.filtered.length}} <br/>
@@ -1951,6 +1952,8 @@
19511952
boundary-links="true" max-size="ctrl.maxSize"
19521953
ng-model="ctrl.currentPage" class="pagination-sm"
19531954
items-per-page="ctrl.perPage"></pagination>
1955+
<button type="button" class="btn btn-info"
1956+
data-target="#load-mock" data-toggle="modal" data-ng-click="ctrl.reloadData()">Refresh</button>
19541957

19551958
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
19561959
</div>

‎modules/virtualization/src/main/resources/META-INF/resources/yaml/VirtualService/virtualservices.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
swagger: '2.0'
22
info:
33
description: Virtualan-Virtualization API
4-
version: 1.3.1
4+
version: 1.3.2
55
title: Virtual Service API
66
basePath: /
77
schemes:

0 commit comments

Comments
 (0)