Fix geosolutions-it#1134 user manager group editing issues

Fix issues geosolutions-it#1134 with usergroup updates. 
 - Fix issue introduced by changes on the catalog that influenced the delete user modal  
- Keep the search filter when update or delete user

web/client/actions/__tests__/users-test.js

@@ -195,6 +195,25 @@ describe('Test correctness of the users actions', () => {
             }
         });
     });
+    it('saveUser create with groups', (done) => {
+        GeoStoreDAO.addBaseUrl = (options) => {
+            return assign(options, {baseURL: 'base/web/client/test-resources/geostore/users/newUser.txt#'});
+        };
+        const retFun = saveUser({name: "test", groups: [{groupName: "everyone"}, {groupName: "testers"}], role: "USER", password: "password"});
+        expect(retFun).toExist();
+        let count = 0;
+        retFun((action) => {
+            expect(action.type).toBe(USERMANAGER_UPDATE_USER);
+            count++;
+            if (count === 2) {
+                expect(action.user).toExist();
+                expect(action.user.id).toExist();
+                expect(action.user.groups).toExist();
+                expect(action.user.groups.length).toBe(2);
+                done();
+            }
+        });
+    });
     it('saveUser error', (done) => {
         const retFun = saveUser({id: 3});
         expect(retFun).toExist();

web/client/actions/users.js

@@ -173,7 +173,7 @@ function editUser(user, options ={params: {includeattributes: true}} ) {
                     };
                 }
                 // the service returns groups = "", skip this to avoid overriding
-                if (userLoaded && userLoaded.groups === "") {
+                if (userLoaded) {
                     userLoaded = {...userLoaded, groups: user.groups};
                 }
                 dispatch(editUserSuccess(userLoaded));
@@ -239,20 +239,28 @@ function saveUser(user, options = {}) {
     return (dispatch) => {
         if (user && user.id) {
             dispatch(savingUser(user));
-            return API.updateUser(user.id, {...user, group: user.groups}, options).then((userDetails) => {
+            return API.updateUser(user.id, {...user, groups: { group: user.groups}}, options).then((userDetails) => {
                 dispatch(savedUser(userDetails));
+                dispatch(getUsers());
             }).catch((error) => {
                 dispatch(saveError(user, error));
             });
         }
         // createUser
         dispatch(creatingUser(user));
-        return API.createUser(user, options).then((id) => {
+        let userToPost = {...user};
+        if (user && user.groups) {
+            userToPost = {...user, groups: { group: user.groups.filter((g) => {
+                return g.groupName !== "everyone"; // see:https://github.com/geosolutions-it/geostore/issues/149
+            })}};
+        }
+        return API.createUser(userToPost, options).then((id) => {
             dispatch(userCreated(id, user));
             dispatch(getUsers());
         }).catch((error) => {
             dispatch(createError(user, error));
         });
+
     };
 }
 function changeUserMetadata(key, newValue) {

web/client/components/misc/Dialog.jsx

@@ -22,6 +22,7 @@ const Dialog = React.createClass({
         backgroundStyle: React.PropTypes.object,
         className: React.PropTypes.string,
         maskLoading: React.PropTypes.bool,
+        containerClassName: React.PropTypes.string,
         headerClassName: React.PropTypes.string,
         bodyClassName: React.PropTypes.string,
         footerClassName: React.PropTypes.string,
@@ -38,6 +39,7 @@ const Dialog = React.createClass({
             start: {x: 0, y: 0},
             className: "modal-dialog modal-content",
             maskLoading: false,
+            containerClassName: "",
             headerClassName: "modal-header",
             bodyClassName: "modal-body",
             footerClassName: "modal-footer",
@@ -84,7 +86,7 @@ const Dialog = React.createClass({
         </Draggable>);
         let containerStyle = assign({}, this.props.style, this.props.backgroundStyle);
         return this.props.modal ?
-            (<div onClick={this.props.onClickOut} style={containerStyle} className="fade in modal catalog_window" role="dialog">
+            (<div onClick={this.props.onClickOut} style={containerStyle} className={"fade in modal " + this.props.containerClassName} role="dialog">
             <div onClick={(evt)=> {evt.preventDefault(); evt.stopPropagation(); }} className="modal-dialog" style={{background: "transparent"}}>
                 {dialog}
             </div></div>) :

web/client/plugins/MetadataExplorer.jsx

@@ -83,7 +83,7 @@ const MetadataExplorerComponent = React.createClass({
                         {panel}
                     </Panel>);
                 }
-                return (<Dialog modal id="mapstore-catalog-panel" style={assign({}, this.props.style, {display: "block" })}>
+                return (<Dialog containerClassName="catalog_window" modal id="mapstore-catalog-panel" style={assign({}, this.props.style, {display: "block" })}>
                     <span role="header"><span className="metadataexplorer-panel-title"><Message msgId="catalog.title"/></span><button onClick={this.props.toggleControl} className="print-panel-close close">{this.props.closeGlyph ? <Glyphicon glyph={this.props.closeGlyph}/> : <span>×</span>}</button></span>
                     {panel}
                 </Dialog>);

web/client/reducers/users.js

@@ -18,6 +18,7 @@ function users(state = {
     switch (action.type) {
         case USERMANAGER_GETUSERS:
             return assign({}, state, {
+                searchText: action.searchText,
                 status: action.status,
                 users: action.status === "loading" ? state.users : action.users,
                 start: action.start,