From 528145d5df30d4b344cd0edafa8e8adba0b817b1 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 27 Oct 2010 22:32:30 -0500 Subject: Framework for custom UI This patch introduces a new framework for implementing custom UI. It consists of the following classes: Main: - IPA: global namespace and object repository - ipa_entity: base class for entities - ipa_facet: base class for facets Add dialog: - ipa_add_dialog: default add dialog - ipa_add_field: the fields used in the dialog Search facet: - ipa_search_facet: default search facet - ipa_search_column: the columns in the search result Details facet: - ipa_details_facet: default details facet - ipa_details_section: the sections in the details facet - ipa_details_field: the fields in the details facet Association facet: - ipa_association_facet: default association facet - ipa_association_config: the association configurations To use this framework, create a class extending the ipa_entity (e.g. ipa_hbac). Use the create_* methods to create add dialog, search facet, details facet, and association facet. The fields/columns for the dialog and facets can be specified using the init() function. Custom UI can be defined by overwriting the base methods (e.g. setup, save, load). The entity must be added into the repository using IPA.add_entity(). The original ipa_entity_setup() has been generalized by moving facet- specific codes into the corresponding facet. Some facet names are still hard-coded. This will be fixed in follow-up patches. Some global variables have been removed because their function has been replaced by the object repository: - ipa_entity_add_list - ipa_entity_search_list - ipa_entity_details_list - window_hash_cache Some functions and variables have been moved into IPA namespace: - ipa_json_url -> IPA.json_url - ipa_use_static_files -> IPA.use_static_files - ipa_ajax_options -> IPA.ajax_options - ipa_objs -> IPA.metadata - ipa_messages -> IPA.messages - ipa_dialog -> IPA.error_dialog - ipa_init() -> IPA.init() Initially the HBAC and Service entities have been rewritten to use the new framework. The DNS is partially converted, the ipa_records_facet is used to define custom records facet. Other entities can still work using the old framework. The old framework has been modified to be a wrapper for the new framework. Eventually all entities will be converted to use the new framework. Some unit tests have been modified to use the new framework. --- install/static/entity.js | 461 +++++++++++++++++++++++++---------------------- 1 file changed, 248 insertions(+), 213 deletions(-) (limited to 'install/static/entity.js') diff --git a/install/static/entity.js b/install/static/entity.js index f6329642..f26f219b 100644 --- a/install/static/entity.js +++ b/install/static/entity.js @@ -21,262 +21,298 @@ /* REQUIRES: ipa.js, details.js, search.js, add.js */ -var ipa_entity_search_list = {}; -var ipa_entity_add_list = {}; +function ipa_facet(spec) { -//moving this to details -//var ipa_entity_details_list = {}; -var ipa_entity_association_list = {}; + spec = spec || {}; -var ipa_entity_facet_list = {}; + var that = {}; + that.name = spec.name; + that.label = spec.label; + that.entity_name = spec.entity_name; -function ipa_facet(spec){ - return spec; -}; + that.init = spec.init; + that.setup = spec.setup; + that.setup_views = ipa_facet_setup_views; + + return that; +} + +function ipa_entity(spec) { + + spec = spec || {}; + + var that = {}; + that.name = spec.name; + that.label = spec.label; + + that.setup = spec.setup; + + that.add_dialog = null; + + that.facets = []; + that.facets_by_name = {}; + + this.facet_name = null; + + that.get_add_dialog = function() { + return that.add_dialog; + }; + + that.create_add_dialog = function(spec) { + spec.entity_name = that.name; + that.add_dialog = ipa_add_dialog(spec); + return that.add_dialog; + }; + + that.get_facets = function() { + return that.facets; + }; + + that.get_facet = function(name) { + return that.facets_by_name[name]; + }; + + that.add_facet = function(facet) { + that.facets.push(facet); + that.facets_by_name[facet.name] = facet; + }; + + that.create_search_facet = function(spec) { + spec.entity_name = that.name; + var facet = ipa_search_facet(spec); + that.add_facet(facet); + return facet; + }; + + that.create_details_facet = function(spec) { + spec.entity_name = that.name; + var facet = ipa_details_facet(spec); + that.add_facet(facet); + return facet; + }; + + that.create_association_facet = function(spec) { + spec.entity_name = that.name; + var facet = ipa_association_facet(spec); + that.add_facet(facet); + return facet; + }; + + return that; +} /* use this to track individual changes between two hashchange events */ var window_hash_cache = {}; -function ipa_entity_set_search_definition(obj_name, data) -{ - ipa_entity_search_list[obj_name] = data; -} +function ipa_get_entity(entity_name) { -function ipa_entity_set_add_definition(obj_name, data) -{ - ipa_entity_add_list[obj_name] = data; -} + var entity = IPA.get_entity(entity_name); + if (entity) return entity; + + entity = ipa_entity({ + 'name': entity_name + }); -function ipa_entity_set_details_definition(obj_name, data) -{ - ipa_entity_details_list[obj_name] = data; + IPA.add_entity(entity); + return entity; } -function ipa_entity_get_details_sections(obj_name) -{ - var sections = ipa_entity_details_list[obj_name]; - if (sections) return sections; - return []; +function ipa_entity_get_search_facet(entity_name) { + + var entity = ipa_get_entity(entity_name); + + var facet = entity.get_facet('search'); + if (facet) return facet; + + facet = entity.create_search_facet({ + 'name': 'search', + 'label': 'Search' + }); + + return facet; } -function ipa_entity_set_association_definition(obj_name, data) -{ - ipa_entity_association_list[obj_name] = data; +function ipa_entity_set_search_definition(entity_name, data) { + + var facet = ipa_entity_get_search_facet(entity_name); + + for (var i=0; i div.search-controls")) - search_load(container, filter); - }, - - details : function(unspecified) { - var pkey = $.bbq.getState(obj_name + '-pkey', true); - ipa_entity_generate_views(obj_name, container, switch_view); - var sections = ipa_entity_get_details_sections(obj_name); - ipa_details_create(container, sections); - container.find('.details-reset').click(reset_on_click); - container.find('.details-update').click(update_on_click); - if (pkey||unspecified){ - ipa_details_load(container, pkey, null, null); - } - }, - - associate : function facet(unspecified) { - var pkey = $.bbq.getState(obj_name + '-pkey', true) || ''; - var enroll_obj_name = $.bbq.getState(obj_name + '-enroll', true) || ''; - var attr = ipa_get_member_attribute(obj_name, enroll_obj_name); - var columns = [ - { - title: ipa_objs[enroll_obj_name].label, - column: attr + '_' + enroll_obj_name - } - ]; - var association = ipa_entity_association_list[obj_name]; - var association_config = association ? association[enroll_obj_name] : null; - var associator = association_config ? association_config.associator : null; - var method = association_config ? association_config.method : null; - var frm = new AssociationList( - obj_name, pkey, enroll_obj_name, columns, container, - associator, method - ); - ipa_entity_generate_views(obj_name, container, switch_view); - frm.setup(); - }, - - records: function(unspecified) { - records_facet.setup(obj_name, container, switch_view ); - } +function ipa_details_only_setup(container){ + ipa_entity_setup.call(this, container, 'details'); +} - } +function ipa_entity_setup(container, unspecified) { + var entity = this; container.empty(); - var facet = $.bbq.getState(obj_name + '-facet', true) || - unspecified || 'search'; + var facet_name = $.bbq.getState(entity.name + '-facet', true) || unspecified || 'search'; - var facet_setup_function = facet_setups[facet]; - if (facet_setup_function){ - facet_setup_function(unspecified); - } -} + var facet = entity.get_facet(facet_name); + if (!facet) return; -function ipa_entity_generate_views(obj_name, container, switch_view) -{ - var ul = $('', {'class': 'entity-views'}); - - //TODO for single instance entites, don't display search - ul.append($('
  • ', { - title: 'search', - text: 'Search', - click: switch_view - })); - - ul.append($('
  • ', { - text: 'Details', - title: 'details', - click: switch_view - }).prepend('| ')); - - var attribute_members = ipa_objs[obj_name].attribute_members; - for (attr in attribute_members) { - var objs = attribute_members[attr]; - for (var i = 0; i < objs.length; ++i) { - var m = objs[i]; - var label = ipa_objs[m].label; + if (IPA.entity_name == entity.name) { + if (entity.facet_name == facet_name) { + if (!facet.is_dirty()) return; - ul.append($('
  • ', { - title: m, - text:label, - click: switch_view - }).prepend('| ')); + } else { + entity.facet_name = facet_name; } + } else { + IPA.entity_name = entity.name; } - //TODO Additional facets go here - - var facets = ipa_entity_facet_list[obj_name]; - if (facets){ - for (var f = 0; f < facets.length; f += 1){ - var facet = facets[f]; - ul.append($('
  • ', { - text: facet.name, - title: facet.name, - click: switch_view - }).prepend('| ')); + if (facet.setup) { + facet.setup(container, unspecified); + } +} + +function ipa_facet_setup_views(container) { + + var facet = this; + + var ul = $('