From 3fd760830221384e82d137038629dcf7949bbcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 28 May 2015 18:11:10 +0200 Subject: [PATCH] Feature #3748: Group create dialog Views are missing --- .../form-panels/create/wizard.hbs | 4 +- src/sunstone/public/app/tabs/groups-tab.js | 5 + .../public/app/tabs/groups-tab/actions.js | 16 +- .../app/tabs/groups-tab/form-panels/create.js | 179 ++++++++++++++++++ .../form-panels/create/formPanelId.js | 3 + .../groups-tab/form-panels/create/wizard.hbs | 100 ++++++++++ .../app/tabs/users-tab/utils/user-creation.js | 28 ++- 7 files changed, 325 insertions(+), 10 deletions(-) create mode 100644 src/sunstone/public/app/tabs/groups-tab/form-panels/create.js create mode 100644 src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js create mode 100644 src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs diff --git a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs index 1c0bff84fc..9aaf1d98b2 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs @@ -1,10 +1,10 @@
-
+
-
+
diff --git a/src/sunstone/public/app/tabs/groups-tab.js b/src/sunstone/public/app/tabs/groups-tab.js index fe5b845211..0483df367a 100644 --- a/src/sunstone/public/app/tabs/groups-tab.js +++ b/src/sunstone/public/app/tabs/groups-tab.js @@ -18,6 +18,10 @@ define(function(require) { require('./groups-tab/panels/showback') ]; + var _formPanels = [ + require('./groups-tab/form-panels/create') + ]; + var Tab = { tabId: TAB_ID, title: Locale.tr("Groups"), @@ -33,6 +37,7 @@ define(function(require) { actions: Actions, dataTable: new Table(DATATABLE_ID, {actions: true, info: true}), panels: _panels, + formPanels: _formPanels, dialogs: _dialogs }; diff --git a/src/sunstone/public/app/tabs/groups-tab/actions.js b/src/sunstone/public/app/tabs/groups-tab/actions.js index bc02d6f9ef..3b4c7634ef 100644 --- a/src/sunstone/public/app/tabs/groups-tab/actions.js +++ b/src/sunstone/public/app/tabs/groups-tab/actions.js @@ -7,26 +7,28 @@ define(function(require) { var RESOURCE = "Group"; var TAB_ID = require('./tabId'); - // TODO - //var CREATE_DIALOG_ID = require('./dialogs/create/dialogId'); + var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId'); var _actions = { "Group.create" : { type: "create", call: OpenNebulaResource.create, callback : function(request, response) { - Sunstone.getDialog(CREATE_DIALOG_ID).hide(); - Sunstone.getDialog(CREATE_DIALOG_ID).reset(); - DataTable.addElement(request, response); + Sunstone.resetFormPanel(TAB_ID, CREATE_DIALOG_ID); + Sunstone.hideFormPanel(TAB_ID); + Sunstone.getDataTable(TAB_ID).addElement(request, response); + }, + error: function(request, response) { + Sunstone.hideFormPanelLoading(TAB_ID); + Notifier.onError(request, response); }, - error: Notifier.onError, notify: true }, "Group.create_dialog" : { type: "custom", call: function() { - Sunstone.getDialog(CREATE_DIALOG_ID).show(); + Sunstone.showFormPanel(TAB_ID, CREATE_DIALOG_ID, "create"); } }, diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js new file mode 100644 index 0000000000..d15d5eca2b --- /dev/null +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js @@ -0,0 +1,179 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + require('foundation.tab'); + var BaseFormPanel = require('utils/form-panels/form-panel'); + var Sunstone = require('sunstone'); + var Locale = require('utils/locale'); + var UserCreation = require('tabs/users-tab/utils/user-creation'); + var Tips = require('utils/tips'); + + /* + TEMPLATES + */ + + var TemplateWizardHTML = require('hbs!./create/wizard'); + + /* + CONSTANTS + */ + + var FORM_PANEL_ID = require('./create/formPanelId'); + var TAB_ID = require('../tabId'); + + /* + CONSTRUCTOR + */ + + function FormPanel() { + this.formPanelId = FORM_PANEL_ID; + this.tabId = TAB_ID; + this.actions = { + 'create': { + 'title': Locale.tr("Create Group"), + 'buttonText': Locale.tr("Create"), + 'resetButton': true + }, + 'update': { + 'title': Locale.tr("Update Group"), + 'buttonText': Locale.tr("Update"), + 'resetButton': false + } + }; + + BaseFormPanel.call(this); + } + + FormPanel.FORM_PANEL_ID = FORM_PANEL_ID; + FormPanel.prototype = Object.create(BaseFormPanel.prototype); + FormPanel.prototype.constructor = FormPanel; + FormPanel.prototype.htmlWizard = _htmlWizard; + FormPanel.prototype.submitWizard = _submitWizard; + FormPanel.prototype.onShow = _onShow; + FormPanel.prototype.fill = _fill; + FormPanel.prototype.setup = _setup; + + return FormPanel; + + /* + FUNCTION DEFINITIONS + */ + + function _htmlWizard() { + return TemplateWizardHTML({ + 'formPanelId': this.formPanelId, + 'userCreationHTML': UserCreation.html() + }); + } + + function _setup(context) { + UserCreation.setup( $("#admin_user_wrapper",context) ); + Tips.setup(context); + + $('input#name', context).change(function(){ + var val = $(this).val(); + + $('#username',context).val(val + "-admin"); + }); + + $('input#admin_user', context).change(function(){ + if ($(this).prop('checked')) { + UserCreation.enable( $("#admin_user_wrapper",context) ); + } else { + UserCreation.disable( $("#admin_user_wrapper",context) ); + } + }); + + UserCreation.disable( $("#admin_user_wrapper",context) ); + + $.each($('[id^="group_res"]', context), function(){ + $(this).prop("checked", true); + }); + + $("#group_res_net", context).prop("checked", false); + + /* TODO + + generateAdminViewsSelect(context, "groupadmin"); + $(context).off("change", ".admin_view_input"); + $(context).on("change", ".admin_view_input", function(){ + generateAdminViewsSelect(context); + }) + + generateUserViewsSelect(context, "cloud") + $(context).off("change", ".user_view_input") + $(context).on("change", ".user_view_input", function(){ + generateUserViewsSelect(context) + }) + */ + } + + function _submitWizard(context) { + var name = $('#name',context).val(); + + var user_json = null; + + if ( $('#admin_user', context).prop('checked') ){ + user_json = UserCreation.retrieve($("#admin_user_wrapper",context)); + } + + var group_json = { + "group" : { + "name" : name + } + }; + + if (user_json){ + group_json["group"]["group_admin"] = user_json["user"]; + } + + var resources = ""; + var separator = ""; + + $.each($('[id^="group_res"]:checked', context), function(){ + resources += (separator + $(this).val()); + separator = "+"; + }); + + group_json['group']['resources'] = resources; + + if ( $('#shared_resources', context).prop('checked') ){ + group_json['group']['shared_resources'] = "VM+DOCUMENT"; + } +/* + group_json['group']['views'] = []; + + $.each($('[id^="group_view"]:checked', context), function(){ + group_json['group']['views'].push($(this).val()); + }); + + var default_view = $('#user_view_default', context).val(); + if (default_view != undefined){ + group_json['group']['default_view'] = default_view; + } + + group_json['group']['admin_views'] = []; + + $.each($('[id^="group_admin_view"]:checked', context), function(){ + group_json['group']['admin_views'].push($(this).val()); + }); + + var default_view = $('#admin_view_default', context).val(); + if (default_view != undefined){ + group_json['group']['default_admin_view'] = default_view; + } +*/ + Sunstone.runAction("Group.create",group_json); + return false; + } + + function _onShow(context) { + + } + + function _fill(context, element) { + + } +}); diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js new file mode 100644 index 0000000000..f1c914cec4 --- /dev/null +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'createGroupForm'; +}); \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs new file mode 100644 index 0000000000..7d3d2ed917 --- /dev/null +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs @@ -0,0 +1,100 @@ + + +
+
+
+
+

+ {{tr "Allow users in this group to use the following Sunstone views"}} +  {{tr "Views available to the group users. If the default is unset, the one set in sunstone-views.yaml will be used"}} +

+
+
+
+
+ {{! TODO insert_views(dialog_name)}} +
+
+
+
+
+
+
+
+ +
+
+ {{{userCreationHTML}}} +
+
+
+
+
+
+ +
+
+
+
+

+ {{tr "Allow users in this group to create the following resources"}} +  {{tr "This will create new ACL Rules to define which virtual resources this group's users will be able to create."}} +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + +
{{tr "VMs"}}{{tr "VNets"}}{{tr "Security Groups"}}{{tr "Images"}}{{tr "Templates"}}{{tr "Documents"}}{{tr "Documents are a special tool used for general purposes, mainly by OneFlow. If you want to enable users of this group to use service composition via OneFlow, let it checked."}}
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js index 9001290758..f74a8f2beb 100644 --- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js +++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js @@ -5,7 +5,9 @@ define(function(require) { return { 'html': _html, 'setup': _setup, - 'retrieve': _retrieve + 'retrieve': _retrieve, + 'disable': _disable, + 'enable': _enable }; function _html(){ @@ -59,4 +61,28 @@ define(function(require) { "auth_driver" : driver }; } + + /** + * Disables all inputs, and removes the abide required tags + * @param {object} context jquery selector + */ + function _disable(context){ + $('#username',context).attr('disabled','disabled').removeAttr('required'); + $('#pass',context).attr('disabled','disabled').removeAttr('required'); + $('#driver',context).attr('disabled','disabled').removeAttr('required'); + $('#custom_auth',context).attr('disabled','disabled').removeAttr('required'); + } + + /** + * Enables all inputs, and adds the abide required tags + * @param {object} context jquery selector + */ + function _enable(context){ + $('#username',context).removeAttr("disabled").attr('required', ''); + $('#pass',context).removeAttr("disabled").attr('required', ''); + $('#driver',context).removeAttr("disabled").attr('required', ''); + $('#custom_auth',context).removeAttr("disabled"); + + $('select#driver',context).change(); + } });