x/bansho
Code Issues Proposed changes

FIX: filter bug

Browse Source
This commit is contained in:
Frédéric Vachon 2015-03-10 10:24:32 -04:00
parent b2d47cdf19
commit 8895c56c35
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/config/config.json
View File

@ -1,7 +1,7 @@
{
"dashboardConfig": {
"title": "Unhandled service problems",
"refreshInterval": "0",
"refreshInterval": 0,
"template": "dashboard",
"components" : [
{
@ -81,7 +81,7 @@
},
"hostsConfig": {
"title": "Hosts",
"refreshInterval": "0",
"refreshInterval": 0,
"template": "singleTable",
"components": [
{
@ -114,7 +114,7 @@
},
"servicesConfig": {
"title": "Services",
"refreshInterval": "0",
"refreshInterval": 0,
"template": "singleTable",
"components": [{
"type": "table",

17
app/components/table/actionbar/actionbar.js
View File

@ -22,8 +22,7 @@ angular.module('adagios.table.actionbar', [])
text: "All in Downtime",
name: "all_downtime"
}
],
searchFilter: ""
]
};
return actionbarFilters;
})
@ -39,15 +38,21 @@ angular.module('adagios.table.actionbar', [])
.filter('actionbarSelectFilter', function () {
return function (items, activeFilter) {
var out = [];
var out = [],
i;
if (!!activeFilter) {
return items;
}
if (!!items) {
if (activeFilter.name === "all") {
for (var i = 0; i < items.length; i++) {
for (i = 0; i < items.length; i += 1) {
out.push(items[i]);
}
} else if (activeFilter.name === "all_ok") {
for (var i = 0; i < items.length; i++) {
if (items[i].state == 0) {
for (i = 0; i < items.length; i += 1) {
if (items[i].state === 0) {
out.push(items[i]);
}
}

1
app/components/table/cell_host/cell_host.js
View File

@ -4,6 +4,7 @@ angular.module('adagios.table.cell_host', ['adagios.table'])
.controller('CellHostCtrl', ['$scope', function ($scope) {
$scope.cell_name = 'host';
if ($scope.entry.host_state === 0) {
$scope.state = 'state--ok';
} else if ($scope.entry.host_state === 1) {

2
app/components/table/table.html
View File

@ -9,7 +9,7 @@
</tr>
</thead>
<tbody class="{{entry.child_class}}" ng-repeat="entry in entries| actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat">
<tbody class="{{entry.child_class}}" ng-repeat="entry in entries | actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat:this | wrappableStyle:this">
<tr>
<td><input type="checkbox"></td>
<td adg-cell cell-name="{{cell}}" ng-repeat="cell in cellsName"></td>

47
app/components/table/table.js
View File

@ -14,8 +14,8 @@ angular.module('adagios.table', ['adagios.live',
.value('tableConfig', {'cellToFieldsMap': {}, 'cellWrappableField': {}, 'index': 0})
.controller('TableCtrl', ['$scope', '$interval', 'getServices', 'tableConfig', 'processColumnRepeat',
function ($scope, $interval, getServices, tableConfig, processColumnRepeat) {
.controller('TableCtrl', ['$scope', '$interval', 'getServices', 'tableConfig', 'actionbarFilters',
function ($scope, $interval, getServices, tableConfig, actionbarFilters) {
var requestFields = [],
filters = JSON.parse(tableConfig[tableConfig.index].filters),
conf = tableConfig[tableConfig.index],
@ -35,7 +35,6 @@ angular.module('adagios.table', ['adagios.live',
requestFields.push(_value);
});
});
});
getData = function (requestFields, filters, apiName) {
getServices(requestFields, filters, apiName)
@ -52,7 +51,10 @@ angular.module('adagios.table', ['adagios.live',
}, tableConfig.refreshInterval);
}
// Used if there's more than one table in a view
$scope.actionbarFilters = actionbarFilters;
// Index needed to support multiple tables per view
$scope.tableIndex = tableConfig.index;
tableConfig.index += 1;
}])
@ -134,34 +136,37 @@ angular.module('adagios.table', ['adagios.live',
this.NoRepeatCell = config.noRepeatCell;
})
.filter('wrappableStyle', ['tableConfig', function (tableConfig) {
return function (data) {
.filter('wrappableStyle', ['tableConfig', function (tableConfig) {
return function (input, scope) {
var last = '',
entry = {},
parent_found = false,
class_name = ['', ''],
i,
fieldToWrap = tableConfig.cellWrappableField[tableConfig.noRepeatCell];
fieldToWrap = tableConfig.cellWrappableField[tableConfig[scope.tableIndex].noRepeatCell];
if (tableConfig.isWrappable) {
if (fieldToWrap === undefined) {
return input;
}
if (tableConfig[scope.tableIndex].isWrappable) {
class_name = ['state--hasChild', 'state--isChild'];
}
for (i = 0; i < data.length; i += 1) {
entry = data[i];
for (i = 0; i < input.length; i += 1) {
entry = input[i];
if (entry[fieldToWrap] === last) {
if (!data[i - 1].has_child && !parent_found) {
data[i - 1].has_child = 1;
data[i - 1].child_class = class_name[0];
if (!input[i - 1].has_child && !parent_found) {
input[i - 1].has_child = 1;
input[i - 1].child_class = class_name[0];
entry.child_class = class_name[1];
parent_found = true;
} else {
entry.is_child = 1;
entry.child_class = class_name[1];
}
} else {
parent_found = false;
}
@ -169,20 +174,19 @@ angular.module('adagios.table', ['adagios.live',
last = entry[fieldToWrap];
}
return data;
return input;
};
}])
.filter('noRepeat', ['tableConfig', function (tableConfig) {
return function (items) {
return function (items, scope) {
var newItems = [],
previous;
previous,
fieldToCompare = tableConfig.cellWrappableField[tableConfig[scope.tableIndex].noRepeatCell],
new_attr = tableConfig[scope.tableIndex].noRepeatCell + "_additionnalClass";
angular.forEach(items, function (item) {
var fieldToCompare = tableConfig.cellWrappableField[tableConfig.noRepeatCell],
new_attr = tableConfig.noRepeatCell + "_additionnalClass";
if (previous === item[fieldToCompare]) {
item[new_attr] = 'hide-childrens';
} else {
@ -193,6 +197,7 @@ angular.module('adagios.table', ['adagios.live',
}
newItems.push(item);
});
return newItems;
};
}]);