Repository: tez Updated Branches: refs/heads/branch-0.7 32ed175ab -> 4ac6af6ed
TEZ-2866. Tez UI: Newly added columns wont be displayed by default in tables (sree) (cherry picked from commit b421e4f612a923e8e5082cea103d5c1ada7c4e2b) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/4ac6af6e Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/4ac6af6e Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/4ac6af6e Branch: refs/heads/branch-0.7 Commit: 4ac6af6edb41ef331c551f765a12eab16ae08319 Parents: 32ed175 Author: Sreenath Somarajapuram <s...@apache.org> Authored: Thu Oct 15 18:19:53 2015 +0530 Committer: Sreenath Somarajapuram <s...@apache.org> Committed: Thu Oct 15 18:24:31 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../app/scripts/mixins/column-selector-mixin.js | 36 ++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/4ac6af6e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5d4e715..7650f96 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.7.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES + TEZ-2866. Tez UI: Newly added columns wont be displayed by default in tables TEZ-2885. Remove counter logs from AMWebController. TEZ-2887. Tez build failure due to missing dependency in pom files. TEZ-2096. TEZ-UI : Add link to view AM log of finished & running apps http://git-wip-us.apache.org/repos/asf/tez/blob/4ac6af6e/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js b/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js index 3a76d61..1b21e1e 100644 --- a/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js +++ b/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js @@ -51,13 +51,13 @@ App.ColumnSelectorMixin = Em.Mixin.create({ visibleColumnIds = JSON.parse(localStorage.getItem(this._storeKey)); }catch(e){} - if(!visibleColumnIds) { - visibleColumnIds = {}; + visibleColumnIds = visibleColumnIds || {}; - this.get('defaultColumnConfigs').forEach(function (config) { + this.get('defaultColumnConfigs').forEach(function (config) { + if(visibleColumnIds[config.id] != false) { visibleColumnIds[config.id] = true; - }); - } + } + }); this._super(); this.set('visibleColumnIds', visibleColumnIds); @@ -119,19 +119,19 @@ App.ColumnSelectorMixin = Em.Mixin.create({ }, selectionChange: function () { - var visibleColumnIds = this.get('selectOptions').reduce(function (obj, option) { - if(option.get('selected')) { - obj[option.get('id')] = true; - } - return obj; - }, {}), - selectionToSave = this.get('selectOptions').reduce(function (obj, option) { - var id = option.id; - if(!id.match('_INPUT_') && !id.match('_OUTPUT_') && visibleColumnIds[id]) { - obj[id] = true; - } - return obj; - }, {}); + var visibleColumnIds = {}, + selectionToSave = {}; + + this.get('selectOptions').forEach(function (option) { + var isSelected = option.get('selected'), + id = option.get('id'), + groupName = id.split('/')[0]; + + visibleColumnIds[id] = isSelected; + if(!groupName.match('_INPUT_') && !groupName.match('_OUTPUT_')) { + selectionToSave[id] = isSelected; + } + }); if(isObjectsDifferent(visibleColumnIds, this.get('visibleColumnIds'))) { try {
