1081664682

Committed 22 Nov 2023 02:11PM UTC coverage: 82.798% (-17.2%) from 99.964%

Build # 1081664682

Build Type

Pull #4214

gitlab-ci

Committed by

tranchitella

Commit Message

fix: Fixed the infinite page redirects when the back button is pressed

Remove the location and navigate from the useLocationParams.setValue callback
dependencies as they change the set function that is presented in other
useEffect dependencies. This happens when the back button is clicked, which
leads to the location changing infinitely.

Changelog: Title
Ticket: MEN-6847
Ticket: MEN-6796

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Signed-off-by: Fabio Tranchitella <fabio.tranchitella@northern.tech>

Pull Request Pull Request #4214: fix: Fixed the infinite page redirects when the back button is pressed

Run Details

4319 of 6292 branches covered (0.0%)

8332 of 10063 relevant lines covered (82.8%)

191.0 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

87.5

/src/js/components/settings/user-management/usermanagement.js

// Copyright 2017 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.
import React, { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';

// material ui
import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';

import { setSnackbar } from '../../../actions/appActions';
import { createUser, editUser, getUserList, passwordResetStart, removeUser } from '../../../actions/userActions';
import { getCurrentUser, getFeatures, getIsEnterprise, getRolesById, getUserCapabilities } from '../../../selectors';
import { UserDefinition } from './userdefinition';
import UserForm from './userform';
import UserList from './userlist';

const actions = {
  create: 'createUser',
  edit: 'editUser',
  remove: 'removeUser'
};

const DeleteUserDialog = ({ dismiss, open, submit, user }) => (
  <Dialog open={open}>
    <DialogTitle>Delete user?</DialogTitle>
    <DialogContent style={{ overflow: 'hidden' }}>
      Are you sure you want to delete the user with email{' '}
      <b>
        <i>{user.email}</i>
      </b>
      ?
    </DialogContent>
    <DialogActions>
      <Button style={{ marginRight: 10 }} onClick={dismiss}>
        Cancel
      </Button>
      <Button variant="contained" color="primary" onClick={() => submit(user, 'remove', user.id)}>
        Delete user
      </Button>
    </DialogActions>
  </Dialog>
);

export const UserManagement = () => {
  const [showCreate, setShowCreate] = useState(false);
  const [removeDialog, setRemoveDialog] = useState(false);
  const [user, setUser] = useState({});
  const dispatch = useDispatch();

  const { canManageUsers } = useSelector(getUserCapabilities);
  const { isHosted } = useSelector(getFeatures);
  const isEnterprise = useSelector(getIsEnterprise);
  const currentUser = useSelector(getCurrentUser);
  const roles = useSelector(getRolesById);
  const users = useSelector(state => Object.values(state.users.byId));
  const props = {
    canManageUsers,
    createUser: userData => dispatch(createUser(userData)),
    currentUser,
    editUser: (id, userData) => dispatch(editUser(id, userData)),
    isEnterprise,
    isHosted,
    removeUser: id => dispatch(removeUser(id)),
    roles,
    users
  };

  useEffect(() => {
    dispatch(getUserList());
  }, [dispatch]);

  useEffect(() => {
    dispatch(getUserList());
  }, [currentUser.id, dispatch, users.length]);

  const openEdit = user => {
    setUser(user);
    setRemoveDialog(false);
    dispatch(setSnackbar(''));
  };

  const openRemove = () => {
    dispatch(setSnackbar(''));
    setRemoveDialog(true);
  };

  const dialogDismiss = () => {
    setUser({});
    setShowCreate(false);
    setRemoveDialog(false);
  };

  const submit = (userData, type, id, passwordResetEmail) => {
    if (userData) {
      let request = null;
      if (id) {
        request = props[actions[type]](id, userData);
      } else {
        request = props[actions[type]](userData);
      }
      return request.then(() => {
        if (passwordResetEmail) {
          dispatch(passwordResetStart(passwordResetEmail));
        }
        dialogDismiss();
      });
    }
    if (passwordResetEmail) {
      dispatch(passwordResetStart(passwordResetEmail));
    }
    return dialogDismiss();
  };

  return (
    <div>
      <div className="flexbox centered space-between" style={{ marginLeft: '20px' }}>
        <h2>Users</h2>
        <Button variant="contained" color="primary" onClick={setShowCreate}>
          Create new user
        </Button>
      </div>

      <UserList {...props} editUser={openEdit} />
      {showCreate && <UserForm {...props} closeDialog={dialogDismiss} submit={submit} />}
      <UserDefinition
        currentUser={currentUser}
        isEnterprise={isEnterprise}
        onRemove={openRemove}
        onCancel={dialogDismiss}
        onSubmit={submit}
        roles={roles}
        selectedUser={user}
      />
      <DeleteUserDialog dismiss={dialogDismiss} open={removeDialog} submit={submit} user={user} />
    </div>
  );
};

export default UserManagement;

1	// Copyright 2017 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14	import React, { useEffect, useState } from 'react';
15	import { useDispatch, useSelector } from 'react-redux';
16
17	// material ui
18	import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';
19
20	import { setSnackbar } from '../../../actions/appActions';
21	import { createUser, editUser, getUserList, passwordResetStart, removeUser } from '../../../actions/userActions';
22	import { getCurrentUser, getFeatures, getIsEnterprise, getRolesById, getUserCapabilities } from '../../../selectors';
23	import { UserDefinition } from './userdefinition';
24	import UserForm from './userform';
25	import UserList from './userlist';
26
27	const actions = {	4✔
28	create: 'createUser',
29	edit: 'editUser',
30	remove: 'removeUser'
31	};
32
33	const DeleteUserDialog = ({ dismiss, open, submit, user }) => (	4✔
34	<Dialog open={open}>	18✔
35	<DialogTitle>Delete user?</DialogTitle>
36	<DialogContent style={{ overflow: 'hidden' }}>
37	Are you sure you want to delete the user with email{' '}
38	<b>
39	<i>{user.email}</i>
40	</b>
41	?
42	</DialogContent>
43	<DialogActions>
44	<Button style={{ marginRight: 10 }} onClick={dismiss}>
45	Cancel
46	</Button>
47	<Button variant="contained" color="primary" onClick={() => submit(user, 'remove', user.id)}>	×
48	Delete user
49	</Button>
50	</DialogActions>
51	</Dialog>
52	);
53
54	export const UserManagement = () => {	4✔
55	const [showCreate, setShowCreate] = useState(false);	19✔
56	const [removeDialog, setRemoveDialog] = useState(false);	18✔
57	const [user, setUser] = useState({});	18✔
58	const dispatch = useDispatch();	18✔
59
60	const { canManageUsers } = useSelector(getUserCapabilities);	18✔
61	const { isHosted } = useSelector(getFeatures);	18✔
62	const isEnterprise = useSelector(getIsEnterprise);	18✔
63	const currentUser = useSelector(getCurrentUser);	18✔
64	const roles = useSelector(getRolesById);	18✔
65	const users = useSelector(state => Object.values(state.users.byId));	32✔
66	const props = {	18✔
67	canManageUsers,
68	createUser: userData => dispatch(createUser(userData)),	1✔
69	currentUser,
70	editUser: (id, userData) => dispatch(editUser(id, userData)),	1✔
71	isEnterprise,
72	isHosted,
73	removeUser: id => dispatch(removeUser(id)),	×
74	roles,
75	users
76	};
77
78	useEffect(() => {	18✔
79	dispatch(getUserList());	4✔
80	}, [dispatch]);
81
82	useEffect(() => {	18✔
83	dispatch(getUserList());	6✔
84	}, [currentUser.id, dispatch, users.length]);
85
86	const openEdit = user => {	18✔
87	setUser(user);	3✔
88	setRemoveDialog(false);	3✔
89	dispatch(setSnackbar(''));	3✔
90	};
91
92	const openRemove = () => {	18✔
93	dispatch(setSnackbar(''));	1✔
94	setRemoveDialog(true);	1✔
95	};
96
97	const dialogDismiss = () => {	18✔
98	setUser({});	3✔
99	setShowCreate(false);	3✔
100	setRemoveDialog(false);	3✔
101	};
102
103	const submit = (userData, type, id, passwordResetEmail) => {	18✔
104	if (userData) {	2!
105	let request = null;	2✔
106	if (id) {	2✔
107	request = props[actions[type]](id, userData);	1✔
108	} else {
109	request = props[actions[type]](userData);	1✔
110	}
111	return request.then(() => {	2✔
112	if (passwordResetEmail) {	2!
113	dispatch(passwordResetStart(passwordResetEmail));	×
114	}
115	dialogDismiss();	2✔
116	});
117	}
118	if (passwordResetEmail) {	×
119	dispatch(passwordResetStart(passwordResetEmail));	×
120	}
121	return dialogDismiss();	×
122	};
123
124	return (	18✔
125	<div>
126	<div className="flexbox centered space-between" style={{ marginLeft: '20px' }}>
127	<h2>Users</h2>
128	<Button variant="contained" color="primary" onClick={setShowCreate}>
129	Create new user
130	</Button>
131	</div>
132
133	<UserList {...props} editUser={openEdit} />
134	{showCreate && <UserForm {...props} closeDialog={dialogDismiss} submit={submit} />}	26✔
135	<UserDefinition
136	currentUser={currentUser}
137	isEnterprise={isEnterprise}
138	onRemove={openRemove}
139	onCancel={dialogDismiss}
140	onSubmit={submit}
141	roles={roles}
142	selectedUser={user}
143	/>
144	<DeleteUserDialog dismiss={dialogDismiss} open={removeDialog} submit={submit} user={user} />
145	</div>
146	);
147	};
148
149	export default UserManagement;

mendersoftware / gui / 1081664682

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous