@itilite/iui-user-management 1.3.8 → 1.3.10

package/dist/index.css

@@ -920,10 +920,6 @@ 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,24 +1118,6 @@ 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;
 };
@@ -3075,8 +3057,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: '',
@@ -3164,8 +3146,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'
@@ -3176,6 +3158,31 @@ var workInfo = [{
     minLength: 0
   },
   disableText: 'Please get in touch with your administrator to change this value.'
+}, {
+  id: 7,
+  label: 'Manager',
+  name: 'manager',
+  required: false,
+  type: 'async_select',
+  fullWidth: false,
+  visibility: true,
+  readOnly: false,
+  placeholder: 'Select manager',
+  tabelName: 'manager',
+  product: 'travel',
+  loadOption: approversOptions
+}, {
+  id: 8,
+  label: 'Skip manager',
+  name: 'skip_manager',
+  required: false,
+  type: 'async_select',
+  fullWidth: false,
+  visibility: true,
+  readOnly: false,
+  placeholder: 'Select manager',
+  product: 'travel',
+  loadOption: approversOptions
 }, {
   id: 9,
   label: 'Base location',
@@ -5009,6 +5016,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
@@ -5021,7 +5036,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];
@@ -5175,6 +5192,9 @@ var UserAddEdit = function UserAddEdit(props) {
   var _useState25 = React.useState([]),
     uploadedFiles = _useState25[0],
     setUploadedFiles = _useState25[1];
+  var _useState26 = React.useState(70),
+    maxLengthForModal = _useState26[0],
+    setMaxLengthForModal = _useState26[1];
   var defaultAddModalData = {
     isOpen: false,
     isError: false,
@@ -5187,12 +5207,12 @@ var UserAddEdit = function UserAddEdit(props) {
     regexOnBlur: null,
     maxLimit: '',
     minLimit: '',
-    maxLength: 70,
+    maxLength: maxLengthForModal,
     minLength: 0
   };
-  var _useState26 = React.useState(defaultAddModalData),
-    addModalData = _useState26[0],
-    setAddModalData = _useState26[1];
+  var _useState27 = React.useState(defaultAddModalData),
+    addModalData = _useState27[0],
+    setAddModalData = _useState27[1];
   var onAddModalClose = function onAddModalClose() {
     setAddModalData(_extends({}, defaultAddModalData));
   };
@@ -5212,12 +5232,16 @@ var UserAddEdit = function UserAddEdit(props) {
     var title = '';
     if (id === 'entity') {
       title = 'Entity';
+      setMaxLengthForModal(70);
     } else if (id === 'department') {
       title = 'Department';
+      setMaxLengthForModal(70);
     } else if (id === 'business_unit') {
+      setMaxLengthForModal(150);
       title = 'Business unit';
     } else if (id === 'employee_level') {
       title = 'Employee level';
+      setMaxLengthForModal(70);
     }
     setAddModalData(_extends({}, addModalData, {
       isOpen: true,
@@ -5365,10 +5389,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)) {
@@ -5656,6 +5677,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,
@@ -5830,24 +5865,6 @@ 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());
@@ -5939,6 +5956,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,
@@ -6106,115 +6130,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, _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";
+            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, _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";
+          })["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) {
@@ -6425,6 +6450,9 @@ 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,
@@ -8550,6 +8578,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
         endIcon: null,
         outlinedBtn: false,
         className: "threedotMenuBtn",
+        MoreHorizIcon: true,
         placement: "bottom-end"
       }));
     },
@@ -8948,31 +8977,14 @@ var UserList = function UserList(_ref2) {
       var _SelectedUsersNotApprover = [].concat(selectedUsersNotApprover);
       var _SelectedUsersApprover = [].concat(selectedUsersApprover);
       var _selected = Object.values(selected).flat();
-      var temp1 = {};
-      var temp2 = {};
-      var tempArray1 = [];
-      var tempArray2 = [];
-      _SelectedUsersNotApprover.map(function (item) {
-        if (temp1[item.id] !== item) {
-          temp1[item.id] = item;
-        }
+      _SelectedUsersNotApprover = _SelectedUsersNotApprover.filter(function (item) {
+        return _selected.includes(item.id.toString());
       });
-      _SelectedUsersApprover.map(function (item) {
-        if (temp2[item.id] !== item) {
-          temp2[item.id] = item;
-        }
+      _SelectedUsersApprover = _SelectedUsersApprover.filter(function (item) {
+        return _selected.includes(item.id.toString());
       });
-      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);
+      setSelectedUsersNotApprover(_SelectedUsersNotApprover);
+      setSelectedUsersApprover(_SelectedUsersApprover);
       setIsBulkDeactivateModalOpen(true);
     } else {
       setOpenDeActivateModalFlag(true);
@@ -9730,10 +9742,7 @@ var UserList = function UserList(_ref2) {
     }));
   })), selectedUsersNotApprover !== null && selectedUsersNotApprover !== void 0 && selectedUsersNotApprover.length ? /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, null, /*#__PURE__*/React__default.createElement("hr", {
     style: {
-      borderColor: '#E5E9ED',
-      borderLeft: 'none',
-      borderTop: 'none',
-      borderRight: 'none'
+      borderColor: '#E5E9ED'
     }
   }), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     className: "iui__my-15"
@@ -10433,12 +10442,20 @@ var UserPanel = function UserPanel(_ref) {
     var validatedValue = _value.replace(/\s+/g, ' ').trim();
     setDataList(validatedValue);
   };
+  var _useState17 = React.useState(70),
+    maxLengthForModal = _useState17[0],
+    setMaxLengthForModal = _useState17[1];
+  React.useEffect(function () {
+    if (title === 'Business unit') {
+      setMaxLengthForModal(150);
+    }
+  }, []);
   var validation = {
     regexOnChange: /^[(A-Z)(a-z)(0-9)&'\-_.,/: ]*$/,
     regexOnBlur: null,
     maxLimit: '',
     minLimit: '',
-    maxLength: 70,
+    maxLength: maxLengthForModal,
     minLength: 0
   };
   React.useEffect(function () {