UserManagment now displays users after arriving through user profile page

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

diff --git a/skyquake/plugins/user_management/src/userProfile/userProfileActions.js b/skyquake/plugins/user_management/src/userProfile/userProfileActions.js
index a0a34d9..128b597 100644 (file)
--- a/skyquake/plugins/user_management/src/userProfile/userProfileActions.js
+++ b/skyquake/plugins/user_management/src/userProfile/userProfileActions.js
@@ -11,15 +11,10 @@ module.exports = function(Alt) {
                                        'editUser',
                                        'handleCloseUserPanel',
                                        'handleHideColumns',
                                        'editUser',
                                        'handleCloseUserPanel',
                                        'handleHideColumns',

-                                       'getUsersSuccess',

                                        'getUsersNotification',
                                        'handleDisabledChange',
                                        'handlePlatformRoleUpdate',
                                        'getUsersNotification',
                                        'handleDisabledChange',
                                        'handlePlatformRoleUpdate',

-                                       'handleAddUser',
-                                       'handleCreateUser',

                                        'handleUpdateUser',
                                        'handleUpdateUser',

-                                       'updateUserSuccess',
-                                       'createUserSuccess',
-                                       'deleteUserSuccess'
+                                       'updateUserSuccess'

                                        );
 }
                                        );
 }

diff --git a/skyquake/plugins/user_management/src/userProfile/userProfileSource.js b/skyquake/plugins/user_management/src/userProfile/userProfileSource.js
index 267387a..aaf10d7 100644 (file)
--- a/skyquake/plugins/user_management/src/userProfile/userProfileSource.js
+++ b/skyquake/plugins/user_management/src/userProfile/userProfileSource.js
@@ -17,34 +17,6 @@ if (DEV_MODE) {
 
 module.exports = function(Alt) {
     return {
 
 module.exports = function(Alt) {
     return {

-        getUsers: {
-          remote: function() {
-              return new Promise(function(resolve, reject) {
-                $.ajax({
-                  url: `/user?api_server=${API_SERVER}`,
-                  type: 'GET',
-                  beforeSend: Utils.addAuthorizationStub,
-                  success: function(data, textStatus, jqXHR) {
-                    resolve(data.user);
-                  }
-                }).fail(function(xhr){
-                  //Authentication and the handling of fail states should be wrapped up into a connection class.
-                  Utils.checkAuthentication(xhr.status);
-                  let msg = xhr.responseText;
-                  if(xhr.errorMessage) {
-                    msg = xhr.errorMessage
-                  }
-                  reject(msg);
-                });
-              });
-          },
-          interceptResponse: interceptResponse({
-            'error': 'There was an error retrieving the resource orchestrator information.'
-          }),
-          success: Alt.actions.global.getUsersSuccess,
-          loading: Alt.actions.global.showScreenLoader,
-          error: Alt.actions.global.showNotification
-        },

         updateUser: {
           remote: function(state, user) {
             return new Promise(function(resolve, reject) {
         updateUser: {
           remote: function(state, user) {
             return new Promise(function(resolve, reject) {


@@ -74,35 +46,6 @@ module.exports = function(Alt) {
           loading: Alt.actions.global.showScreenLoader,
           error: Alt.actions.global.showNotification
         },
           loading: Alt.actions.global.showScreenLoader,
           error: Alt.actions.global.showNotification
         },

-        deleteUser: {
-          remote: function(state, user) {
-            return new Promise(function(resolve, reject) {
-              $.ajax({
-                url: `/user/${user['user-name']}/${user['user-domain']}?api_server=${API_SERVER}`,
-                type: 'DELETE',
-                data: user,
-                beforeSend: Utils.addAuthorizationStub,
-                success: function(data, textStatus, jqXHR) {
-                  resolve(data);
-                }
-              }).fail(function(xhr){
-                //Authentication and the handling of fail states should be wrapped up into a connection class.
-                Utils.checkAuthentication(xhr.status);
-                let msg = xhr.responseText;
-                if(xhr.errorMessage) {
-                  msg = xhr.errorMessage
-                }
-                reject(msg);
-              });
-            });
-          },
-          interceptResponse: interceptResponse({
-            'error': 'There was an error deleting the user.'
-          }),
-          success: Alt.actions.global.deleteUserSuccess,
-          loading: Alt.actions.global.showScreenLoader,
-          error: Alt.actions.global.showNotification
-        },

         createUser: {
             remote: function(state, user) {
 
         createUser: {
             remote: function(state, user) {
 

diff --git a/skyquake/plugins/user_management/src/userProfile/userProfileStore.js b/skyquake/plugins/user_management/src/userProfile/userProfileStore.js
index 8febbd1..b8a721b 100644 (file)
--- a/skyquake/plugins/user_management/src/userProfile/userProfileStore.js
+++ b/skyquake/plugins/user_management/src/userProfile/userProfileStore.js
@@ -167,11 +167,6 @@ export default class UserProfileStore {
     handleUpdateUser() {
 
     }
     handleUpdateUser() {
 
     }

-
-    getUsersSuccess(users) {
-        this.alt.actions.global.hideScreenLoader.defer();
-        this.setState({users});
-    }

     updateUserSuccess() {
         this.alt.actions.global.hideScreenLoader.defer();
         let users = this.users || [];
     updateUserSuccess() {
         this.alt.actions.global.hideScreenLoader.defer();
         let users = this.users || [];