[21/24] ambari git commit: AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko)
AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/def3b0ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/def3b0ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/def3b0ae Branch: refs/heads/branch-feature-AMBARI-18456 Commit: def3b0ae85b968c7dd41307f4c671bf07d4fc826 Parents: 9348725 Author: Alex AntonenkoAuthored: Fri Dec 2 15:18:46 2016 +0200 Committer: Alex Antonenko Committed: Fri Dec 2 20:13:17 2016 +0200 -- .../controllers/main/service/info/summary.js| 37 +++- .../main/service/info/service_alert_popup.hbs | 15 +--- 2 files changed, 31 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/controllers/main/service/info/summary.js -- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 88a6581..fc423fe 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/ambari-web/app/controllers/main/service/info/summary.js @@ -386,25 +386,30 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix var property = context.get('componentName') ? 'componentName' : 'serviceName'; var serviceDefinitions = this.get('controller.content').filterProperty(property, context.get(property)); // definitions should be sorted in order: critical, warning, ok, unknown, other - var criticalDefinitions = [], warningDefinitions = [], okDefinitions = [], unknownDefinitions = []; + var definitionTypes = { +"isCritical": [], +"isWarning": [], +"isOK": [], +"isUnknown": [] + }; + serviceDefinitions.forEach(function (definition) { -if (definition.get('isCritical')) { - criticalDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isWarning')) { - warningDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isOK')) { - okDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isUnknown')) { - unknownDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} +Object.keys(definitionTypes).forEach(function (type) { + if (definition.get(type)) { +definition.set('isCollapsed', true); +definitionTypes[type].push(definition); +serviceDefinitions = serviceDefinitions.without(definition); + } +}); }); - serviceDefinitions = criticalDefinitions.concat(warningDefinitions, okDefinitions, unknownDefinitions, serviceDefinitions); + serviceDefinitions = definitionTypes.isCritical.concat(definitionTypes.isWarning, definitionTypes.isOK, definitionTypes.isUnknown, serviceDefinitions); + return serviceDefinitions; }.property('controller.content'), +onToggleBlock: function (alert) { + this.$('#' + alert.context.clientId).toggle('blind', 500); + alert.context.set("isCollapsed", !alert.context.get("isCollapsed")); +}, gotoAlertDetails: function (event) { if (event && event.context) { this.get('parentView').hide(); @@ -856,4 +861,4 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix App.router.route('main' + event.context.href); } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/templates/main/service/info/service_alert_popup.hbs -- diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs index 3c132a3..8b72a50 100644 --- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs +++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs @@ -22,11 +22,16 @@ - - {{alert.label}} - - - {{alert.latestText}} + + + +{{alert.label}} + + +
ambari git commit: AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko)
Repository: ambari Updated Branches: refs/heads/branch-2.5 8f0a0ae41 -> f39bd6b6c AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f39bd6b6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f39bd6b6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f39bd6b6 Branch: refs/heads/branch-2.5 Commit: f39bd6b6c8ca5790f5370c7f910f60d21b5f2c8d Parents: 8f0a0ae Author: Alex AntonenkoAuthored: Fri Dec 2 01:16:00 2016 +0200 Committer: Alex Antonenko Committed: Fri Dec 2 23:08:23 2016 +0200 -- .../controllers/main/service/info/summary.js| 37 +++- .../main/service/info/service_alert_popup.hbs | 15 +--- 2 files changed, 31 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f39bd6b6/ambari-web/app/controllers/main/service/info/summary.js -- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 821b796..09f3429 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/ambari-web/app/controllers/main/service/info/summary.js @@ -386,25 +386,30 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix var property = context.get('componentName') ? 'componentName' : 'serviceName'; var serviceDefinitions = this.get('controller.content').filterProperty(property, context.get(property)); // definitions should be sorted in order: critical, warning, ok, unknown, other - var criticalDefinitions = [], warningDefinitions = [], okDefinitions = [], unknownDefinitions = []; + var definitionTypes = { +"isCritical": [], +"isWarning": [], +"isOK": [], +"isUnknown": [] + }; + serviceDefinitions.forEach(function (definition) { -if (definition.get('isCritical')) { - criticalDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isWarning')) { - warningDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isOK')) { - okDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isUnknown')) { - unknownDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} +Object.keys(definitionTypes).forEach(function (type) { + if (definition.get(type)) { +definition.set('isCollapsed', true); +definitionTypes[type].push(definition); +serviceDefinitions = serviceDefinitions.without(definition); + } +}); }); - serviceDefinitions = criticalDefinitions.concat(warningDefinitions, okDefinitions, unknownDefinitions, serviceDefinitions); + serviceDefinitions = definitionTypes.isCritical.concat(definitionTypes.isWarning, definitionTypes.isOK, definitionTypes.isUnknown, serviceDefinitions); + return serviceDefinitions; }.property('controller.content'), +onToggleBlock: function (alert) { + this.$('#' + alert.context.clientId).toggle('blind', 500); + alert.context.set("isCollapsed", !alert.context.get("isCollapsed")); +}, gotoAlertDetails: function (event) { if (event && event.context) { this.get('parentView').hide(); @@ -855,4 +860,4 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix App.router.route('main' + event.context.href); } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/f39bd6b6/ambari-web/app/templates/main/service/info/service_alert_popup.hbs -- diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs index cbadf06..6ab6b3f 100644 --- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs +++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs @@ -22,11 +22,16 @@ - - {{alert.label}} - - - {{alert.latestText}} + + + +
[48/50] [abbrv] ambari git commit: AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko)
AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/def3b0ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/def3b0ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/def3b0ae Branch: refs/heads/branch-dev-patch-upgrade Commit: def3b0ae85b968c7dd41307f4c671bf07d4fc826 Parents: 9348725 Author: Alex AntonenkoAuthored: Fri Dec 2 15:18:46 2016 +0200 Committer: Alex Antonenko Committed: Fri Dec 2 20:13:17 2016 +0200 -- .../controllers/main/service/info/summary.js| 37 +++- .../main/service/info/service_alert_popup.hbs | 15 +--- 2 files changed, 31 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/controllers/main/service/info/summary.js -- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 88a6581..fc423fe 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/ambari-web/app/controllers/main/service/info/summary.js @@ -386,25 +386,30 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix var property = context.get('componentName') ? 'componentName' : 'serviceName'; var serviceDefinitions = this.get('controller.content').filterProperty(property, context.get(property)); // definitions should be sorted in order: critical, warning, ok, unknown, other - var criticalDefinitions = [], warningDefinitions = [], okDefinitions = [], unknownDefinitions = []; + var definitionTypes = { +"isCritical": [], +"isWarning": [], +"isOK": [], +"isUnknown": [] + }; + serviceDefinitions.forEach(function (definition) { -if (definition.get('isCritical')) { - criticalDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isWarning')) { - warningDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isOK')) { - okDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isUnknown')) { - unknownDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} +Object.keys(definitionTypes).forEach(function (type) { + if (definition.get(type)) { +definition.set('isCollapsed', true); +definitionTypes[type].push(definition); +serviceDefinitions = serviceDefinitions.without(definition); + } +}); }); - serviceDefinitions = criticalDefinitions.concat(warningDefinitions, okDefinitions, unknownDefinitions, serviceDefinitions); + serviceDefinitions = definitionTypes.isCritical.concat(definitionTypes.isWarning, definitionTypes.isOK, definitionTypes.isUnknown, serviceDefinitions); + return serviceDefinitions; }.property('controller.content'), +onToggleBlock: function (alert) { + this.$('#' + alert.context.clientId).toggle('blind', 500); + alert.context.set("isCollapsed", !alert.context.get("isCollapsed")); +}, gotoAlertDetails: function (event) { if (event && event.context) { this.get('parentView').hide(); @@ -856,4 +861,4 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix App.router.route('main' + event.context.href); } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/templates/main/service/info/service_alert_popup.hbs -- diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs index 3c132a3..8b72a50 100644 --- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs +++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs @@ -22,11 +22,16 @@ - - {{alert.label}} - - - {{alert.latestText}} + + + +{{alert.label}} + + +
ambari git commit: AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko)
Repository: ambari Updated Branches: refs/heads/trunk 9348725b1 -> def3b0ae8 AMBARI-19049. Alerts Popup displays full error stacktrace instead of minimal content (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/def3b0ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/def3b0ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/def3b0ae Branch: refs/heads/trunk Commit: def3b0ae85b968c7dd41307f4c671bf07d4fc826 Parents: 9348725 Author: Alex AntonenkoAuthored: Fri Dec 2 15:18:46 2016 +0200 Committer: Alex Antonenko Committed: Fri Dec 2 20:13:17 2016 +0200 -- .../controllers/main/service/info/summary.js| 37 +++- .../main/service/info/service_alert_popup.hbs | 15 +--- 2 files changed, 31 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/controllers/main/service/info/summary.js -- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 88a6581..fc423fe 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/ambari-web/app/controllers/main/service/info/summary.js @@ -386,25 +386,30 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix var property = context.get('componentName') ? 'componentName' : 'serviceName'; var serviceDefinitions = this.get('controller.content').filterProperty(property, context.get(property)); // definitions should be sorted in order: critical, warning, ok, unknown, other - var criticalDefinitions = [], warningDefinitions = [], okDefinitions = [], unknownDefinitions = []; + var definitionTypes = { +"isCritical": [], +"isWarning": [], +"isOK": [], +"isUnknown": [] + }; + serviceDefinitions.forEach(function (definition) { -if (definition.get('isCritical')) { - criticalDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isWarning')) { - warningDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isOK')) { - okDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} else if (definition.get('isUnknown')) { - unknownDefinitions.push(definition); - serviceDefinitions = serviceDefinitions.without(definition); -} +Object.keys(definitionTypes).forEach(function (type) { + if (definition.get(type)) { +definition.set('isCollapsed', true); +definitionTypes[type].push(definition); +serviceDefinitions = serviceDefinitions.without(definition); + } +}); }); - serviceDefinitions = criticalDefinitions.concat(warningDefinitions, okDefinitions, unknownDefinitions, serviceDefinitions); + serviceDefinitions = definitionTypes.isCritical.concat(definitionTypes.isWarning, definitionTypes.isOK, definitionTypes.isUnknown, serviceDefinitions); + return serviceDefinitions; }.property('controller.content'), +onToggleBlock: function (alert) { + this.$('#' + alert.context.clientId).toggle('blind', 500); + alert.context.set("isCollapsed", !alert.context.get("isCollapsed")); +}, gotoAlertDetails: function (event) { if (event && event.context) { this.get('parentView').hide(); @@ -856,4 +861,4 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix App.router.route('main' + event.context.href); } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/def3b0ae/ambari-web/app/templates/main/service/info/service_alert_popup.hbs -- diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs index 3c132a3..8b72a50 100644 --- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs +++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs @@ -22,11 +22,16 @@ - - {{alert.label}} - - - {{alert.latestText}} + + + +