@itilite/iui-user-management 0.4.505 → 0.4.900

package/dist/index.css

@@ -920,6 +920,10 @@ p._3pOsV {
   background-color: #e11d48 !important;
 }
 
+._xWE7K header {
+  box-shadow: none;
+  background: transparent;
+}
 ._xWE7K ._13pXn {
   display: inline;
   padding: 2px 4px;

package/dist/index.js

@@ -1118,6 +1118,24 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
         });
       }
     }
+    if (payload.uploadedFiles && payload.uploadedFiles.length > 0) {
+      res.fields.files = payload.uploadedFiles.filter(function (_file) {
+        return !_file.isExistingFile;
+      }).map(function (_file) {
+        return {
+          file_type: _file.file_type,
+          file_path: _file.file_path,
+          user_file_name: _file.user_file_name,
+          upload: _file.upload
+        };
+      });
+    }
+    if (payload.filesForDelete.length > 0) {
+      res.fields.filesToDelete = payload.filesForDelete;
+    }
+    if (payload.profilePicDelete.length > 0) {
+      res.fields.profilePicDelete = payload.profilePicDelete;
+    }
   }
   return res;
 };
@@ -3057,8 +3075,8 @@ var workInfo = [{
   validation: {
     regexOnChange: null,
     regexOnBlur: [{
-      regex: /^[(A-Z)(a-z)(0-9)\-& ]*$/,
-      message: "Only alphabets, numbers and - & are allowed."
+      regex: /^[(A-Z)(a-z)(0-9)\-_& ]*$/,
+      message: "Only alphabets, numbers, _ and - & are allowed."
     }],
     maxLimit: '',
     minLimit: '',
@@ -3146,8 +3164,8 @@ var workInfo = [{
   validation: {
     regexOnChange: null,
     regexOnBlur: [{
-      regex: /^[A-Za-z0-9 \-.,&'()\/]*$/,
-      message: "Only alphabets, numbers & special characters . & ' ( ) - , / are allowed."
+      regex: /^[A-Za-z0-9 \-_.,&'()\/]*$/,
+      message: "Only alphabets, numbers & special characters . & ' ( ) - _ , / are allowed."
     }, {
       regex: /^[a-zA-Z]/,
       message: 'Designation should start with alphabets'
@@ -4991,6 +5009,14 @@ var UserAddEdit = function UserAddEdit(props) {
       },
       designation: '',
       base_location: '',
+      manager_id: {
+        value: '',
+        label: 'Select Manager'
+      },
+      skip_manager_id: {
+        value: '',
+        label: 'Select Manager'
+      },
       currency: {
         value: defaultCurrency,
         label: defaultCurrency
@@ -5003,7 +5029,9 @@ var UserAddEdit = function UserAddEdit(props) {
       entity: 0,
       business_unit: 0,
       department: 0,
-      currency: 0
+      currency: 0,
+      manager_id: 0,
+      skip_manager_id: 0
     }),
     cacheForAsyncDropdown = _useState4[0],
     clearCacheForAsyncDropdown = _useState4[1];
@@ -5347,10 +5375,7 @@ var UserAddEdit = function UserAddEdit(props) {
       _value = args._value,
       _isError = args._isError,
       _errorMsg = args._errorMsg;
-    console.log({
-      _name: _name,
-      _value: _value
-    });
+    console.log(_name, _value);
     setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends8 = {}, _extends8[_name] = _value, _extends8)));
     updateError(_name, _isError, _errorMsg);
     if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
@@ -5638,6 +5663,20 @@ var UserAddEdit = function UserAddEdit(props) {
                 value: '',
                 label: 'Select employee level'
               },
+              manager_id: res.employee_info.manager ? {
+                value: res.employee_info.manager,
+                label: res.employee_info.manager
+              } : {
+                value: '',
+                label: 'Select Manager'
+              },
+              skip_manager_id: res.employee_info.skip_manager ? {
+                value: res.employee_info.skip_manager,
+                label: res.employee_info.skip_manager
+              } : {
+                value: '',
+                label: 'Select Manager'
+              },
               employee_id: res.employee_info.employee_id || '',
               entity: res.employee_info.entity ? {
                 value: res.employee_info.entity.id,
@@ -5812,6 +5851,24 @@ var UserAddEdit = function UserAddEdit(props) {
                   return _extends({}, prevState, expenseApprovers);
                 });
               }
+              var _uploadedDocs2 = [];
+              res.files.forEach(function (_file) {
+                _uploadedDocs2.push({
+                  user_file_name: _file.user_file_name,
+                  id: _file.id,
+                  isExistingFile: true,
+                  file_type: _file.file_type
+                });
+              });
+              if (res && res.profile_pic) {
+                _uploadedDocs2.push({
+                  user_file_name: res.profile_pic.user_file_name,
+                  id: res.profile_pic.id,
+                  isExistingFile: true,
+                  file_type: res.profile_pic.file_type
+                });
+              }
+              setUploadedFiles(_uploadedDocs2);
             }
           })["catch"](function () {})["finally"](function () {
             dispatch(stopLoader());
@@ -5903,6 +5960,13 @@ var UserAddEdit = function UserAddEdit(props) {
         IUIToastMessageService$4.warningNotify(checkAnyError);
         return Promise.resolve();
       }
+      console.log(employeeInfoInput, "data");
+      if (employeeInfoInput.manager_id.value !== '') {
+        employeeInfoInput.manager_id = employeeInfoInput.manager.value;
+      }
+      if (employeeInfoInput.skip_manager_id.value !== '') {
+        employeeInfoInput.skip_manager_id = employeeInfoInput.skip_manager.value;
+      }
       var payload = {
         personalInfoInput: personalInfoInput,
         employeeInfoInput: employeeInfoInput,
@@ -6048,12 +6112,12 @@ var UserAddEdit = function UserAddEdit(props) {
         setErrorArray(_errorArray);
         setErrorMsgs(_errorMsgs);
         var _loop = function _loop() {
-          if (Object.hasOwnProperty.call(_errorMsgs, key)) {
-            if (_errorMsgs[key]) {
-              if (key in passportInfoInput || key in travelPreferenceInfo || key in secureTravelInputInfo) {
+          if (Object.hasOwnProperty.call(_errorMsgs, _key3)) {
+            if (_errorMsgs[_key3]) {
+              if (_key3 in passportInfoInput || _key3 in travelPreferenceInfo || _key3 in secureTravelInputInfo) {
                 setAdditionalInfoFlag('open');
               }
-              var el = document.getElementById(key === 'country_code' || key === 'contact_country_code' ? 'contact_number' : key);
+              var el = document.getElementById(_key3 === 'country_code' || _key3 === 'contact_country_code' ? 'contact_number' : _key3);
               if (el) {
                 setTimeout(function () {
                   el.scrollIntoView({
@@ -6070,115 +6134,116 @@ var UserAddEdit = function UserAddEdit(props) {
           var _ret = _loop();
           if (_ret === "break") break;
         }
-        return Promise.resolve();
       }
-      if (isEditMode && editUserId || isProfile) {
-        dispatch(showLoader());
-        dispatch(updateUser(payload, isProfile ? id : editUserId, inputChangeLog)).then(function (res) {
-          if (isProfile) {
-            var _config$routes, _config$routes$profil, _config$routes$profil2;
-            (config === null || config === void 0 ? void 0 : (_config$routes = config.routes) === null || _config$routes === void 0 ? void 0 : (_config$routes$profil = _config$routes.profile) === null || _config$routes$profil === void 0 ? void 0 : (_config$routes$profil2 = _config$routes$profil.redirectUrl) === null || _config$routes$profil2 === void 0 ? void 0 : _config$routes$profil2.submit) && history.push(config.routes.profile.redirectUrl.submit);
-          } else {
-            var _config$routes2, _config$routes2$users, _config$routes2$users2;
-            (config === null || config === void 0 ? void 0 : (_config$routes2 = config.routes) === null || _config$routes2 === void 0 ? void 0 : (_config$routes2$users = _config$routes2.users) === null || _config$routes2$users === void 0 ? void 0 : (_config$routes2$users2 = _config$routes2$users.list) === null || _config$routes2$users2 === void 0 ? void 0 : _config$routes2$users2.path) && history.push(config.routes.users.list.path);
-          }
-          setFilesForDelete([]);
-          setProfilePicDelete([]);
-        })["catch"](function (err) {
-          if (typeof err === 'object') {
-            if (err.country_code) {
-              err.contact_number = err.country_code;
-            }
-            if (err.contact_country_code) {
-              err.contact_number = err.contact_country_code;
-            }
-            if (err.passport) {
-              err.passport_photo = _extends({}, err.passport);
-              delete err.passport;
+      if (!_isError) {
+        if (isEditMode && editUserId || isProfile) {
+          dispatch(showLoader());
+          dispatch(updateUser(payload, isProfile ? id : editUserId, inputChangeLog)).then(function (res) {
+            if (isProfile) {
+              var _config$routes, _config$routes$profil, _config$routes$profil2;
+              (config === null || config === void 0 ? void 0 : (_config$routes = config.routes) === null || _config$routes === void 0 ? void 0 : (_config$routes$profil = _config$routes.profile) === null || _config$routes$profil === void 0 ? void 0 : (_config$routes$profil2 = _config$routes$profil.redirectUrl) === null || _config$routes$profil2 === void 0 ? void 0 : _config$routes$profil2.submit) && history.push(config.routes.profile.redirectUrl.submit);
+            } else {
+              var _config$routes2, _config$routes2$users, _config$routes2$users2;
+              (config === null || config === void 0 ? void 0 : (_config$routes2 = config.routes) === null || _config$routes2 === void 0 ? void 0 : (_config$routes2$users = _config$routes2.users) === null || _config$routes2$users === void 0 ? void 0 : (_config$routes2$users2 = _config$routes2$users.list) === null || _config$routes2$users2 === void 0 ? void 0 : _config$routes2$users2.path) && history.push(config.routes.users.list.path);
             }
-            setErrorArray(Object.keys(err));
-            setErrorMsgs(err);
-            var _loop2 = function _loop2() {
-              if (Object.hasOwnProperty.call(err, key)) {
-                if (err[key]) {
-                  if (key in passportInfoInput || key in travelPreferenceInfo || key in secureTravelInputInfo) {
-                    setAdditionalInfoFlag('open');
-                  }
-                  var el = document.getElementById(key === 'country_code' || key === 'contact_country_code' ? 'contact_number' : key);
-                  if (el) {
-                    setTimeout(function () {
-                      el.scrollIntoView({
-                        behavior: 'smooth',
-                        block: 'center'
-                      });
-                    }, 500);
-                    return "break";
+            setFilesForDelete([]);
+            setProfilePicDelete([]);
+          })["catch"](function (err) {
+            if (typeof err === 'object') {
+              if (err.country_code) {
+                err.contact_number = err.country_code;
+              }
+              if (err.contact_country_code) {
+                err.contact_number = err.contact_country_code;
+              }
+              if (err.passport) {
+                err.passport_photo = _extends({}, err.passport);
+                delete err.passport;
+              }
+              setErrorArray(Object.keys(err));
+              setErrorMsgs(err);
+              var _loop2 = function _loop2() {
+                if (Object.hasOwnProperty.call(err, _key4)) {
+                  if (err[_key4]) {
+                    if (_key4 in passportInfoInput || _key4 in travelPreferenceInfo || _key4 in secureTravelInputInfo) {
+                      setAdditionalInfoFlag('open');
+                    }
+                    var el = document.getElementById(_key4 === 'country_code' || _key4 === 'contact_country_code' ? 'contact_number' : _key4);
+                    if (el) {
+                      setTimeout(function () {
+                        el.scrollIntoView({
+                          behavior: 'smooth',
+                          block: 'center'
+                        });
+                      }, 500);
+                      return "break";
+                    }
                   }
                 }
+              };
+              for (var _key4 in err) {
+                var _ret2 = _loop2();
+                if (_ret2 === "break") break;
               }
-            };
-            for (var _key4 in err) {
-              var _ret2 = _loop2();
-              if (_ret2 === "break") break;
-            }
-          } else if (typeof err === 'string') {
-            IUIToastMessageService$4.warningNotify(err);
-          } else {
-            IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
-          }
-        })["finally"](function () {
-          dispatch(stopLoader());
-        });
-      } else {
-        dispatch(showLoader());
-        dispatch(createUser(payload)).then(function (res) {
-          var _config$routes3, _config$routes3$users, _config$routes3$users2;
-          (config === null || config === void 0 ? void 0 : (_config$routes3 = config.routes) === null || _config$routes3 === void 0 ? void 0 : (_config$routes3$users = _config$routes3.users) === null || _config$routes3$users === void 0 ? void 0 : (_config$routes3$users2 = _config$routes3$users.list) === null || _config$routes3$users2 === void 0 ? void 0 : _config$routes3$users2.path) && history.push(config.routes.users.list.path);
-        })["catch"](function (err) {
-          if (typeof err === 'object') {
-            if (err.country_code) {
-              err.contact_number = err.country_code;
-            }
-            if (err.contact_country_code) {
-              err.contact_number = err.contact_country_code;
-            }
-            if (err.passport) {
-              err.passport_photo = _extends({}, err.passport);
-              delete err.passport;
+            } else if (typeof err === 'string') {
+              IUIToastMessageService$4.warningNotify(err);
+            } else {
+              IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
             }
-            setErrorArray(Object.keys(err));
-            setErrorMsgs(err);
-            var _loop3 = function _loop3() {
-              if (Object.hasOwnProperty.call(err, key)) {
-                if (err[key]) {
-                  if (key in passportInfoInput || key in travelPreferenceInfo || key in secureTravelInputInfo) {
-                    setAdditionalInfoFlag('open');
-                  }
-                  var el = document.getElementById(key === 'country_code' || key === 'contact_country_code' ? 'contact_number' : key);
-                  if (el) {
-                    setTimeout(function () {
-                      el.scrollIntoView({
-                        behavior: 'smooth',
-                        block: 'center'
-                      });
-                    }, 500);
-                    return "break";
+          })["finally"](function () {
+            dispatch(stopLoader());
+          });
+        } else {
+          dispatch(showLoader());
+          dispatch(createUser(payload)).then(function (res) {
+            var _config$routes3, _config$routes3$users, _config$routes3$users2;
+            (config === null || config === void 0 ? void 0 : (_config$routes3 = config.routes) === null || _config$routes3 === void 0 ? void 0 : (_config$routes3$users = _config$routes3.users) === null || _config$routes3$users === void 0 ? void 0 : (_config$routes3$users2 = _config$routes3$users.list) === null || _config$routes3$users2 === void 0 ? void 0 : _config$routes3$users2.path) && history.push(config.routes.users.list.path);
+          })["catch"](function (err) {
+            if (typeof err === 'object') {
+              if (err.country_code) {
+                err.contact_number = err.country_code;
+              }
+              if (err.contact_country_code) {
+                err.contact_number = err.contact_country_code;
+              }
+              if (err.passport) {
+                err.passport_photo = _extends({}, err.passport);
+                delete err.passport;
+              }
+              setErrorArray(Object.keys(err));
+              setErrorMsgs(err);
+              var _loop3 = function _loop3() {
+                if (Object.hasOwnProperty.call(err, _key5)) {
+                  if (err[_key5]) {
+                    if (_key5 in passportInfoInput || _key5 in travelPreferenceInfo || _key5 in secureTravelInputInfo) {
+                      setAdditionalInfoFlag('open');
+                    }
+                    var el = document.getElementById(_key5 === 'country_code' || _key5 === 'contact_country_code' ? 'contact_number' : _key5);
+                    if (el) {
+                      setTimeout(function () {
+                        el.scrollIntoView({
+                          behavior: 'smooth',
+                          block: 'center'
+                        });
+                      }, 500);
+                      return "break";
+                    }
                   }
                 }
+              };
+              for (var _key5 in err) {
+                var _ret3 = _loop3();
+                if (_ret3 === "break") break;
               }
-            };
-            for (var _key5 in err) {
-              var _ret3 = _loop3();
-              if (_ret3 === "break") break;
+            } else if (typeof err === 'string') {
+              IUIToastMessageService$4.warningNotify(err);
+            } else {
+              IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
             }
-          } else if (typeof err === 'string') {
-            IUIToastMessageService$4.warningNotify(err);
-          } else {
-            IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
-          }
-        })["finally"](function () {
-          dispatch(stopLoader());
-        });
+          })["finally"](function () {
+            dispatch(stopLoader());
+          });
+        }
       }
       return Promise.resolve();
     } catch (e) {
@@ -6389,9 +6454,6 @@ var UserAddEdit = function UserAddEdit(props) {
     if (!p.visibility) {
       return null;
     }
-    if (p.name === 'profile_pic' && config.env.isExpenseProduct) {
-      return null;
-    }
     return /*#__PURE__*/React__default.createElement(iuistyles.IUIGrid, {
       item: true,
       sm: 12,
@@ -8517,6 +8579,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
         endIcon: null,
         outlinedBtn: false,
         className: "threedotMenuBtn",
+        MoreHorizIcon: true,
         placement: "bottom-end"
       }));
     },
@@ -8744,8 +8807,10 @@ var UndoButton = function UndoButton(_ref) {
 };
 var UserList = function UserList(_ref2) {
   var config = _ref2.config,
-    isProfile = _ref2.isProfile;
-  env$7.init(config, isProfile);
+    isProfile = _ref2.isProfile,
+    _ref2$tabVal = _ref2.tabVal,
+    tabVal = _ref2$tabVal === void 0 ? 'current' : _ref2$tabVal;
+  env$7.init(config, isProfile, tabVal);
   var history = reactRouterDom.useHistory();
   var _useSelector = reactRedux.useSelector(function (state) {
       return state.userList;
@@ -8755,15 +8820,18 @@ var UserList = function UserList(_ref2) {
     deactivatedUsers = _useSelector.deactivatedUsers,
     tabValue = _useSelector.tabValue;
   var newSelecteds = userListInfo.results;
-  var _React$useState = React__default.useState(''),
-    deactivateUser = _React$useState[0],
-    setDeactivateUser = _React$useState[1];
-  var _React$useState2 = React__default.useState(null),
-    defaultId = _React$useState2[0],
-    setDefaultId = _React$useState2[1];
-  var _React$useState3 = React__default.useState(1),
-    page = _React$useState3[0],
-    setPage = _React$useState3[1];
+  var _React$useState = React__default.useState(0),
+    activeTab = _React$useState[0],
+    setActiveTab = _React$useState[1];
+  var _React$useState2 = React__default.useState(''),
+    deactivateUser = _React$useState2[0],
+    setDeactivateUser = _React$useState2[1];
+  var _React$useState3 = React__default.useState(null),
+    defaultId = _React$useState3[0],
+    setDefaultId = _React$useState3[1];
+  var _React$useState4 = React__default.useState(1),
+    page = _React$useState4[0],
+    setPage = _React$useState4[1];
   var _useState = React.useState([]),
     selectedUsersNotApprover = _useState[0],
     setSelectedUsersNotApprover = _useState[1];
@@ -8773,24 +8841,24 @@ var UserList = function UserList(_ref2) {
   var _useState3 = React.useState(false),
     isBulkDeactivateModalOpen = _useState3[0],
     setIsBulkDeactivateModalOpen = _useState3[1];
-  var _React$useState4 = React__default.useState(''),
-    user = _React$useState4[0],
-    setUser = _React$useState4[1];
+  var _React$useState5 = React__default.useState(''),
+    user = _React$useState5[0],
+    setUser = _React$useState5[1];
   var _useState4 = React.useState(10),
     rowsPerPage = _useState4[0],
     setRowsPerPage = _useState4[1];
-  var _React$useState5 = React__default.useState({}),
-    selected = _React$useState5[0],
-    setSelected = _React$useState5[1];
-  var _React$useState6 = React__default.useState('asc'),
-    order = _React$useState6[0],
-    setOrder = _React$useState6[1];
-  var _React$useState7 = React__default.useState(false),
-    deactivateSingle = _React$useState7[0],
-    setDeactivateSingle = _React$useState7[1];
-  var _React$useState8 = React__default.useState('first_name'),
-    orderBy = _React$useState8[0],
-    setOrderBy = _React$useState8[1];
+  var _React$useState6 = React__default.useState({}),
+    selected = _React$useState6[0],
+    setSelected = _React$useState6[1];
+  var _React$useState7 = React__default.useState('asc'),
+    order = _React$useState7[0],
+    setOrder = _React$useState7[1];
+  var _React$useState8 = React__default.useState(false),
+    deactivateSingle = _React$useState8[0],
+    setDeactivateSingle = _React$useState8[1];
+  var _React$useState9 = React__default.useState('first_name'),
+    orderBy = _React$useState9[0],
+    setOrderBy = _React$useState9[1];
   var _useState5 = React.useState(''),
     searchValue = _useState5[0],
     setSearchValue = _useState5[1];
@@ -8840,9 +8908,9 @@ var UserList = function UserList(_ref2) {
   var _useState17 = React.useState(''),
     userIds = _useState17[0],
     setUserIds = _useState17[1];
-  var _React$useState9 = React__default.useState(false),
-    overlayMenu = _React$useState9[0],
-    setOverlayMenu = _React$useState9[1];
+  var _React$useState10 = React__default.useState(false),
+    overlayMenu = _React$useState10[0],
+    setOverlayMenu = _React$useState10[1];
   var _useState18 = React.useState(''),
     userFirstName = _useState18[0],
     setUserFirstName = _useState18[1];
@@ -8852,6 +8920,14 @@ var UserList = function UserList(_ref2) {
   var _useState20 = React.useState(true),
     isDisabledSubmitBtn = _useState20[0],
     setIsDisabledSubmitBtn = _useState20[1];
+  React.useEffect(function () {
+    setActiveTab(tabValue);
+  }, [tabValue]);
+  React.useEffect(function () {
+    if (tabVal === 'sign-up') {
+      dispatch(updateTabValue(1));
+    }
+  }, []);
   useScrollPosition.useScrollPosition(function (_ref3) {
     var prevPos = _ref3.prevPos,
       currPos = _ref3.currPos;
@@ -8872,18 +8948,18 @@ var UserList = function UserList(_ref2) {
       behavior: 'smooth'
     });
   };
-  var _React$useState10 = React__default.useState(1),
-    signup_page = _React$useState10[0],
-    setSignUpPage = _React$useState10[1];
+  var _React$useState11 = React__default.useState(1),
+    signup_page = _React$useState11[0],
+    setSignUpPage = _React$useState11[1];
   var _useState21 = React.useState(5),
     signup_rowsPerPage = _useState21[0],
     setSignUpRowsPerPage = _useState21[1];
-  var _React$useState11 = React__default.useState('asc'),
-    signup_order = _React$useState11[0],
-    setSignUpOrder = _React$useState11[1];
-  var _React$useState12 = React__default.useState('fname'),
-    signup_orderBy = _React$useState12[0],
-    setSignUpOrderBy = _React$useState12[1];
+  var _React$useState12 = React__default.useState('asc'),
+    signup_order = _React$useState12[0],
+    setSignUpOrder = _React$useState12[1];
+  var _React$useState13 = React__default.useState('fname'),
+    signup_orderBy = _React$useState13[0],
+    setSignUpOrderBy = _React$useState13[1];
   var _useState22 = React.useState(''),
     signup_searchValue = _useState22[0],
     set_signup_SearchValue = _useState22[1];
@@ -8915,14 +8991,31 @@ var UserList = function UserList(_ref2) {
       var _SelectedUsersNotApprover = [].concat(selectedUsersNotApprover);
       var _SelectedUsersApprover = [].concat(selectedUsersApprover);
       var _selected = Object.values(selected).flat();
-      _SelectedUsersNotApprover = _SelectedUsersNotApprover.filter(function (item) {
-        return _selected.includes(item.id.toString());
+      var temp1 = {};
+      var temp2 = {};
+      var tempArray1 = [];
+      var tempArray2 = [];
+      _SelectedUsersNotApprover.map(function (item) {
+        if (temp1[item.id] !== item) {
+          temp1[item.id] = item;
+        }
       });
-      _SelectedUsersApprover = _SelectedUsersApprover.filter(function (item) {
-        return _selected.includes(item.id.toString());
+      _SelectedUsersApprover.map(function (item) {
+        if (temp2[item.id] !== item) {
+          temp2[item.id] = item;
+        }
       });
-      setSelectedUsersNotApprover(_SelectedUsersNotApprover);
-      setSelectedUsersApprover(_SelectedUsersApprover);
+      for (var i = 0; i < _selected.length; i++) {
+        if (temp1[_selected[i]] != undefined) {
+          if (_selected[i] == temp1[_selected[i]].id) {
+            tempArray1.push(temp1[_selected[i]]);
+          }
+        } else if (temp2[_selected[i]].id != undefined) {
+          if (_selected[i] == temp2[_selected[i]].id) tempArray2.push(temp2[_selected[i]]);
+        }
+      }
+      setSelectedUsersNotApprover(tempArray1);
+      setSelectedUsersApprover(tempArray2);
       setIsBulkDeactivateModalOpen(true);
     } else {
       setOpenDeActivateModalFlag(true);
@@ -9465,7 +9558,7 @@ var UserList = function UserList(_ref2) {
   })), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     className: styles$5.tablewrapper
   }, /*#__PURE__*/React__default.createElement(iuistyles.IUITabs, {
-    value: tabValue,
+    value: activeTab,
     customTabHandler: function customTabHandler(value) {
       return dispatch(updateTabValue(value));
     },