feature #3748: Refactor zones-tab to use the tab-datatable util

This commit is contained in:
Daniel Molina committed 2015-04-17 10:15:56 +02:00
1 parent b394ee14db
commit 74ae4912a3
8 files changed
+165 -50

No files matched your search

+10 -9
View File
@@ -1,5 +1,6 @@
define(function(require) {
var OpenNebulaHelper = require('./helper');
var OpenNebulaError = require('./error');
var listCache = {};
var listWaiting = {};
@@ -34,7 +35,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -57,7 +58,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -148,7 +149,7 @@ define(function(require) {
if (callback) {
//console.log(cache_name+" list. ERROR Callback called");
callback(request, OpenNebula.Error(response));
callback(request, OpenNebulaError(response));
}
}
@@ -178,7 +179,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -205,7 +206,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -264,7 +265,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -290,7 +291,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -315,7 +316,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -340,7 +341,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebula.Error(response)) : null;
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
+2 -1
View File
@@ -98,7 +98,8 @@ define(function(require) {
"logo": (_config['view']["provision_logo"] || "images/one_small_logo.png")
},
'autoRefresh' : _config['view']['autorefresh']
'autoRefresh' : _config['view']['autorefresh'],
'tableOrder': _config['user_config']['table_order']
}
return Config;
+4 -4
View File
@@ -24,17 +24,17 @@
<div class="small-12 large-12 columns">
<div class="action_blocks"></div>
<div class="small-3 large-3 columns only-right-list" style="margin-top: 2px">
{{#if searchInput}}
{{{searchInput}}}
{{#if dataTable.searchInputHTML}}
{{{dataTable.searchInputHTML}}}
{{/if}}
</div>
</div>
</div>
{{/if}}
<div class="right-list">
{{#if table}}
{{#if dataTable.dataTableHTML}}
<div class="row">
<div class="large-12 columns">{{{table}}}</div>
<div class="large-12 columns">{{{dataTable.dataTableHTML}}}</div>
</div>
{{/if}}
+6 -5
View File
@@ -1,19 +1,20 @@
define(function(require) {
var Locale = require('utils/locale');
var Buttons = require('./zones-tab/buttons')
var TableTemplate = require('hbs!./zones-tab/table')
var Buttons = require('./zones-tab/buttons');
var Actions = require('./zones-tab/actions');
var DataTable = require('./zones-tab/datatable');
var zonesTab = {
title: Locale.tr("Zones"),
resource: 'Zone',
buttons: Buttons,
tabClass: "subTab",
parentTab: "infra-tab",
searchInput: '<input id="zone_search" type="search" placeholder="' + Locale.tr("Search") + '" />',
listHeader: '<i class="fa fa-fw fa-files-o"></i>&emsp;' + Locale.tr("Zones"),
infoHeader: '<i class="fa fa-fw fa-files-o"></i>&emsp;' + Locale.tr("Zone"),
subheader: '<span/> <small></small>&emsp;',
table: TableTemplate()
buttons: Buttons,
actions: Actions,
dataTable: DataTable
};
return {
@@ -1,106 +1,112 @@
define(function(require) {
var zone_actions = {
var OpenNebulaZone = require('opennebula/zone');
var Sunstone = require('sunstone');
var Notifier = require('utils/notifier');
var ZonesDataTable = require('./datatable');
var _zoneActions = {
"Zone.create" : {
type: "create",
call: OpenNebula.Zone.create,
call: OpenNebulaZone.create,
callback: function(request, response) {
$create_zone_dialog.foundation('reveal', 'close');
$("form", $create_zone_dialog)[0].reset();
Sunstone.runAction('Zone.list');
},
error: onError,
error: Notifier.onError,
notify: true
},
"Zone.create_dialog" : {
type: "custom",
call: popUpCreateZoneDialog
// TODO call: popUpCreateZoneDialog
},
"Zone.list" : {
type: "list",
call: OpenNebula.Zone.list,
callback: updateZonesView,
error: onError
call: OpenNebulaZone.list,
callback: ZonesDataTable.updateZonesView,
error: Notifier.onError
},
"Zone.show" : {
type: "single",
call: OpenNebula.Zone.show,
call: OpenNebulaZone.show,
callback: function(request, response) {
var tab = dataTable_zones.parents(".tab");
// TODO var tab = dataTable_zones.parents(".tab");
if (Sunstone.rightInfoVisible(tab)) {
// individual view
updateZoneInfo(request, response);
// TODO updateZoneInfo(request, response);
}
// datatable row
updateZoneElement(request, response);
ZonesDataTable.updateZoneElement(request, response);
},
error: onError
error: Notifier.onError
},
"Zone.show_to_update" : {
type: "single",
call: OpenNebula.Zone.show,
callback: fillPopPup,
error: onError
call: OpenNebulaZone.show,
// TODO callback: fillPopPup,
error: Notifier.onError
},
"Zone.refresh" : {
type: "custom",
call: function() {
var tab = dataTable_zones.parents(".tab");
var tab = $("#zones-tab");
if (Sunstone.rightInfoVisible(tab)) {
Sunstone.runAction("Zone.show", Sunstone.rightInfoResourceId(tab))
} else {
waitingNodes(dataTable_zones);
ZonesDataTable.waitingNodes();
Sunstone.runAction("Zone.list", {force: true});
}
},
error: onError
error: Notifier.onError
},
"Zone.delete" : {
type: "multiple",
call : OpenNebula.Zone.del,
callback : deleteZoneElement,
elements: zoneElements,
error : onError,
call : OpenNebulaZone.del,
callback : ZonesDataTable.deleteZoneElement,
elements: ZonesDataTable.zoneElements,
error : Notifier.onError,
notify:true
},
"Zone.update_template" : { // Update template
type: "single",
call: OpenNebula.Zone.update,
call: OpenNebulaZone.update,
callback: function(request, response) {
notifyMessage(tr("Zone updated correctly"));
Notifier.notifyMessage(tr("Zone updated correctly"));
Sunstone.runAction('Zone.show', request.request.data[0][0]);
},
error: onError
error: Notifier.onError
},
"Zone.fetch_template" : {
type: "single",
call: OpenNebula.Zone.fetch_template,
call: OpenNebulaZone.fetch_template,
callback: function(request, response) {
$('#template_update_dialog #template_update_textarea').val(response.template);
},
error: onError
error: Notifier.onError
},
"Zone.rename" : {
type: "single",
call: OpenNebula.Zone.rename,
call: OpenNebulaZone.rename,
callback: function(request) {
notifyMessage(tr("Zone renamed correctly"));
Notifier.notifyMessage(tr("Zone renamed correctly"));
Sunstone.runAction('Zone.show', request.request.data[0][0]);
},
error: onError,
error: Notifier.onError,
notify: true
}
};
return _zoneActions;
})
@@ -0,0 +1,105 @@
define(function(require) {
require('foundation-datatables');
var SunstoneConfig = require('sunstone-config');
var TabDataTable = require('utils/tab-datatable');
var _dataTableZones;
var DATATABLE_ID = "dataTableZones";
var DATATABLE_SEARCH_ID = "zonesSearch";
var TAB_NAME = 'zones-tab';
function _initialize() {
_dataTableZones = $('#'+DATATABLE_ID).dataTable({
"bSortClasses": false,
"bDeferRender": true,
"aoColumnDefs": [
{"bSortable": false, "aTargets": ["check"]},
{"sWidth": "35px", "aTargets": [0]},
{"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
{"bVisible": false, "aTargets": ['_all']}
]
});
$('#'+DATATABLE_SEARCH_ID).keyup(function() {
_dataTableZones.fnFilter($(this).val());
})
_dataTableZones.on('draw', function() {
TabDataTable.recountCheckboxes(_dataTableZones);
})
TabDataTable.initCheckAllBoxes(_dataTableZones);
TabDataTable.tableCheckboxesListener(_dataTableZones);
TabDataTable.infoListener(_dataTableZones, "Zone.show");
_dataTableZones.fnSort([[1, SunstoneConfig.tableOrder]]);
}
var _dataTableHTML = function() {
var TemplateDataTableHTML = require('hbs!./datatable/table');
return TemplateDataTableHTML({'dataTableId': DATATABLE_ID});
}
var _searchInputHTML = function() {
var TemplateSearchInputHTML = require('hbs!./datatable/search-input');
return TemplateSearchInputHTML({'dataTableSearchId': DATATABLE_SEARCH_ID});
}
var _zoneElements = function() {
return TabDataTable.getSelectedNodes(_dataTableZones);
}
var _zoneElementArray = function(element_json) {
var element = element_json.ZONE;
return [
'<input class="check_item" type="checkbox" id="zone_' + element.ID + '" name="selected_items" value="' + element.ID + '"/>',
element.ID,
element.NAME,
element.TEMPLATE.ENDPOINT
];
}
//callback for an action affecting a zone element
var _updateZoneElement = function(request, element_json) {
var id = element_json.ZONE.ID;
var element = _zoneElementArray(element_json);
TabDataTable.updateSingleElement(element, _dataTableZones, '#zone_' + id);
}
//callback for actions deleting a zone element
var _deleteZoneElement = function(req) {
TabDataTable.deleteElement(_dataTableZones, '#zone_' + req.request.data);
$('div#zone_tab_' + req.request.data, main_tabs_context).remove();
}
//call back for actions creating a zone element
var _addZoneElement = function(request, element_json) {
var element = _zoneElementArray(element_json);
TabDataTable.addElement(element, _dataTableZones);
}
//callback to update the list of zones.
var _updateZonesView =function(request, list) {
var list_array = [];
$.each(list, function() {
list_array.push(_zoneElementArray(this));
});
TabDataTable.updateView(list_array, _dataTableZones);
};
return {
'initialize': _initialize,
'dataTableHTML': _dataTableHTML,
'searchInputHTML': _searchInputHTML,
'zoneElements': _zoneElements,
'zoneElementArray': _zoneElementArray,
'updateZoneElement': _updateZoneElement,
'deleteZoneElement': _deleteZoneElement,
'addZoneElement': _addZoneElement,
'updateZonesView': _updateZonesView,
'waitingNodes': TabDataTable.waitingNodes
}
});
@@ -0,0 +1 @@
<input id="{{searchInputId}}" type="search" placeholder="{{tr "Search"}}" />
@@ -1,4 +1,4 @@
<table id="datatable_zones" class="datatable twelve">
<table id="{{dataTableId}}" class="datatable twelve">
<thead>
<tr>
<th class="check">