|
@@ -56,6 +56,11 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
value: 'UPGRADE_ABORTED',
|
|
|
isSelected: false
|
|
|
}),
|
|
|
+ Em.Object.create({
|
|
|
+ labelKey: 'admin.stackVersions.upgradeHistory.filter.failed.upgrade',
|
|
|
+ value: 'UPGRADE_FAILED',
|
|
|
+ isSelected: false
|
|
|
+ }),
|
|
|
Em.Object.create({
|
|
|
labelKey: 'admin.stackVersions.upgradeHistory.filter.successful.downgrade',
|
|
|
value: 'DOWNGRADE_COMPLETED',
|
|
@@ -66,6 +71,25 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
value: 'DOWNGRADE_ABORTED',
|
|
|
isSelected: false
|
|
|
}),
|
|
|
+ Em.Object.create({
|
|
|
+ labelKey: 'admin.stackVersions.upgradeHistory.filter.failed.downgrade',
|
|
|
+ value: 'DOWNGRADE_FAILED',
|
|
|
+ isSelected: false
|
|
|
+ })
|
|
|
+ ],
|
|
|
+ upgradeMethods: [
|
|
|
+ Em.Object.create({
|
|
|
+ displayName: Em.I18n.t('common.rolling'),
|
|
|
+ type: 'ROLLING'
|
|
|
+ }),
|
|
|
+ Em.Object.create({
|
|
|
+ displayName: Em.I18n.t('common.express'),
|
|
|
+ type: 'NON_ROLLING'
|
|
|
+ }),
|
|
|
+ Em.Object.create({
|
|
|
+ displayName: Em.I18n.t('common.hostOrdered'),
|
|
|
+ type: 'HOST_ORDERED'
|
|
|
+ })
|
|
|
],
|
|
|
|
|
|
/**
|
|
@@ -73,7 +97,7 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
*/
|
|
|
selectedCategory: Em.computed.findBy('categories', 'isSelected', true),
|
|
|
|
|
|
- filteredCount: function(){
|
|
|
+ filteredCount: function () {
|
|
|
var filteredContent = this.get('filteredContent').toArray();
|
|
|
return filteredContent.length;
|
|
|
}.property('filteredContent'),
|
|
@@ -82,13 +106,12 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
* displaying content filtered by upgrade type and upgrade status.
|
|
|
*/
|
|
|
filteredContent: function () {
|
|
|
- var result = [];
|
|
|
var filterValue = 'ALL';
|
|
|
var category = this.get('selectedCategory');
|
|
|
- if (category)
|
|
|
+ if (category) {
|
|
|
filterValue = category.get('value');
|
|
|
- var result = this.filterBy(filterValue);
|
|
|
- return result.reverse();
|
|
|
+ }
|
|
|
+ return this.filterBy(filterValue).reverse();
|
|
|
}.property('selectedCategory'),
|
|
|
|
|
|
/**
|
|
@@ -97,28 +120,25 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
pageContent: function () {
|
|
|
var content = this.get('filteredContent').toArray();
|
|
|
content = this.processForDisplay(content);
|
|
|
- content = content.slice(this.get('startIndex') - 1, this.get('endIndex'))
|
|
|
+ content = content.slice(this.get('startIndex') - 1, this.get('endIndex'));
|
|
|
return content;
|
|
|
}.property('filteredContent', 'startIndex', 'endIndex'),
|
|
|
|
|
|
- processForDisplay: function(content){
|
|
|
+ processForDisplay: function (content) {
|
|
|
var processedContent = [];
|
|
|
- content.forEach(function(item){
|
|
|
- if('UPGRADE' == item.get('direction'))
|
|
|
- item.set('directionLabel', Em.I18n.t('common.upgrade'));
|
|
|
- else
|
|
|
- item.set('directionLabel', Em.I18n.t('common.downgrade'));
|
|
|
-
|
|
|
- if('NON_ROLLING' == item.get('upgradeType'))
|
|
|
- item.set('upgradeTypeLabel', Em.I18n.t('common.express'));
|
|
|
- else
|
|
|
- item.set('upgradeTypeLabel', Em.I18n.t('common.rolling'));
|
|
|
-
|
|
|
- item.set('startTimeLabel', date.startTime(item.get('startTime')));
|
|
|
- item.set('endTimeLabel', date.startTime(item.get('endTime')));
|
|
|
- item.set('duration', date.durationSummary(item.get('startTime'), item.get('endTime')));
|
|
|
+
|
|
|
+ content.forEach(function (item) {
|
|
|
+ var direction = item.get('direction') === 'UPGRADE' ? Em.I18n.t('common.upgrade') : Em.I18n.t('common.downgrade');
|
|
|
+ var method = this.get('upgradeMethods').findProperty('type', item.get('upgradeType'));
|
|
|
+ item.setProperties({
|
|
|
+ directionLabel: direction,
|
|
|
+ upgradeTypeLabel: method ? method.get('displayName') : method,
|
|
|
+ startTimeLabel: date.startTime(item.get('startTime')),
|
|
|
+ endTimeLabel: date.startTime(item.get('endTime')),
|
|
|
+ duration: date.durationSummary(item.get('startTime'), item.get('endTime'))
|
|
|
+ });
|
|
|
processedContent.push(item);
|
|
|
- },this);
|
|
|
+ }, this);
|
|
|
return processedContent;
|
|
|
},
|
|
|
|
|
@@ -160,9 +180,9 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- willInsertElement: function(){
|
|
|
+ willInsertElement: function () {
|
|
|
var self = this;
|
|
|
- this.get('controller').loadStackUpgradeHistoryToModel().done(function(){
|
|
|
+ this.get('controller').loadStackUpgradeHistoryToModel().done(function () {
|
|
|
self.populateUpgradeHistorySummary();
|
|
|
});
|
|
|
},
|
|
@@ -171,31 +191,31 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
this.observesCategories();
|
|
|
},
|
|
|
|
|
|
- observesCategories: function(){
|
|
|
+ observesCategories: function () {
|
|
|
this.get('categories').forEach(function (category) {
|
|
|
var label = Em.I18n.t(category.labelKey).format(this.filterBy(category.value).length);
|
|
|
category.set('label', label)
|
|
|
}, this);
|
|
|
}.observes('isReady'),
|
|
|
|
|
|
- filterBy: function(filterValue){
|
|
|
+ filterBy: function (filterValue) {
|
|
|
if ('ALL' == filterValue) {
|
|
|
var all_records = App.StackUpgradeHistory.find();
|
|
|
return all_records.toArray();
|
|
|
} else {
|
|
|
var tokens = filterValue.split('_');
|
|
|
- var direction_token = null
|
|
|
- var status_token = null
|
|
|
+ var direction_token = null;
|
|
|
+ var status_token = null;
|
|
|
|
|
|
if (tokens.length == 1) {
|
|
|
direction_token = tokens[0]
|
|
|
} else if (tokens.length > 1) {
|
|
|
- direction_token = tokens[0]
|
|
|
- status_token = tokens[1]
|
|
|
+ direction_token = tokens[0];
|
|
|
+ status_token = tokens[1];
|
|
|
}
|
|
|
|
|
|
- var result = []
|
|
|
- App.StackUpgradeHistory.find().forEach(function(item){
|
|
|
+ var result = [];
|
|
|
+ App.StackUpgradeHistory.find().forEach(function (item) {
|
|
|
var direction = item.get('direction');
|
|
|
if (direction == direction_token) {
|
|
|
if (status_token != null) {
|
|
@@ -214,46 +234,46 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- selectCategory: function(event){
|
|
|
+ selectCategory: function (event) {
|
|
|
this.get('categories').filterProperty('isSelected').setEach('isSelected', false);
|
|
|
event.context.set('isSelected', true);
|
|
|
},
|
|
|
|
|
|
- populateUpgradeHistorySummary: function(){
|
|
|
+ populateUpgradeHistorySummary: function () {
|
|
|
this.set('isReady', false);
|
|
|
var result = [
|
|
|
Em.Object.create({
|
|
|
direction: 'UPGRADE',
|
|
|
- label:Em.I18n.t('common.upgrade'),
|
|
|
+ label: Em.I18n.t('common.upgrade'),
|
|
|
hasSuccess: false,
|
|
|
- success:0,
|
|
|
+ success: 0,
|
|
|
hasAbort: false,
|
|
|
- abort:0,
|
|
|
+ abort: 0
|
|
|
}),
|
|
|
Em.Object.create({
|
|
|
direction: 'DOWNGRADE',
|
|
|
- label:Em.I18n.t('common.downgrade'),
|
|
|
+ label: Em.I18n.t('common.downgrade'),
|
|
|
hasSuccess: false,
|
|
|
- success:0,
|
|
|
+ success: 0,
|
|
|
hasAbort: false,
|
|
|
- abort:0,
|
|
|
+ abort: 0
|
|
|
})
|
|
|
];
|
|
|
|
|
|
- App.StackUpgradeHistory.find().forEach(function(item){
|
|
|
+ App.StackUpgradeHistory.find().forEach(function (item) {
|
|
|
var direction = item.get('direction');
|
|
|
var status = item.get('requestStatus');
|
|
|
- if('UPGRADE' == direction){
|
|
|
- if('COMPLETED' == status){
|
|
|
+ if ('UPGRADE' == direction) {
|
|
|
+ if ('COMPLETED' == status) {
|
|
|
result[0].set('success', result[0].get('success') + 1);
|
|
|
} else if ('ABORTED' == status) {
|
|
|
result[0].set('abort', result[0].get('abort') + 1);
|
|
|
}
|
|
|
- } else if('DOWNGRADE' == direction){
|
|
|
- if('COMPLETED' == status){
|
|
|
- result[1].set('success', result[1].get('success')+1);
|
|
|
- } else if ('ABORTED' == status){
|
|
|
- result[1].set('abort', result[1].get('abort')+1);
|
|
|
+ } else if ('DOWNGRADE' == direction) {
|
|
|
+ if ('COMPLETED' == status) {
|
|
|
+ result[1].set('success', result[1].get('success') + 1);
|
|
|
+ } else if ('ABORTED' == status) {
|
|
|
+ result[1].set('abort', result[1].get('abort') + 1);
|
|
|
}
|
|
|
}
|
|
|
}, this);
|
|
@@ -267,23 +287,18 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
|
|
|
this.set('isReady', true);
|
|
|
},
|
|
|
|
|
|
- showUpgradeHistoryRecord: function(event) {
|
|
|
- var record = event.context
|
|
|
- var title = '';
|
|
|
+ showUpgradeHistoryRecord: function (event) {
|
|
|
+ var record = event.context;
|
|
|
var direction = App.format.normalizeName(record.get('direction'));
|
|
|
- var type = record.get('upgradeType')
|
|
|
- if ('ROLLING' == type)
|
|
|
- type = App.format.normalizeName(type);
|
|
|
- else if ('NON_ROLLING' == type)
|
|
|
- type = 'Express'
|
|
|
-
|
|
|
- title = Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(type, direction, record.get('fromVersion'));
|
|
|
+ var type = this.get('upgradeMethods').findProperty('type', record.get('upgradeType'));
|
|
|
+ var displayName = type ? type.get('displayName') : record.get('upgradeType');
|
|
|
|
|
|
- this.get('controller').set('currentUpgradeRecord', record)
|
|
|
+ this.get('controller').set('currentUpgradeRecord', record);
|
|
|
|
|
|
App.ModalPopup.show({
|
|
|
- classNames: ['full-width-modal'],
|
|
|
- header: title,
|
|
|
+ classNames: ['wizard-modal-wrapper'],
|
|
|
+ modalDialogClasses: ['modal-xlg'],
|
|
|
+ header: Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName, direction, record.get('fromVersion')),
|
|
|
bodyClass: App.MainAdminStackUpgradeHistoryDetailsView,
|
|
|
primary: Em.I18n.t('common.dismiss'),
|
|
|
secondary: null,
|