conjur-asset-ui 1.3.1 → 1.3.2

data/public/js/views/navSearch.js

@@ -1,29 +1,18 @@
 /** @jsx React.DOM */
-/* global conjur, React */
 
 (function(conjur, React) {
     'use strict';
 
-    var Search = conjur.views.mixins.Search;
-
-    this.NavSearchForm = React.createClass({
-        mixins: [Search],
+    var NavSearchForm = this.NavSearchForm = React.createClass({
+        mixins: [conjur.views.mixins.Search],
 
         render: function() {
             return (
-              <form className="form-inline navbar-form"
-                    role="search"
-                    onSubmit={this.handleSubmit}>
+              <form className="form-inline navbar-form" role="search" onSubmit={this.handleSubmit}>
                 <div className="form-group">
-                  <input ref="input"
-                         type="text"
-                         className="form-control"
-                         placeholder="Search Conjur"></input>
+                  <input ref="input" type="text" className="form-control" placeholder="Search Conjur"></input>
                 </div>
-                <button type="submit"
-                        className="btn btn-default search-button">
-                  Search
-                </button>
+                <button type="submit" className="btn btn-default search-button">Search</button>
               </form>
             );
         }

data/public/js/views/owned.js

@@ -1,7 +1,6 @@
 /** @jsx React.DOM */
-/* global conjur, React, _ */
 
-(function(conjur, React, _) {
+(function(conjur, _, React) {
     'use strict';
 
     var knownTypes = ['user', 'group', 'layer', 'host', 'variable', 'policy'];
@@ -35,16 +34,11 @@
                         return a.id.toLowerCase().localeCompare(b.id.toLowerCase());
                     }).map(function(resource) {
                         var kind = resource.id.split(':')[1];
-
                         filters.push(kind);
 
-                        if ((this.state.filter === '') ||
-                            (this.state.filter !== 'other' && this.state.filter === kind) ||
-                            (this.state.filter === 'other' &&
-                             _.intersection([kind], knownTypes).length === 0)) {
-
-                            var ResourceLink = conjur.views.ResourceLink;
-
+                        if ((this.state.filter === '')
+                            || (this.state.filter != 'other' && this.state.filter === kind)
+                            || (this.state.filter === 'other' && _.intersection([kind], knownTypes).length === 0)) {
                             return (
                               <li className="list-group-item list-group-item-noborder">
                                 <ResourceLink data={resource} />
@@ -67,7 +61,7 @@
 
             var filterSelect = '';
 
-            if (this.props.resources.length > 9 || this.state.filter !== '') {
+            if (this.props.resources.length > 9 || this.state.filter != '') {
                 // TODO: sort, when done with previous TODO
                 filterSelect = _.intersection(_.uniq(filters, true), knownTypes).map(function(f) {
                     return (
@@ -133,7 +127,7 @@
         }
     });
 
-    this.OwnedResources = React.createClass({
+    var OwnedResources = this.OwnedResources = React.createClass({
         getInitialState: function() {
             return {
                 expanded: false
@@ -179,6 +173,6 @@
 }).bind(conjur.views)
 (
     conjur,
-    React,
-    _
+    _,
+    React
 );

data/public/js/views/permissions.js

@@ -1,254 +1,188 @@
 /** @jsx React.DOM */
-/* global conjur, React, jQuery, _ */
-
-(function(conjur, React, $, _) {
-    'use strict';
-
-    var ResourceLink = conjur.views.ResourceLink,
-        RoleLink = conjur.views.RoleLink;
-
-    var PermissionsTable = this.PermissionsTable = React.createClass({
-        render: function() {
-            var rows = [];
-
-            var resources = _.sortBy(this.props.resources, function(r) {
-                return r.id; // this way it will be sorting by (kind, id)
-            });
-
-            resources.forEach(function(r) {
-                var rowspan = r.permissions.length + 1,
-                    parts = r.id.split(':'),
-                    kind = parts[1]; // ignore env?
-
-                var cells = [
-                    (<td rowSpan={rowspan}> <ResourceLink id={r.id}/> </td>),
-                    (<td rowSpan={rowspan}> {kind} </td>)
-                ];
-
-                if (rowspan === 1) {
-                    cells.push(<td colSpan="3"> full permissions </td>);
-                }
-
-                rows.push(
-                    (<tr key={r.id}>{cells}</tr>)
-                );
-
-                if (rowspan > 1) {
-                    rows.push(r.permissions.map(function(p) {
-                        return (
-                          <PermissionRow data={p}/>
-                        );
-                    }));
-                }
-
-            });
-
-            rows = _.flatten(rows);
-
-            var showhidelink = (
-              <div>
-                <a onClick={this.props.hideHandler}>Hide all &laquo;</a>
-              </div>
-            );
-
-            if (this.props.tabview) {
-                showhidelink = '';
-            }
-
-            if (rows.length === 0) {
-                return (
-                  <span>None</span>
-                );
-            }
-
-            return (
-              <div>
-                {showhidelink}
-                <table>
-                  <thead>
-                    <tr>
-                      <th> Resource </th>
-                      <th> Kind </th>
-                      <th> Privilege </th>
-                      <th> Can Grant? </th>
-                      <th> Granted By </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {rows}
-                  </tbody>
-                </table>
-              </div>
-            );
-        }
-    });
 
+var PermissionsTable = React.createClass({
+  render: function() {
+    var rows = [];
+    var resources = _.sortBy(this.props.resources, function(r){
+      return r.id; // this way it will be sorting by (kind, id)
+    });
+    resources.forEach(function(r){
+      var rowspan = r.permissions.length + 1;
+      var parts = r.id.split(":");
+      var id = parts[2];
+      var kind = parts[1]; // ignore env?
+      var cells = [
+        <td rowSpan={rowspan}> <ResourceLink id={r.id}/> </td>,
+        <td rowSpan={rowspan}> {kind} </td>
+      ];
+      if(rowspan == 1){
+        cells.push(<td colSpan="3"> full permissions </td>);
+      }
+
+      rows.push(
+        <tr key={r.id}>{cells}</tr>
+      );
+
+      if(rowspan > 1){
+        rows.push(r.permissions.map(function(p){
+          return <PermissionRow data={p}/>
+        }));
+      }
 
-    // Renders a permission as a tr
-    var PermissionRow = React.createClass({
-        render: function() {
-            var p = this.props.data;
+    });
+    rows = _.flatten(rows);
+
+    var showhidelink = <div><a onClick={this.props.hideHandler}>Hide all &laquo;</a></div>;
+
+    if (this.props.tabview) {
+        showhidelink="";
+    }
+
+    if (rows.length==0) {
+        return <span>None</span>;
+    }
+
+    return <div>
+      {showhidelink}
+      <table>
+        <thead>
+          <tr>
+            <th> Resource </th>
+            <th> Kind </th>
+            <th> Privilege </th>
+            <th> Can Grant? </th>
+            <th> Granted By </th>
+          </tr>
+        </thead>
+        <tbody> {rows} </tbody>
+      </table>
+    </div>
+  }
+});
+
+
+// Renders a permission as a tr
+var PermissionRow = React.createClass({
+  render: function(){
+    var p = this.props.data;
+    return <tr>
+        <td> { p.privilege } </td>
+        <td> { p.grant_option ? "yes" : "no" }</td>
+        <td> <RoleLink id={p.grantor}/> </td>
+      </tr>;
+  }
+});
+
+var PermissionsSummary = React.createClass({
+  render: function() {
+    var expand = "";
+    if ( this.props.length > 0 )
+      expand = <span>
+          <br/>
+          <span>
+            <a  onClick={this.props.expandHandler}>Show all &raquo;</a>
+          </span>
+        </span>;
+
+    return <div>
+      <span>
+        {this.props.length} permissions
+      </span>
+      {expand}
+    </div>
+  }
+});
+
+var Permissions = React.createClass({
+  getInitialState: function() {
+    return {resources: null, loaded: false, expand: false}
+  },
+
+  expand: function(event) {
+    this.setState({expand: true})
+  },
+
+  collapse: function(event) {
+    this.setState({expand: false})
+  },
+
+  componentWillMount: function() { // shouldn't it be done in model??? otherwise it will re-load stuff on each re-rendering of parent block
+  	if ( this.props.roles ) {
+	    $.get(this.url(), function(data){
+	      this.setPermissions(data);
+	    }.bind(this));
+  	}
+  },
+
+  setPermissions: function(_resources) {
+    /**
+     * Filter out owned resources.
+     * Filter out permissions on resources which are not held by the current role.
+     */
+    var resources;
+
+    if ( this.props.owned ) {
+      var ownedIds = _.pluck(this.props.owned, 'id');
+      resources = _resources.filter(function(r) {
+        return !_.contains(ownedIds, r.id);
+      });
+    }
+    else
+      resources = _resources;
+
+    var roleSet = {};
+    this.props.roles.forEach(function(r) {
+    	roleSet[r] = r;
+    });
 
-            return (
-              <tr>
-                <td>{p.privilege}</td>
-                <td>{p.grant_option ? 'yes' : 'no'}</td>
-                <td><RoleLink id={p.grantor}/></td>
-              </tr>
-            );
-        }
+    var cleanResources = resources.filter(function(item) {
+    	return item.id.split(':')[1] !== "secret"; // assets of 'secret' kind are internal
     });
 
-    var PermissionsSummary = React.createClass({
-        render: function() {
-            var expand = '';
-
-            if (this.props.length > 0) {
-                expand = (
-                  <span>
-                    <br/>
-                    <span>
-                      <a  onClick={this.props.expandHandler}>Show all &raquo;</a>
-                    </span>
-                  </span>
-                );
-            }
-
-            return (
-              <div>
-                <span>
-                  {this.props.length} permissions
-                </span>
-                {expand}
-              </div>
-            );
-        }
+    cleanResources.forEach(function(resource) {
+    	var permissions = resource.permissions;
+    	var hasPermissions = [];
+    	permissions.forEach(function(permission) {
+      	if ( roleSet.hasOwnProperty(permission['role']) )
+      		hasPermissions.push(permission);
+    	});
+    	resource.permissions = hasPermissions;
     });
 
-    this.Permissions = React.createClass({
-        getInitialState: function() {
-            return {resources: null, loaded: false, expand: false};
-        },
-
-        expand: function() {
-            this.setState({expand: true});
-        },
-
-        collapse: function() {
-            this.setState({expand: false});
-        },
-
-        componentWillMount: function() {
-            // shouldn't it be done in model??? otherwise it will
-            //  re-load stuff on each re-rendering of parent block
-  	    if (this.props.roles) {
-	        $.get(this.url(), function(data) {
-	            this.setPermissions(data);
-	        }.bind(this));
-  	    }
-        },
-
-        setPermissions: function(_resources) {
-            /**
-             * Filter out owned resources.
-             * Filter out permissions on resources which are not held by the current role.
-             */
-            var resources;
-
-            if (this.props.owned) {
-                var ownedIds = _.pluck(this.props.owned, 'id');
-
-                resources = _resources.filter(function(r) {
-                    return !_.contains(ownedIds, r.id);
-                });
-            } else {
-                resources = _resources;
-            }
-
-            var roleSet = {};
-
-            this.props.roles.forEach(function(r) {
-    	        roleSet[r] = r;
-            });
-
-            var cleanResources = resources.filter(function(item) {
-                // assets of 'secret' kind are internal
-    	        return item.id.split(':')[1] !== 'secret';
-            });
-
-            cleanResources.forEach(function(resource) {
-    	        var permissions = resource.permissions,
-    	            hasPermissions = [];
-
-    	        permissions.forEach(function(permission) {
-      	            if (roleSet.hasOwnProperty(permission.role)) {
-      		        hasPermissions.push(permission);
-                    }
-    	        });
-
-    	        resource.permissions = hasPermissions;
-            });
-
-            this.setState({resources: cleanResources, loaded: true});
-        },
-
-        render: function() {
-            var content;
-
-            if (this.state.loaded) {
-                if (this.state.expand || this.props.tabview) {
-                    content = (
-                      <PermissionsTable resources={this.state.resources}
-                                        hideHandler={this.collapse}
-                                        tabview={this.props.tabview} />
-                    );
-                } else {
-                    content = (
-                      <PermissionsSummary length={this.state.resources.length}
-                                          expandHandler={this.expand} />
-                    );
-                }
-            } else {
-    	        if (this.props.roles) {
-    		    content = (
-                      <span>Loading...</span>
-                    );
-  		} else {
-  		    content = 'You are not authorized to see these permissions';
-                }
-            }
-
-            var cx = React.addons.classSet;
-
-            var classes = cx({
-                permissions: true,
-                loading: !this.state.loaded
-            });
-
-            var permissionsheader = this.props.tabview ? '' : (<h3>Permissions held</h3>);
-
-            return (
-              <section className={classes}>
-               {permissionsheader}
-               <div id="permissionDetails">
-                 {content}
-               </div>
-             </section>
-            );
-        },
-
-        url: function() {
-            return '/api/authz/' +
-                conjur.app.configuration.account +
-                '/resources?acting_as=' +
-                this.props.role;
-        }
+    this.setState({resources: cleanResources, loaded: true});
+  },
+
+  render: function(){
+    var content;
+    if (this.state.loaded) {
+      if ( this.state.expand || this.props.tabview )
+        content = <PermissionsTable resources={this.state.resources} hideHandler={this.collapse} tabview={this.props.tabview}/>
+      else
+        content = <PermissionsSummary length={this.state.resources.length} expandHandler={this.expand} />
+    }
+    else {
+    	if ( this.props.roles )
+    		content = <span>Loading...</span>
+  		else
+  			content = "You are not authorized to see these permissions";
+    }
+
+    var cx = React.addons.classSet;
+    var classes = cx({
+      permissions: true,
+      loading: !this.state.loaded
     });
 
-}).bind(conjur.views)
-(
-    conjur,
-    React,
-    jQuery,
-    _
-);
+    var permissionsheader = this.props.tabview ? "" : <h3>Permissions held</h3>;
+    return <section className={classes}>
+      {permissionsheader}
+      <div id="permissionDetails">
+        {content}
+      </div>
+    </section>;
+  },
+
+  url: function(){
+    return "/api/authz/" + conjur.app.configuration.account + "/resources?acting_as=" + this.props.role;
+  }
+})