HBAC Services

The HBAC Service search and details pages have been added under the HBAC
tab. This requires some changes to the framework.

Currently the navigation framework doesn't support multiple entities under
one tab. As a temporary solution, an 'entity' URL parameter is used to
determine the entity to be displayed. This parameter is now only used by
HBAC tab, but its use might be expanded later. The navigation framework
needs be redesigned to provide more flexibility.

The search page in all entities except DNS records have been changed to
use the ipa_search_widget. The Select/Unselect All checbox and Delete
button now work correctly and consistently.

The Add dialog has been enhanced to render and work in a more consistent
way while still supporting custom widgets & layouts. For the search page,
the Add button will refresh the search results and clear the fields in
the dialog box.

The framework now provides some extension points which can be overriden
by the subclasses:
 - init(): for initialization and configuration
 - create(): for creating the layout dynamically or from template
 - setup(): for setting the look and feel
 - load(): for loading the data

Entity and facet initialization is now done after IPA.init(). This is to
ensure the metadata is loaded first so the entities and facets can use
localized messages/labels/titles.

The group entity has been partially converted to use the new framework.

The unit tests have been updated accordingly.

1 files changed, 51 insertions, 131 deletions

diff --git a/install/static/add.js b/install/static/add.js
index 671d11f9..9c68aea3 100644
--- a/install/static/add.js
+++ b/install/static/add.js
@@ -21,160 +21,80 @@
 
 /* REQUIRES: ipa.js */
 
-var IPA_ADD_POPULATE = 1;
-var IPA_ADD_UPDATE = 2;
-
-function ipa_add_field(spec) {
-
-    spec = spec || {};
-
-    var that = {};
-    that.name = spec.name;
-    that.label = spec.label;
-    that._entity_name = spec.entity_name;
-
-    that.init = spec.init;
-    that.setup = spec.setup;
-
-    that.__defineGetter__("entity_name", function(){
-        return that._entity_name;
-    });
-
-    that.__defineSetter__("entity_name", function(entity_name){
-        that._entity_name = entity_name;
-    });
-
-    return that;
-}
-
 function ipa_add_dialog(spec) {
 
     spec = spec || {};
 
-    var that = {};
+    var that = ipa_dialog(spec);
+
     that.name = spec.name;
     that.title = spec.title;
     that._entity_name = spec.entity_name;
 
-    that.init = spec.init;
-
-    that.fields = [];
-    that.fields_by_name = {};
-
-    var dialog = $('<div/>');
-
-    that.__defineGetter__("entity_name", function(){
-        return that._entity_name;
-    });
-
-    that.__defineSetter__("entity_name", function(entity_name){
-        that._entity_name = entity_name;
+    that.init = function() {
+
+        that.add_button('Add', function() {
+            var record = that.get_record();
+            that.add(
+                record,
+                function() {
+                    var entity = IPA.get_entity(that.entity_name);
+                    var facet = entity.get_facet('search');
+                    var table = facet.table;
+                    table.refresh(that.container);
+                    that.clear(that.container);
+                }
+            );
+        });
 
-        for (var i=0; i<that.fields.length; i++) {
-            that.fields[i].entity_name = entity_name;
-        }
-    });
+        that.add_button('Add and Edit', function() {
+            var record = that.get_record();
+            that.add(
+                record,
+                function() {
+                    that.close();
+
+                    var pkey_name = IPA.metadata[that.entity_name].primary_key;
+                    var pkey = record[pkey_name];
+
+                    var state = {};
+                    state[that.entity_name + '-facet'] = 'details';
+                    state[that.entity_name + '-pkey'] = pkey;
+                    $.bbq.pushState(state);
+                },
+                function() { that.close(); }
+            );
+        });
 
-    that.get_fields = function() {
-        return that.fields;
+        that.add_button('Cancel', function() {
+            that.close();
+        });
     };
 
-    that.get_field = function(name) {
-        return that.fields_by_name[name];
-    };
+    that.add = function(record, on_success, on_error) {
 
-    that.add_field = function(field) {
-        that.fields.push(field);
-        that.fields_by_name[field.name] = field;
-    };
-
-    that.create_field = function(spec) {
-        var field = ipa_add_field(spec);
-        that.add_field(field);
-        return field;
-    };
+        var pkey_name = IPA.metadata[that.entity_name].primary_key;
 
-    that.open = function() {
-        dialog.empty();
-        dialog.attr('id', that.name);
-        dialog.attr('title', that.title);
+        var args = [];
+        var options = {};
 
-        for (var i = 0; i < that.fields.length; ++i) {
+        for (var i=0; i<that.fields.length; i++) {
             var field = that.fields[i];
-            if (field.setup) {
-                field.setup(dialog, IPA_ADD_POPULATE);
-            } else {
-                dialog.append('<label>' + field.label + '</label>');
-                dialog.append('<input type="text" name="' + field.name + '" />');
-                dialog.append('<br/>');
-            }
-        }
 
-        dialog.dialog({
-            modal: true,
-            buttons: {
-                'Add': that.add,
-                'Add and edit': that.add_and_edit,
-                'Cancel': that.cancel
-            }
-        });
-    };
+            var value = record[field.name];
+            if (!value) continue;
 
-    that.add = function(evt, called_from_add_and_edit) {
-        var pkey = [];
-        var options = {};
-        var pkey_name = IPA.metadata[that.entity_name].primary_key;
-
-        function add_win(data, text_status, xhr) {
-            if (called_from_add_and_edit) {
-                var state = {};
-                state[that.entity_name + '-facet'] = 'details';
-                state[that.entity_name + '-pkey'] = pkey[0];
-                $.bbq.pushState(state);
-            }else{
-                dialog.find('input').each( function () {
-                    $(this).val('');
-                });
-            }
-        }
-        for (var i = 0; i < that.fields.length; ++i) {
-            var field = that.fields[i];
-            if (field.setup) {
-                var value = field.setup(dialog, IPA_ADD_UPDATE);
-                if (value != null) {
-                    if (field.name == pkey_name){
-                        pkey = [value];
-                    } else {
-                        options[field.name] = value;
-                    }
-                }
+            if (field.name == pkey_name) {
+                args.push(value);
+            } else {
+                options[field.name] = value;
             }
         }
-        dialog.find('input').each(function () {
-            var jobj = $(this);
-            var attr = jobj.attr('name');
-            var value = jobj.val();
-            if (value) {
-                if (pkey.length == 0 && attr == pkey_name)
-                    pkey = [jobj.val()];
-                else if (options[attr] == null)
-                    options[attr] = jobj.val();
-            }
-        });
-
-        ipa_cmd('add', pkey, options, add_win, null, that.entity_name);
-    };
-
-    that.add_and_edit = function(evt) {
-        that.add(evt, true);
-        dialog.dialog('close');
-    };
 
-    that.cancel = function() {
-        dialog.dialog('close');
+        ipa_cmd('add', args, options, on_success, on_error, that.entity_name);
     };
 
-    if (that.init) that.init();
+    that.super_init = that.super('init');
 
     return that;
 }