IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

tab objects

Browse Source 
Convert the tab lists to arrays of objects with four potential fields:

tab[0] -> tab.name
tab[1] -> tab.label
tab[2] -> tab.setup or tab.children

Added unit tests for nav_setup and nav_select_tab
This commit is contained in:
Adam Young
2010-09-28 19:20:02 -04:00
parent d201a4350d
commit 09555fae17
6 changed files with 142 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
install/static/navigation.js
View File

@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
function nav_create(nls, container, tabclass)
{
if (!container)
@@ -50,21 +51,21 @@ function nav_generate_tabs(nls, container, tabclass, depth)
for (var i = 0; i < nls.length; ++i) {
var n = nls[i];
var name = n[1];
if ((ipa_objs[n[0]]) && (ipa_objs[n[0]].label)){
name = ipa_objs[n[0]].label;
var name = n.name;
if ((ipa_objs[n.name]) && (ipa_objs[n.name].label)){
name = ipa_objs[n.name].label;
}
var li = nav_create_tab_li(n[0], name);
var li = nav_create_tab_li(n.name, name);
ul.append(li);
var div = nav_create_tab_div(n[0]);
var div = nav_create_tab_div(n.name);
container.append(div);
if (typeof n[2] == 'function') {
n[2](div);
} else if (n[2].length) {
nav_generate_tabs(n[2], div, tabclass, depth +1 );
if (n.setup) {
n.setup(div);
} else if (n.children) {
nav_generate_tabs(n.children, div, tabclass, depth +1 );
}
}
}
@@ -95,10 +96,10 @@ function nav_select_tabs(nls, container)
for (var i = 0; i < nls.length; ++i) {
var n = nls[i];
var div = $('#'+n[0]);
var div = $('#'+n.name);
if (typeof n[2] != 'function' && n[2].length) {
nav_select_tabs(n[2], div);
if ( (!n.setup) && n.children) {
nav_select_tabs(n.children, div);
}
}
}

4
install/static/test/all_tests.html
View File

@@ -5,15 +5,19 @@
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<script type="text/javascript" src="qunit.js"></script>
<script type="text/javascript" src="../jquery.js"></script>
<script type="text/javascript" src="../jquery.ba-bbq.js"></script>
<script type="text/javascript" src="../jquery-ui.js"></script>
<script type="text/javascript" src="../ipa.js"></script>
<script type="text/javascript" src="../details.js"></script>
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
<script type="text/javascript" src="../entity.js"></script>
<script type="text/javascript" src="../associate.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="ipa_tests.js"></script>
<script type="text/javascript" src="entity_tests.js"></script>
<script type="text/javascript" src="association_tests.js"></script>
<script type="text/javascript" src="navigation_tests.js"></script>
</head>
<body>
<h1 id="qunit-header">Complete Test Suite</h1>

2
install/static/test/index.html
View File

@@ -27,6 +27,8 @@
<li><a href="ipa_tests.html">Core Test Suite</a>
<li><a href="entity_tests.html">Entity Test Suite</a>
<li><a href="association_tests.html">Association Test Suite</a>
<li><a href="navigation_tests.html">Navigation Test Suite</a>
</ul>
</div>

21
install/static/test/navigation_tests.html Normal file
View File

@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<title>Navigation Test Suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<script type="text/javascript" src="qunit.js"></script>
<script type="text/javascript" src="../jquery.js"></script>
<script type="text/javascript" src="../jquery.ba-bbq.js"></script>
<script type="text/javascript" src="../jquery-ui.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="navigation_tests.js"></script>
</head>
<body>
<h1 id="qunit-header">Navigation Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup</div>
</body>
</html>

75
install/static/test/navigation_tests.js Normal file
View File

@@ -0,0 +1,75 @@
/* Authors:
* Adam Young <ayoung@redhat.com>
*
* Copyright (C) 2010 Red Hat
* see file 'COPYING' for use and warranty information
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 only
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
test("Testing nav_create().", function() {
var mock_tabs_lists =
[
{ name:'identity', label:'IDENTITY', children: [
{name:'user', label:'Users', setup:mock_setup_user},
{name:'group', label:'Users', setup:mock_setup_group},
]}];
function mock_setup_user (jobj){
user_mock_called = true;
same(jobj[0].id,'user','user id');
same(jobj[0].nodeName,'DIV','user div');
}
function mock_setup_group (jobj){
group_mock_called = true;
same(jobj[0].id,'group','group id');
same(jobj[0].nodeName,'DIV','group Div');
}
ipa_objs= {};
var navigation = $('<div id="navigation"/>');
var user_mock_called = false;
var group_mock_called = false;
nav_create(mock_tabs_lists, navigation, 'tabs')
ok(user_mock_called, "mock setup was called");
ok(group_mock_called, "mock setup was called");
same( navigation[0].children.length, 2, "Two Child tabs");
same( navigation[0].children[1].id, 'identity', "Identity Tab");
same( navigation[0].children[1].children[1].id, 'user', "User Tab");
same( navigation[0].children[1].children[2].id, 'group', "User Tab");
});
test("Testing nav_select_tabs().", function() {
var mock_tabs_lists =
[
{ name:'identity', label:'IDENTITY', children: [
{name:'one', label:'One', setup: function (){}},
{name:'two', label:'Two', setup: function (){}},
]}];
var navigation = $('<div id="navigation"/>');
nav_create(mock_tabs_lists, navigation, 'tabs')
$.bbq.pushState({"identity":2});
nav_select_tabs(mock_tabs_lists, navigation);
same( navigation[0].children[1].children[2].id, 'two', "Tab two");
});

50
install/static/webui.js
View File

@@ -21,26 +21,30 @@
/* REQUIRES: everything, this file puts it all togheter */
/* tabs definition for IPA webUI */
var admin_tabs_lists = [
['identity', 'IDENTITY', [
['user', 'Users', ipa_entity_setup],
['group', 'Groups', ipa_entity_setup],
['host', 'Hosts', ipa_entity_setup],
['hostgroup', 'Hostgroups', ipa_entity_setup],
['netgroup', 'Netgroups', ipa_entity_setup],
['service', 'Services', ipa_entity_setup],
]],
['policy', 'POLICY', unimplemented_tab],
['config', 'CONFIG', [
['rolegroup', 'Rolegroups', ipa_entity_setup]
]]
var admin_tab_set = [
{name:'identity', label:'IDENTITY', children:[
{name:'user', label:'Users', setup: ipa_entity_setup},
{name:'group', label:'Groups', setup: ipa_entity_setup},
{name:'host', label:'Hosts', setup: ipa_entity_setup},
{name:'hostgroup', label:'Hostgroups', setup: ipa_entity_setup},
{name:'netgroup', label:'Netgroups', setup: ipa_entity_setup},
{name:'service', label:'Services', setup: ipa_entity_setup},
]},
{name:'policy', label:'POLICY', setup: unimplemented_tab},
{name:'config', label:'CONFIG', children: [
{name:'rolegroup', label:'Rolegroups', setup: ipa_entity_setup}
]}
];
var self_serv_tabs_lists =
[
['identity', 'IDENTITY', [
['user', 'Users', ipa_entity_setup]]]];
{ name:'identity', label:'IDENTITY', children: [
{name:'user', label:'Users', setup:ipa_entity_setup}]}];
var nav_tabs_lists;
@@ -59,9 +63,9 @@ $(function() {
{'user-facet':'details', 'user-pkey':whoami_pkey},2);
if (whoami.hasOwnProperty('memberof_rolegroup') &&
whoami.memberof_rolegroup.length > 0){
nav_tabs_lists = admin_tabs_lists;
nav_tabs_lists = admin_tab_set;
}else{
nav_tabs_lists = self_serv_tabs_lists;
nav_tabs_lists = self_serv_tab_set;
var state = {'user-pkey':whoami_pkey ,
'user-facet': jQuery.bbq.getState('user-facet') ||
@@ -106,12 +110,12 @@ function window_hashchange(evt)
for (var i = 0; i < nav_tabs_lists.length; ++i) {
var t = nav_tabs_lists[i];
if (typeof t[2] != 'function' && t[2].length) {
for (var j = 0; j < t[2].length; ++j) {
var tt = t[2][j];
var obj_name = tt[0];
var entity_setup = tt[2];
var div = $('#' + tt[0]);
if (!(t.setup) && t.children) {
for (var j = 0; j < t.children.length; ++j) {
var tt = t.children[j];
var obj_name = tt.name;
var entity_setup = tt.setup;
var div = $('#' + tt.name);
var state = obj_name + '-facet';
var facet = $.bbq.getState(state, true) || 'search';