fix(admin-ui): fix actions as per standards

Author: mjatin-dev

admin-ui/plugins/user-management/components/UserManagement/UserAddPage.js

@@ -5,7 +5,7 @@ import UserForm from './UserForm'
 import GluuAlert from '../../../../app/routes/Apps/Gluu/GluuAlert'
 import { useTranslation } from 'react-i18next'
 import { useFormik } from 'formik'
-import { createUser, redirectToListPage } from '../../redux/actions/UserActions'
+import { createUser } from '../../redux/actions/UserActions'
 import { useDispatch, useSelector } from 'react-redux'
 import moment from 'moment'
 function UserAddPage() {

admin-ui/plugins/user-management/components/UserManagement/UserList.js

@@ -7,7 +7,6 @@ import { Badge } from 'reactstrap'
 import {
   getUsers,
   setSelectedUserData,
-  redirectToListPage,
   deleteUser,
 } from '../../redux/actions/UserActions'
 
@@ -66,12 +65,6 @@ function UserList(props) {
     return history.push(`/user/usermanagement/edit:` + row.tableData.uuid)
   }
 
-  useEffect(() => {
-    if (redirectToUserListPage) {
-      dispatch(redirectToListPage(false))
-    }
-  }, [redirectToUserListPage])
-
   function handleUserDelete(row) {
     dispatch(deleteUser(row.inum))
   }

admin-ui/plugins/user-management/redux/actions/UserActions.js

@@ -1,13 +1,15 @@
 import {
   GET_USERS,
   GET_USERS_RESPONSE,
-  USERS_LOADING,
   CREATE_NEW_USER,
+  CREATE_NEW_USER_RESPONSE,
   SELECTED_USER_DATA,
   UPDATE_USER,
-  REDIRECT_TO_USERS_LIST,
+  UPDATE_USER_RESPONSE,
   DELETE_USER,
+  DELETE_USER_RESPONSE,
   CHANGE_USERS_PASSWORD,
+  CHANGE_USERS_PASSWORD_RESPONSE,
 } from './types'
 
 export const getUsers = (action) => ({
@@ -22,10 +24,6 @@ export const setSelectedUserData = (action) => ({
 
 export const getUserResponse = (action) => ({
   type: GET_USERS_RESPONSE,
-  payload: { action },
-})
-export const usersLoading = (action) => ({
-  type: USERS_LOADING,
   payload: action,
 })
 
@@ -36,9 +34,9 @@ export const createUser = (action) => {
   }
 }
 
-export const redirectToListPage = (action) => {
+export const createUserResponse = (action) => {
   return {
-    type: REDIRECT_TO_USERS_LIST,
+    type: CREATE_NEW_USER_RESPONSE,
     payload: action,
   }
 }
@@ -49,16 +47,37 @@ export const updateUser = (action) => {
     payload: action,
   }
 }
+
+export const updateUserResponse = (action) => {
+  return {
+    type: UPDATE_USER_RESPONSE,
+    payload: action,
+  }
+}
 export const changeUserPassword = (action) => {
   return {
     type: CHANGE_USERS_PASSWORD,
     payload: action,
   }
 }
 
+export const changeUserPasswordResponse = (action) => {
+  return {
+    type: CHANGE_USERS_PASSWORD_RESPONSE,
+    payload: action,
+  }
+}
+
 export const deleteUser = (inum) => {
   return {
     type: DELETE_USER,
     payload: inum,
   }
 }
+
+export const deleteUserResponse = (action) => {
+  return {
+    type: DELETE_USER_RESPONSE,
+    payload: action,
+  }
+}

admin-ui/plugins/user-management/redux/actions/types.js

@@ -4,10 +4,12 @@ export const RESET = 'RESET'
 
 export const GET_USERS = 'GET_USERS'
 export const GET_USERS_RESPONSE = 'GET_USERS_RESPONSE'
-export const USERS_LOADING = 'USERS_LOADING'
 export const CREATE_NEW_USER = 'CREATE_NEW_USER'
+export const CREATE_NEW_USER_RESPONSE = 'CREATE_NEW_USER_RESPONSE'
 export const UPDATE_USER = 'UPDATE_USER'
+export const UPDATE_USER_RESPONSE = 'UPDATE_USER_RESPONSE'
 export const SELECTED_USER_DATA = 'SELECTED_USER_DATA'
-export const REDIRECT_TO_USERS_LIST = 'REDIRECT_TO_USERS_LIST'
 export const DELETE_USER = 'DELETE_USER'
+export const DELETE_USER_RESPONSE = 'DELETE_USER_RESPONSE'
 export const CHANGE_USERS_PASSWORD = 'CHANGE_USERS_PASSWORD'
+export const CHANGE_USERS_PASSWORD_RESPONSE = 'CHANGE_USERS_PASSWORD_RESPONSE'

admin-ui/plugins/user-management/redux/reducers/UserReducer.js

@@ -1,13 +1,15 @@
 import {
   GET_USERS_RESPONSE,
-  USERS_LOADING,
   GET_USERS,
   SELECTED_USER_DATA,
-  REDIRECT_TO_USERS_LIST,
   CREATE_NEW_USER,
+  CREATE_NEW_USER_RESPONSE,
   UPDATE_USER,
   DELETE_USER,
   CHANGE_USERS_PASSWORD,
+  CHANGE_USERS_PASSWORD_RESPONSE,
+  UPDATE_USER_RESPONSE,
+  DELETE_USER_RESPONSE,
 } from '../actions/types'
 import reducerRegistry from '../../../../app/redux/reducers/ReducerRegistry'
 
@@ -25,36 +27,49 @@ export default function userReducer(state = INIT_STATE, action) {
       return {
         ...state,
         loading: true,
+        redirectToUserListPage: false,
       }
     case CREATE_NEW_USER:
       return {
         ...state,
         loading: true,
       }
+    case CREATE_NEW_USER_RESPONSE:
+      return {
+        ...state,
+        loading: false,
+        redirectToUserListPage: action.payload ? true : false,
+      }
     case CHANGE_USERS_PASSWORD:
       return {
         ...state,
         loading: true,
       }
-    case UPDATE_USER:
+    case CHANGE_USERS_PASSWORD_RESPONSE:
       return {
         ...state,
         loading: true,
       }
-    case DELETE_USER:
+    case UPDATE_USER:
       return {
         ...state,
         loading: true,
       }
-    case REDIRECT_TO_USERS_LIST:
+    case UPDATE_USER_RESPONSE:
       return {
         ...state,
-        redirectToUserListPage: action.payload,
+        loading: false,
+        redirectToUserListPage: action.payload ? true : false,
       }
-    case USERS_LOADING:
+    case DELETE_USER:
       return {
         ...state,
-        loading: action.payload,
+        loading: true,
+      }
+    case DELETE_USER_RESPONSE:
+      return {
+        ...state,
+        loading: true,
       }
     case SELECTED_USER_DATA:
       return {
@@ -65,7 +80,7 @@ export default function userReducer(state = INIT_STATE, action) {
       return {
         ...state,
         loading: false,
-        items: action.payload?.action,
+        items: action.payload ? action.payload : [],
       }
     default:
       return handleDefault()

admin-ui/plugins/user-management/redux/sagas/UserSaga.js

@@ -27,8 +27,10 @@ const JansConfigApi = require('jans_config_api')
 import { initAudit } from '../../../../app/redux/sagas/SagaUtils'
 import {
   getUserResponse,
-  usersLoading,
-  redirectToListPage,
+  updateUserResponse,
+  deleteUserResponse,
+  changeUserPasswordResponse,
+  createUserResponse,
   getUsers,
 } from '../actions/UserActions'
 import { postUserAction } from '../../../../app/redux/api/backend-api'
@@ -47,12 +49,9 @@ export function* createUserSaga({ payload }) {
     addAdditionalData(audit, FETCH, API_USERS, payload)
     const userApi = yield* newFunction()
     const data = yield call(userApi.createUsers, payload)
-    if (data) {
-      yield put(redirectToListPage(true))
-    }
-    yield put(usersLoading(false))
+    yield put(createUserResponse(data))
   } catch (e) {
-    yield put(usersLoading(false))
+    yield put(createUserResponse(null))
     if (isFourZeroOneError(e)) {
       const jwt = yield select((state) => state.authReducer.userinfo_jwt)
       yield put(getAPIAccessToken(jwt))
@@ -65,12 +64,9 @@ export function* updateUserSaga({ payload }) {
     addAdditionalData(audit, FETCH, API_USERS, payload)
     const userApi = yield* newFunction()
     const data = yield call(userApi.updateUsers, payload)
-    if (data) {
-      yield put(redirectToListPage(true))
-    }
-    yield put(usersLoading(false))
+    yield put(updateUserResponse(data))
   } catch (e) {
-    yield put(usersLoading(false))
+    yield put(updateUserResponse(null))
     if (isFourZeroOneError(e)) {
       const jwt = yield select((state) => state.authReducer.userinfo_jwt)
       yield put(getAPIAccessToken(jwt))
@@ -83,10 +79,10 @@ export function* changeUserPasswordSaga({ payload }) {
   try {
     addAdditionalData(audit, FETCH, API_USERS, payload)
     const userApi = yield* newFunction()
-    yield call(userApi.changeUserPassword, payload)
-    yield put(usersLoading(false))
+    const data = yield call(userApi.changeUserPassword, payload)
+    yield put(changeUserPasswordResponse(data))
   } catch (e) {
-    yield put(usersLoading(false))
+    yield put(changeUserPasswordResponse(null))
     if (isFourZeroOneError(e)) {
       const jwt = yield select((state) => state.authReducer.userinfo_jwt)
       yield put(getAPIAccessToken(jwt))
@@ -101,10 +97,9 @@ export function* getUsersSaga({ payload }) {
     const userApi = yield* newFunction()
     const data = yield call(userApi.getUsers)
     yield put(getUserResponse(data))
-    yield put(usersLoading(false))
     yield call(postUserAction, audit)
   } catch (e) {
-    yield put(usersLoading(false))
+    yield put(getUserResponse(null))
     if (isFourZeroOneError(e)) {
       const jwt = yield select((state) => state.authReducer.userinfo_jwt)
       yield put(getAPIAccessToken(jwt))
@@ -117,11 +112,11 @@ export function* deleteUserSaga({ payload }) {
   try {
     addAdditionalData(audit, FETCH, API_USERS, payload)
     const userApi = yield* newFunction()
-    yield call(userApi.deleteUser, payload)
+    const data = yield call(userApi.deleteUser, payload)
     yield put(getUsers({}))
-    yield put(usersLoading(false))
+    yield put(deleteUserResponse(data))
   } catch (e) {
-    yield put(usersLoading(false))
+    yield put(deleteUserResponse(null))
     if (isFourZeroOneError(e)) {
       const jwt = yield select((state) => state.authReducer.userinfo_jwt)
       yield put(getAPIAccessToken(jwt))