conjur-asset-ui 1.3.1 → 1.3.2

data/public/js/views/hosts.js

@@ -1,13 +1,17 @@
 /** @jsx React.DOM */
-/* global conjur, React */
 
 (function(conjur, React) {
     'use strict';
 
     var GenericList = conjur.views.GenericList;
 
-    this.HostBox = React.createClass({
+    var HostBox = this.HostBox = React.createClass({
+        /*getInitialState: function() {
+         return { currentNamespace: "", members: [] };
+         },*/
         render: function() {
+            //<NamespaceFilter currentNamespace={this.props.currentNamespace}
+            //namespaces={this.props.data.namespaces} />
             return (
               <div className="hostBox">
                 <div className="hostList">

data/public/js/views/layer.js

@@ -1,137 +1,92 @@
 /** @jsx React.DOM */
-/* global conjur, React, ReactBootstrap, _ */
 
-(function(conjur, React, ReactBootstrap, _) {
-    'use strict';
-
-    var TabbedArea = ReactBootstrap.TabbedArea,
-        TabPane = ReactBootstrap.TabPane,
-        Tab = conjur.views.mixins.Tab,
-        AuditBox = window.AuditBox,
-        RoleLink = conjur.views.RoleLink,
-        HostLink = conjur.views.HostLink;
-
-    var abstractRole = function(expected) {
-        return function(role) {
-            var tokens = role.split(':'),
-                kind = tokens[1],
-                abstractKinds = ['@', 'layer'],
-                isAbstract = abstractKinds.indexOf(kind) !== -1;
-
-            return isAbstract === expected;
-        };
-    };
-
-    this.Layer = React.createClass({
-        mixins: [Tab],
-
-        render: function() {
-            var data = this.props.data;
-
-            var hosts = data.layer.hosts.map(function(host) {
-                return (
-                  <li className="list-group-item list-group-item-noborder">
-                    <HostLink data={host} />
-                  </li>
-                );
-            });
-
-            var admins = data.admins.filter(abstractRole(false)).map(function(role) {
-                return (
-                  <li className="list-group-item list-group-item-noborder">
-                    <RoleLink id={role}/>
-                  </li>
-                );
-            });
-
-            var users = data.users.filter(abstractRole(false)).map(function(role) {
-                return (
-                  <li className="list-group-item list-group-item-noborder">
-                    <RoleLink id={role}/>
-                  </li>
-                );
-            });
-
-            // TODO: controls to add/remove admins/users/hosts
-            var overviewTab = (
-              <TabPane key="overview" tab="Overview">
-                <dl className="dl-horizontal">
-                  <dt>Owner</dt>
-                  <dd><RoleLink id={data.layer.ownerid} /></dd>
-
-                  <dt>Created by</dt>
-                  <dd><RoleLink id={data.layer.userid} /></dd>
-                </dl>
-              </TabPane>
-            );
-
-            var adminsTab = (
-              <TabPane key="admins" tab={conjur.utils.getTabname('Admins', admins)}>
-                <ul className="list-group">
-                  {admins}
-                </ul>
-              </TabPane>
-            );
-
-            var usersTab = (
-              <TabPane key="users" tab={conjur.utils.getTabname('Users', users)}>
+var Layer = React.createClass({
+  mixins: [conjur.views.mixins.Tab],
+  render: function() {
+    function abstractRole(expected) {
+      return function(role) {
+        var tokens = role.split(':');
+        var kind = tokens[1];
+        var abstractKinds = [ '@', 'layer' ];
+        var isAbstract = abstractKinds.indexOf(kind) !== -1;
+        return isAbstract === expected;
+      }
+    }
+
+    var layer = this.props.data.layer;
+
+    var hosts = layer.hosts.map(function (host) {
+      return <li className="list-group-item list-group-item-noborder">
+        <HostLink data={host} />
+      </li>
+    }.bind(this));
+    var admins = this.props.data.admins.filter(abstractRole(false)).map(function (role) {
+      return <li className="list-group-item list-group-item-noborder">
+                <RoleLink id={role}/>
+             </li>;
+    }.bind(this));
+    var users = this.props.data.users.filter(abstractRole(false)).map(function (role) {
+      return <li className="list-group-item list-group-item-noborder">
+                <RoleLink id={role}/>
+             </li>;
+    }.bind(this));
+
+
+    // TODO: controls to add/remove admins/users/hosts
+    var overview_tab =
+            <TabPane key="overview" tab="Overview">
+            <dl className="dl-horizontal">
+              <dt>Owner</dt>
+              <dd><RoleLink id={layer.ownerid}/></dd>
+              <dt>Created by</dt>
+              <dd><RoleLink id={layer.userid}/></dd>
+            </dl>
+            </TabPane>;
+    var admins_tab =
+            <TabPane key="admins" tab={get_tabname("Admins",admins)}>
+            <ul className="list-group">
+              {admins}
+            </ul>
+            </TabPane> ;
+    var users_tab =
+            <TabPane key="users" tab={ get_tabname("Users", users) } >
                 <ul className="list-group">
                   {users}
                 </ul>
-              </TabPane>
-            );
-
-            var hostsTab = (
-              <TabPane key="hosts" tab={conjur.utils.getTabname('Hosts', hosts)}>
+            </TabPane>;
+    var hosts_tab =
+            <TabPane key="hosts" tab={ get_tabname("Hosts", hosts) }  >
                 <ul className="list-group">
                   {hosts}
                 </ul>
-              </TabPane>
-            );
-
-            var auditTab = (
-              <TabPane key="audit" tab="Recent Activity">
+            </TabPane>;
+    var audit_tab=
+            <TabPane key="audit" tab="Recent Activity">
                 <div className="audit auditGroup">
-                  <AuditBox roles={[data.layer.roleid]}
-                            resources={[data.layer.resource_identifier]}
-                            tabview={true} />
+                  <AuditBox roles={[layer.roleid]} resources={[layer.resource_identifier]} tabview={true} />
                 </div>
-              </TabPane>
-            );
-
-
-            var permissionsTab = this.permissionsTab(data.layer.roleid),
-                membershipsTab = this.membershipsTab(data.layer.roleid),
-                annotationsTab = this.annotationsTab(),
-                ownedTab = this.ownedTab();
-
-            var tabs = _.compact([
-                overviewTab,
-                adminsTab,
-                usersTab,
-                hostsTab,
-                ownedTab,
-                membershipsTab,
-                permissionsTab,
-                annotationsTab,
-                auditTab
-            ]);
-
-            return (
-              <div className="layer">
-                <h2>Layer {data.layer.id}</h2>
-                <TabbedArea defaultActiveKey="overview">
-                  {tabs}
-                </TabbedArea>
-              </div>
-            );
-        }
-    });
-
-}).bind(conjur.views)
-(
-    conjur,
-    React,
-    ReactBootstrap,
-    _
-);
+            </TabPane>;
+
+
+    var permissions_tab = this.permissions_tab(layer.roleid);
+    var memberships_tab = this.memberships_tab(layer.roleid);
+    var annotations_tab = this.annotations_tab();
+    var owned_tab       = this.owned_tab();
+
+    var tabs = _.compact( [overview_tab, admins_tab, users_tab, hosts_tab,
+                            owned_tab, memberships_tab, permissions_tab,
+                            annotations_tab,
+                            audit_tab
+                          ] );
+
+    return (
+      <div className="layer">
+        <h2>Layer {layer.id}</h2>
+
+        <TabbedArea defaultActiveKey="overview">
+            {tabs}
+        </TabbedArea>
+      </div>
+    );
+  }
+});

data/public/js/views/layers.js

@@ -1,13 +1,17 @@
 /** @jsx React.DOM */
-/* global conjur, React */
 
 (function(conjur, React) {
     'use strict';
 
     var GenericList = conjur.views.GenericList;
 
-    this.LayerBox = React.createClass({
+    var LayerBox = this.LayerBox = React.createClass({
+        /*  getInitialState: function() {
+         return { currentNamespace: "", members: [] };
+         }, */
         render: function() {
+            // <NamespaceFilter currentNamespace={this.props.currentNamespace}
+            // namespaces={this.props.data.namespaces} />
             return (
               <div className="layerBox">
                 <div className="layerList">

data/public/js/views/mixins/search.js

@@ -1,22 +1,15 @@
-/* global conjur */
-
 (function(conjur) {
     'use strict';
 
-    this.Search = {
-        handleSubmit: function() {
+    conjur.views.mixins.Search = {
+        handleSubmit: function(e) {
             var search = this.refs.input.getDOMNode().value;
 
-            if (search && search.length !== 0) {
-                conjur.app.router.navigate('/ui/search/' + window.encodeURIComponent(search),
-                                           {trigger: true});
+            if (search && search.length != 0) {
+                conjur.app.router.navigate('/ui/search/' + encodeURIComponent(search), {trigger: true});
             }
 
             return false;
         }
     };
-
-}).bind(conjur.views.mixins)
-(
-    conjur
-);
+})(conjur);

data/public/js/views/mixins/tabs.js

@@ -1,45 +1,40 @@
 /** @jsx React.DOM */
-/* global conjur, React, ReactBootstrap, _ */
 
-(function(conjur, React, ReactBootstrap, _) {
+(function(conjur, ReactBootstrap) {
     'use strict';
 
-    var TabPane = ReactBootstrap.TabPane,
-        OwnedResources = conjur.views.OwnedResources,
-        RoleLink = conjur.views.RoleLink,
-        AnnotationsBox = conjur.views.AnnotationsBox,
-        Permissions = conjur.views.Permissions;
+    var TabbedArea = ReactBootstrap.TabbedArea,
+        TabPane = ReactBootstrap.TabPane,
+        OwnedResources = conjur.views.OwnedResources;
 
     // we can't create custom TabPanes as components,
     // because they won't be recognized by TabbedArea as tabs
     // that's why we just generalize their constructors
-    this.Tab = {
-        containsOwnedItems: function() {
-            return (
-                this.props.data.owned &&
-                    this.props.data.owned.length &&
-                    this.props.data.owned.length > 0
-            );
+    conjur.views.mixins.Tab = {
+        lexical_sorter: function(a,b) {
+
+        },
+
+        contains_owned_items: function() {
+            return (this.props.data.owned && this.props.data.owned.length && this.props.data.owned.length > 0 );
         },
 
-        ownedIds: function() {
-            if (this.containsOwnedItems()) {
-                return this.props.data.owned.map(function(ownedItem) {
-                    return ownedItem.id;
+        owned_ids: function() {
+            if (this.contains_owned_items()) {
+                return this.props.data.owned.map(function(owned_item) {
+                    return owned_item.id;
                 });
             }
 
             return [];
         },
 
-        ownedTab: function() {
-            if (this.containsOwnedItems()) {
-                var result = (
-                  <TabPane key="owned"
-                           tab={conjur.utils.getTabname('Owned resources', this.props.data.owned)}>
-                    <OwnedResources owned={this.props.data.owned} tabview={true} />
-                  </TabPane>
-                );
+        owned_tab: function() {
+            if (this.contains_owned_items()) {
+                var result =
+                        <TabPane key="owned" tab={get_tabname("Owned resources",this.props.data.owned)}>
+                          <OwnedResources owned={this.props.data.owned} tabview={true} />
+                        </TabPane>;
 
                 return result;
             }
@@ -47,108 +42,73 @@
             return null;
         },
 
-        containsNontrivialRoles: function() {
-            return (
-                this.props.data.roles &&
-                    this.props.data.roles.length &&
-                    this.props.data.roles.length > 1
-            );
+        contains_nontrivial_roles: function() {
+            return (this.props.data.roles && this.props.data.roles.length && this.props.data.roles.length>1);
         },
 
-        externalRoles: function(ownId) {
-            if (!this.containsNontrivialRoles()) {
+        external_roles: function( own_id ) {
+            if (!this.contains_nontrivial_roles()) {
                 return [];
             }
 
-            var ownedIds = this.ownedIds();
+            var owned_ids = this.owned_ids();
 
             return this.props.data.roles.filter(function(roleid) {
                 // do not show themself
-                return roleid !== ownId;
+                return roleid!=own_id;
             }).filter(function(roleid) {
                 // do not show internal roles
-                return roleid.split(':')[1] !== '@';
+                return ! (roleid.split(':')[1]=='@') ;
             }).filter(function(roleid) {
                 // do not show owned groups
-                return ! _.contains(ownedIds, roleid);
+                return ! _.contains(owned_ids, roleid);
             });
         },
 
-        membershipsTab: function(ownId) {
-            if (!this.containsNontrivialRoles()) {
+        memberships_tab: function( own_id ) {
+            if (!this.contains_nontrivial_roles()) {
                 return null;
             }
 
-            var membershipLinks = this.externalRoles(ownId)
-                    .sort(function(a, b) {
-                        return a.toLowerCase().localeCompare(b.toLowerCase());
-                    })
-                    .map(function(roleid) {
-                        return (
-                          <li className="list-group-item list-group-item-noborder">
-                            <RoleLink id={roleid} />
-                          </li>
-                        );
-                    });
-
-            if (membershipLinks.length === 0) {
-                return null;
-            }
+            var membership_links = this.external_roles(own_id)
+                    .sort( function(a,b) { return a.toLowerCase().localeCompare(b.toLowerCase());} )
+                    .map ( function(roleid) { return <li className="list-group-item list-group-item-noborder"><RoleLink id={roleid}/></li> });
+
+            if (membership_links.length==0) { return null; }
 
-            var result = (
-              <TabPane key="memberships"
-                       tab={conjur.utils.getTabname('Explicit memberships', membershipLinks)}>
-                <ul className="list-group">
-                  {membershipLinks}
-                </ul>
-              </TabPane>
-            );
+            var result =
+                    <TabPane key="memberships" tab={get_tabname("Explicit memberships", membership_links)}>
+                      <ul className="list-group">{membership_links}</ul>
+                    </TabPane>;
 
             return result;
-        },
+        } ,
 
-        containsAnnotations: function() {
-            return (
-                this.props.data.annotations &&
-                    this.props.data.annotations.length &&
-                    this.props.data.annotations.length > 0
-            );
+        contains_annotations: function() {
+            return (this.props.data.annotations && this.props.data.annotations.length && this.props.data.annotations.length>0);
         },
 
-        annotationsTab: function() {
-            if (!this.containsAnnotations()) {
+        annotations_tab: function() {
+            if (!this.contains_annotations()) {
                 return null;
             }
 
-            var result = (
-              <TabPane key="annotations"
-                       tab={conjur.utils.getTabname('Annotations', this.props.data.annotations)}>
-                <AnnotationsBox annotations={this.props.data.annotations} />
-              </TabPane>
-            );
+            var result =
+                    <TabPane key="annotations" tab={get_tabname("Annotations",this.props.data.annotations)}>
+                      <AnnotationsBox annotations={this.props.data.annotations}/>
+                    </TabPane>;
 
             return result;
         },
 
-        permissionsTab: function(roleid) {
-            var result = (
-              <TabPane key="permissions" tab="Permissions held">
-                <Permissions owned={this.props.data.owned}
-                             roles={this.props.data.roles}
-                             role={roleid}
-                             tabview={true} />
-              </TabPane>
-            );
+        permissions_tab: function(roleid) {
+            var result =
+                    <TabPane key="permissions" tab="Permissions held">
+                      <Permissions owned={this.props.data.owned} roles={this.props.data.roles} role={roleid} tabview={true}/>
+                    </TabPane>;
 
             return result;
         }
 
     };
-
-}).bind(conjur.views.mixins)
-(
-    conjur,
-    React,
-    ReactBootstrap,
-    _
-);
+})(conjur, ReactBootstrap);