Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #406 from ammendonca/HAWKULAR-543
Browse files Browse the repository at this point in the history 
HAWKULAR-543 : Deployments "Select All" doesn't work
  • Loading branch information
@mtho11
mtho11 committed Aug 18, 2015
2 parents 60e528d + 31433bf commit a8d45e5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 13 deletions.
17 changes: 9 additions & 8 deletions console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h3>Deployments</h3>
<div class="actions-table">
<button class="btn btn-default add" type="button" disabled>Add Deployment</button>
<div class="dropdown">
<button class="btn btn-default" type="button" id="dropdownMenu1" dropdown-toggle>
<button class="btn btn-default" type="button" id="dropdownMenu1" dropdown-toggle ng-disabled="vm.selectCount === 0">
Actions
<span class="caret"></span>
</button>
Expand All @@ -83,24 +83,25 @@ <h3>Deployments</h3>
<div id="DataTables_Table_0_filter" class="dataTables_filter">
<label><input type="search" ng-model="vm.search" aria-controls="DataTables_Table_0"></label>
</div>
<div class="dataTables_info" id="DataTables_Table_0_info" role="status" aria-live="polite">Showing <b>1</b> to <b>{{vm.resourceList.length}}</b> of <b>{{vm.resourceList.length}}</b> Items</div>
<div class="dataTables_info" role="status" aria-live="polite" ng-hide="vm.selectCount > 0">Showing <b>1</b> to <b>{{vm.resourceList.length}}</b> of <b>{{vm.resourceList.length}}</b> Items</div>
<div class="dataTables_info" role="status" aria-live="polite" ng-show="vm.selectCount > 0"><b>{{vm.selectCount}}</b> item<span ng-show="vm.selectCount > 1">s</span> selected</div>
</div>
<div class="table-responsive">
<table class="datatable table table-striped table-bordered table-checkbox dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info" role="grid">
<thead>
<tr role="row">
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-sort="ascending" aria-label=": activate to sort column descending"><input type="checkbox"></th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-sort="ascending" aria-label="Select All" ng-click="vm.selectAll()"><input type="checkbox" ng-checked="vm.selectCount === vm.resourceList.length"></th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Current State: activate to sort column ascending">Current State</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Deployments 10: activate to sort column ascending">Deployments <span class="label label-default label-alert pull-right" tooltip-trigger tooltip-placement="top" tooltip="Total alerts" ng-show="vm.alertList.length">{{vm.alertList.length}}</span></th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Enabled/Disabled: activate to sort column ascending">Enabled/Disabled</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Computer Health: activate to sort column ascending">Computed Health</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Computed Health: activate to sort column ascending">Computed Health</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Actions: activate to sort column ascending">Actions</th>
</tr>
</thead>
<tbody>
<tr class="odd"><td valign="top" colspan="6" class="dataTables_empty" ng-show="vm.search && (vm.resourceList | filter:vm.search).length === 0"><p>Suggestions</p><ul><li>Check the syntax of the search term.</li><li>Check that the correct menu option is chosen (token ID vs. user ID).</li><li>Use wildcards (* to match zero or more characters or ? to match a single character).</li><li>Clear the search field, then click Search to return to the 20 most recent records.</li></ul></td></tr>
<tr role="row" ng-repeat="res in vm.resourceList | filter:vm.search" class="odd">
<td class="sorting_1"><input type="checkbox"></td>
<tr role="row" ng-repeat="res in vm.resourceList | filter:vm.search" ng-class="{'selected': res.selected}" ng-click="vm.selectItem(res)">
<td><input type="checkbox" ng-checked="res.selected"></td>
<td class="state" ng-show="res.state === 'up'"><i class="fa fa-check-circle-o"></i> OK</td>
<td class="state" ng-show="res.state === 'down'"><i class="fa fa-square"></i> Stopped</td>
<td class="state" ng-show="res.state === 'unknown'"><i class="fa fa-times-circle-o"></i> Failed</td>
Expand All @@ -113,7 +114,7 @@ <h3>Deployments</h3>
<td class="danger" ng-show="false">Poor</td>
<td class="actions">
<div class="dropdown">
<button class="btn btn-default" type="button" id="dropdownMenu2" dropdown-toggle>
<button class="btn btn-default" type="button" id="dropdownMenu2" ng-click="vm.selectItem(res)" dropdown-toggle>
Actions
<span class="caret"></span>
</button>
Expand Down Expand Up @@ -146,4 +147,4 @@ <h3>Deployments</h3>
</div>
</div>
</div>
</section><!-- .deployments -->
</section><!-- .deployments -->
26 changes: 21 additions & 5 deletions console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module HawkularMetrics {

private autoRefreshPromise: ng.IPromise<number>;
private resourceList;
public selectCount: number = 0;
public lastUpdateTimestamp:Date;
public alertList;
public startTimeStamp:TimestampInMillis;
Expand Down Expand Up @@ -87,9 +88,10 @@ module HawkularMetrics {
(aResourceList, getResponseHeaders) => {
var promises = [];
var tmpResourceList = [];
angular.forEach(aResourceList, function(res) {
angular.forEach(aResourceList, function(res: any) {
if (res.id.startsWith(new RegExp(this.$routeParams.resourceId + '~/'))) {
tmpResourceList.push(res);
res.selected = _.result(_.find(this.resourceList, {'id': res.id}), 'selected');
promises.push(this.HawkularMetric.AvailabilityMetricData(this.$rootScope.currentPersona.id).query({
tenantId: tenantId,
availabilityId: 'AI~R~[' + res.id + ']~AT~Deployment Status~Deployment Status',
Expand Down Expand Up @@ -124,11 +126,25 @@ module HawkularMetrics {
}

public performOperationMulti(operationName: string, resourceList: any): any {
this.$log.info('performOperationMulti ', operationName, resourceList);
for (var i = 0; i < resourceList.length; i++) {
var operation = {operationName: operationName, resourceId: resourceList[i].id};
var selectedList = _.filter(this.resourceList, 'selected');
this.$log.info('performOperationMulti ', operationName, selectedList);
_.forEach(selectedList, (item: any) => {
var operation = {operationName: operationName, resourceId: item.id};
this.HawkularOps.performOperation(operation);
}
});
}

public selectItem(item): any {
item.selected = !item.selected;
this.selectCount = _.filter(this.resourceList, 'selected').length;
}

public selectAll(): any {
var toggleTo = this.selectCount !== this.resourceList.length;
_.forEach(this.resourceList, (item: any) => {
item.selected = toggleTo;
});
this.selectCount = toggleTo ? this.resourceList.length : 0;
}
}

Expand Down

0 comments on commit a8d45e5

Please sign in to comment.