@@ -7430,26 +7430,26 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
74307430 name: "John Smith",
74317431 address: "415 East Main Street, Norfolk, Virginia",
74327432 birthMonth: 'October',
7433- car: 'Subaru-Outback '
7433+ car: 'subie-out '
74347434
74357435 },
74367436 {
74377437 name: "Frank Livingston",
74387438 address: "234 Elm Street, Pittsburgh, Pennsylvania",
74397439 birthMonth: 'March',
7440- car: 'Toyota-Prius '
7440+ car: 'Toyota-pri '
74417441 },
74427442 {
74437443 name: "Judy Green",
74447444 address: "2 Apple Boulevard, Cincinatti, Ohio",
74457445 birthMonth: 'December',
7446- car: 'Subaru -Impreza'
7446+ car: 'subie -Impreza'
74477447 },
74487448 {
74497449 name: "Pat Thomas",
74507450 address: "50 Second Street, New York, New York",
7451- birthMonth: 'February ',
7452- car: 'Subaru-Outback '
7451+ birthMonth: 'jan ',
7452+ car: 'subie-Crosstrek '
74537453 }
74547454 ];
74557455 $scope.items = $scope.allItems;
@@ -7523,24 +7523,24 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
75237523 title: 'Birth Month',
75247524 placeholder: 'Filter by Birth Month',
75257525 filterType: 'select',
7526- filterValues: ['January', ' February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
7526+ filterValues: [{title: 'January', id:'jan'}, {title:'Feb', id:' February'} , 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
75277527 },
75287528 {
75297529 id: 'car',
75307530 title: 'Car',
75317531 placeholder: 'Filter by Car Make',
75327532 filterType: 'complex-select',
7533- filterValues: ['Subaru', 'Toyota'],
7533+ filterValues: [{title: 'Subaru', id:'subie'} , 'Toyota'],
75347534 filterDelimiter: '-',
75357535 filterCategoriesPlaceholder: 'Filter by Car Model',
7536- filterCategories: {subaru : {
7537- id: 'subaru ',
7536+ filterCategories: {subie : {
7537+ id: 'subie ',
75387538 title: 'Subaru',
7539- filterValues: ['Outback', 'Crosstrek', 'Impreza']},
7539+ filterValues: [{title: 'Outback', id:'out'} , 'Crosstrek', 'Impreza']},
75407540 toyota: {
75417541 id: 'toyota',
75427542 title: 'Toyota',
7543- filterValues: ['Prius', 'Corolla', 'Echo']}
7543+ filterValues: [{title: 'Prius', id:'pri'} , 'Corolla', 'Echo']}
75447544 }
75457545 }
75467546 ],
@@ -7792,7 +7792,7 @@ angular.module('patternfly.filters').component('pfFilterFields', {
77927792 }
77937793 } else {
77947794 ctrl.addFilterFn(ctrl.currentField, filterValue);
7795- ctrl.currentValue = null ;
7795+ ctrl.currentValue = filterValue ;
77967796 }
77977797 }
77987798 }
@@ -17898,7 +17898,7 @@ angular.module('patternfly.wizard').component('pfWizard', {
1789817898
1789917899
1790017900 $templateCache.put('filters/simple-filter/filter-fields.html',
17901- "<div class=\"filter-pf filter-fields\"><div class=\"input-group form-group\"><div uib-dropdown class=input-group-btn><button uib-dropdown-toggle type=button class=\"btn btn-default filter-fields\" uib-tooltip=\"Filter by\" tooltip-placement=top tooltip-append-to-body=true>{{$ctrl.currentField.title}} <span class=caret></span></button><ul uib-dropdown-menu><li ng-repeat=\"item in $ctrl.config.fields\"><a class=filter-field role=menuitem tabindex=-1 ng-click=$ctrl.selectField(item)>{{item.title}}</a></li></ul></div><div ng-if=\"$ctrl.currentField.filterType !== 'select' && $ctrl.currentField.filterType !== 'complex-select'\"><input class=form-control type={{$ctrl.currentField.filterType}} ng-model=$ctrl.currentValue placeholder={{$ctrl.currentField.placeholder}} ng-keypress=\"$ctrl.onValueKeyPress($event)\"></div><div ng-if=\"$ctrl.currentField.filterType === 'select'\"><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle\"><span class=\"filter-option pull-left\">{{$ctrl.currentValue || $ctrl.currentField.placeholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.placeholder}}</a></li><li ng-repeat=\"filterValue in $ctrl.currentField.filterValues\" ng-class=\"{'selected': filterValue === $ctrl.currentValue}\"><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue(filterValue)>{{filterValue}}</a></li></ul></div></div><div ng-if=\"$ctrl.currentField.filterType === 'complex-select'\" class=category-select><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle\"><span class=\"filter-option pull-left\">{{$ctrl.filterCategory || $ctrl.currentField.placeholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.placeholder}}</a></li><li ng-repeat=\"filterCategory in $ctrl.currentField.filterValues\" ng-class=\"{'selected': filterCategory === $ctrl.filterCategory}\"><a role=menuitem tabindex=-1 ng-click=\"$ctrl.selectValue(filterCategory, 'filter-category')\">{{filterCategory}}</a></li></ul></div><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle category-select-value\"><span class=\"filter-option pull-left\">{{$ctrl.filterValue || $ctrl.currentField.filterCategoriesPlaceholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.filterCategoriesPlaceholder}}</a></li><li ng-repeat=\"filterValue in $ctrl.currentField.filterCategories[$ctrl.filterCategory.toLowerCase()].filterValues\" ng-class=\"{'selected': filterValue === $ctrl.filterValue}\"><a role=menuitem tabindex=-1 ng-click=\"$ctrl.selectValue(filterValue, 'filter-value')\">{{filterValue}}</a></li></ul></div></div></div></div>"
17901+ "<div class=\"filter-pf filter-fields\"><div class=\"input-group form-group\"><div uib-dropdown class=input-group-btn><button uib-dropdown-toggle type=button class=\"btn btn-default filter-fields\" uib-tooltip=\"Filter by\" tooltip-placement=top tooltip-append-to-body=true>{{$ctrl.currentField.title}} <span class=caret></span></button><ul uib-dropdown-menu><li ng-repeat=\"item in $ctrl.config.fields\"><a class=filter-field role=menuitem tabindex=-1 ng-click=$ctrl.selectField(item)>{{item.title}}</a></li></ul></div><div ng-if=\"$ctrl.currentField.filterType !== 'select' && $ctrl.currentField.filterType !== 'complex-select'\"><input class=form-control type={{$ctrl.currentField.filterType}} ng-model=$ctrl.currentValue placeholder={{$ctrl.currentField.placeholder}} ng-keypress=\"$ctrl.onValueKeyPress($event)\"></div><div ng-if=\"$ctrl.currentField.filterType === 'select'\"><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle\"><span class=\"filter-option pull-left\">{{$ctrl.currentValue || $ctrl.currentField.placeholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.placeholder}}</a></li><li ng-repeat=\"filterValue in $ctrl.currentField.filterValues\" ng-class=\"{'selected': (filterValue === $ctrl.currentValue || filterValue.id === $ctrl.currentValue)}\"><a role=menuitem tabindex=-1 ng-click=\"$ctrl.selectValue(filterValue.id || filterValue)\">{{filterValue.title || filterValue}}</a></li></ul></div></div><div ng-if=\"$ctrl.currentField.filterType === 'complex-select'\" class=category-select><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle\"><span class=\"filter-option pull-left\">{{$ctrl.filterCategory || $ctrl.currentField.placeholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.placeholder}}</a></li><li ng-repeat=\"filterCategory in $ctrl.currentField.filterValues\" ng-class=\"{'selected': (filterCategory === $ctrl.filterCategory || filterCategory.id === $ctrl.filterCategory)}\"><a role=menuitem tabindex=-1 ng-click=\"$ctrl.selectValue(filterCategory.id ||filterCategory, 'filter-category')\">{{filterCategory.title ||filterCategory}}</a></li></ul></div><div class=\"btn-group bootstrap-select form-control filter-select\" uib-dropdown><button type=button uib-dropdown-toggle class=\"btn btn-default dropdown-toggle category-select-value\"><span class=\"filter-option pull-left\">{{$ctrl.filterValue || $ctrl.currentField.filterCategoriesPlaceholder}}</span> <span class=caret></span></button><ul uib-dropdown-menu class=dropdown-menu-right role=menu><li ng-if=$ctrl.currentField.placeholder><a role=menuitem tabindex=-1 ng-click=$ctrl.selectValue()>{{$ctrl.currentField.filterCategoriesPlaceholder}}</a></li><li ng-repeat=\"filterValue in $ctrl.currentField.filterCategories[$ctrl.filterCategory.toLowerCase()].filterValues\" ng-class=\"{'selected': (filterValue === $ctrl.filterValue || filterValue.id === $ctrl.filterValue)}\"><a role=menuitem tabindex=-1 ng-click=\"$ctrl.selectValue(filterValue.id || filterValue, 'filter-value')\">{{filterValue.title || filterValue}}</a></li></ul></div></div></div></div>"
1790217902 );
1790317903
1790417904
0 commit comments