Merge pull request #9 from contolini/master

Fix Add Asset bug
cfpb · Aug 5, 2015 · c042fb4 · c042fb4
2 parents 30f3121 + 50e3853
commit c042fb4
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 29 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -4,9 +4,6 @@
     <meta charset="utf-8">
     <title>Dash</title>
 
-    <!--[if lt IE 9]>      <link rel="stylesheet" href="/static/css/main.ie.min.css"> <![endif]-->
-    <!--[if gt IE 8]><!--> <link rel="stylesheet" href="/static/css/main.min.css"> <!--<![endif]-->
-
     <link rel="stylesheet" href="css/app.min-cdabe0c9.css"/>
 
 
@@ -16,7 +13,7 @@
 
     <section id="app"></section>
 
-    <script src="js/app.min-2467c18d.js"></script>
+    <script src="js/app.min-1c6411a4.js"></script>
 
   </body>
 </html>
diff --git a/dist/js/app.min-2467c18d.js → dist/js/app.min-1c6411a4.js b/dist/js/app.min-2467c18d.js → dist/js/app.min-1c6411a4.js
diff --git a/src/js/components/AddAsset.jsx b/src/js/components/AddAsset.jsx
@@ -5,6 +5,12 @@ var TeamActions = require('../actions/TeamActions');
 var _ = require('lodash');
 
 var AddAsset = React.createClass({
+
+  propTypes: {
+    teamName: React.PropTypes.string.isRequired,
+    resourceName: React.PropTypes.string.isRequired,
+    isAddingAsset: React.PropTypes.bool.isRequired
+  },
   getInitialState: function() {
     return {
       isOpen: false,

diff --git a/src/js/components/TeamPage.jsx b/src/js/components/TeamPage.jsx
@@ -66,7 +66,7 @@ var TeamPage = React.createClass({
       var assetDetails = allAssetDetails[resourceName] || [];
       var canAdd = resource.perms.add;
       var canRemove = resource.perms.remove;
-      var addAsset = (canAdd) ? <AddAsset teamName={teamName} resourceNam={resourceName}
+      var addAsset = (canAdd) ? <AddAsset teamName={teamName} resourceName={resourceName}
                                           isAddingAsset={team.isAddingAsset[resourceName]}/> : '';
       var assets = resource.assets || [];
       return (
@@ -80,7 +80,6 @@ var TeamPage = React.createClass({
         </div>
       )
     })
-    console.log('isInProgress', isInProgress)
     return (
       <div>{isInProgress}
         <h1>{teamName}

diff --git a/src/js/components/__tests__/AddAsset-test.js b/src/js/components/__tests__/AddAsset-test.js
@@ -16,7 +16,7 @@ describe('Add asset component', function() {
     TestUtils = React.addons.TestUtils;
 
     addAssetComponent = TestUtils.renderIntoDocument(
-      <AddAsset/>
+      <AddAsset teamName={''}/>
     );
   });
 

diff --git a/src/js/utils/__tests__/common-test.js b/src/js/utils/__tests__/common-test.js
@@ -1,24 +1,28 @@
 jest.dontMock('../../utils/common');
+var common, resources, $, userId;
 
-describe('Get all teams method', function() {
-  it('should call the teams URL', function() {
-    var common = require('../../utils/common'),
-      resources = require('../../utils/resources'),
-      $ = require('jquery');
-    common.getAllTeams();
+beforeEach(function(){
+  common = require('../../utils/common');
+  resources = require('../../utils/resources');
+  $ = require('jquery');
+  userId = '123';
+});
 
+
+describe('Get all teams method', function(){
+  it('should call the teams URL', function(){
+    common.getAllTeams();
     expect($.get).toBeCalledWith(resources.routes.ALL_TEAMS);
 
   });
 });
 
-describe('User  and team functions/actions', function() {
-  it('should call the correct routes when user actions are invoked', function() {
-    var common = require('../../utils/common'),
-      resources = require('../../utils/resources'),
-      $ = require('jquery');
+describe('User  and team functions/actions', function(){
+  it('should call the correct routes when user actions are invoked', function(){
+
     var opts = {'foo': 'boo'};
 
+
     common.getAllUsers();
     expect($.get).toBeCalledWith(resources.routes.ALL_USERS);
 
@@ -44,4 +48,30 @@ describe('User  and team functions/actions', function() {
     expect($.ajax).toBeCalled();
 
   });
+
+});
+
+describe('User manipulations', function(){
+  it('should deactivate user', function(){
+    resources.routes = {
+      userActions: function(user){
+        return '/kratos/users/' + userId
+      }
+    };
+    common.deactivateUser(userId);
+    expect($.ajax.mock.calls[0][0].url).toBe('/kratos/users/' + userId);
+    expect($.ajax.mock.calls[0][0].type).toEqual('DELETE');
+
+  });
+  it('should reactivate user', function(){
+    resources.routes = {
+      userActions: function(user){
+        return '/kratos/users/' + userId
+      }
+    };
+    common.reactivateUser(userId);
+    expect($.ajax.mock.calls[0][0].url).toBe('/kratos/users/' + userId);
+    expect($.ajax.mock.calls[0][0].type).toEqual('PUT');
+
+  });
 });
diff --git a/src/js/utils/__tests__/resources-test.js b/src/js/utils/__tests__/resources-test.js
@@ -41,5 +41,11 @@ describe('resources functions tests', function() {
     var expectedUrl = '/kratos/users/teamName/data/somePath',
       actualUrl = resources.routes.userData(opts);
     expect(actualUrl).toBe(expectedUrl);
+  });
+
+  it('should create a correct user action  request url from opt', function() {
+    var expectedUrl = '/kratos/users/userId',
+      actualUrl = resources.routes.userActions(opts.userId);
+    expect(actualUrl).toBe(expectedUrl);
   })
 });
diff --git a/src/js/utils/common.js b/src/js/utils/common.js
@@ -4,39 +4,39 @@ var resources = require('./resources');
 var common = {};
 
 
-common.getAllTeams = function() {
+common.getAllTeams = function(){
   return $.get(resources.routes.ALL_TEAMS);
 };
 
-common.getAllUsers = function() {
+common.getAllUsers = function(){
   return $.get(resources.routes.ALL_USERS);
 };
 
-common.teamCreate = function(action) {
+common.teamCreate = function(action){
   return $.ajax({
     url: resources.routes.team(action),
     dataType: 'json',
     type: 'PUT'
   });
 }
 
-common.teamAddMember = function(action) {
+common.teamAddMember = function(action){
   return $.ajax({
     url: resources.routes.teamMember(action),
     dataType: 'json',
     type: 'PUT'
   });
 };
 
-common.teamRemoveMember = function(action) {
+common.teamRemoveMember = function(action){
   return $.ajax({
     url: resources.routes.teamMember(action),
     dataType: 'json',
     type: 'DELETE'
   });
 };
 
-common.teamAddAsset = function(action) {
+common.teamAddAsset = function(action){
   return $.ajax({
     url: resources.routes.teamAddAsset(action),
     dataType: 'json',
@@ -46,19 +46,36 @@ common.teamAddAsset = function(action) {
   });
 };
 
-common.teamRemoveAsset = function(action) {
+common.teamRemoveAsset = function(action){
   return $.ajax({
     url: resources.routes.teamRemoveAsset(action),
     dataType: 'json',
     type: 'DELETE'
   });
 };
 
-common.getCurrentUserInfo = function() {
+common.getCurrentUserInfo = function(){
   return $.get(resources.routes.CURRENT_USER_INFO)
 };
 
-common.userData = function(action) {
+common.deactivateUser = function(userId){
+  return $.ajax({
+    url: resources.routes.userActions(userId),
+    dataType: 'json',
+    type: 'DELETE'
+  });
+};
+
+common.reactivateUser = function(userId){
+  return $.ajax({
+    url: resources.routes.userActions(userId),
+    dataType: 'json',
+    type: 'PUT'
+  });
+};
+
+
+common.userData = function(action){
   return $.ajax({
     url: resources.routes.userData(action),
     method: 'PUT',

diff --git a/src/js/utils/resources.js b/src/js/utils/resources.js
@@ -20,6 +20,10 @@ var resources = {
     userData: function( action ) {
       return resources.baseUrl + '/users/' + action.id + '/data/' + (action.path || '');
     },
+    userActions: function( userId ){
+      return resources.routes.ALL_USERS + '/' + userId
+    },
+
     ALL_TEAMS: '/kratos/orgs/devdesign/teams',
     ALL_USERS: '/kratos/users',
     CURRENT_USER_INFO: '/kratos/user'