@itilite/iui-user-management 0.4.220 → 0.4.221

package/dist/index.modern.js

@@ -1115,24 +1115,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;
 };
@@ -5362,10 +5344,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)) {
@@ -5623,6 +5602,7 @@ var UserAddEdit = function UserAddEdit(props) {
             userId: isProfile ? id : editUserId
           })).then(function (res) {
             var _res$user_tags, _res$custom_attribute;
+            console.log('response is', res);
             var profilePic = [];
             if (res && res.profile_pic) {
               profilePic = [{
@@ -5827,24 +5807,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());
@@ -5936,6 +5898,7 @@ var UserAddEdit = function UserAddEdit(props) {
         IUIToastMessageService$4.warningNotify(checkAnyError);
         return Promise.resolve();
       }
+      console.log(employeeInfoInput, 'data');
       var payload = {
         personalInfoInput: personalInfoInput,
         employeeInfoInput: employeeInfoInput,
@@ -6103,115 +6066,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) {
@@ -6251,15 +6215,10 @@ var UserAddEdit = function UserAddEdit(props) {
       dispatch(verifyUserInfo(verifyUserId)).then(function (res) {
         setPersonalInfoInput(function (prevState) {
           return _extends({}, prevState, {
-            first_name: res.fname,
-            last_name: res.lname,
+            first_name: res.first_name,
+            last_name: res.last_name,
             email: res.email,
             contact_number: res.phone,
-            dob: function () {
-              var dt = new Date(res.dob);
-              var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-              return dt.getDate() + " " + months[dt.getMonth()] + " " + dt.getFullYear();
-            }(),
             gender: function () {
               if (res.gender === 'male') return 'Male';else if (res.gender === 'female') return 'Female';else if (res.gender === 'others') return 'Others';else return '';
             }()
@@ -6422,6 +6381,9 @@ var UserAddEdit = function UserAddEdit(props) {
     if (!p.visibility) {
       return null;
     }
+    if (p.name === 'profile_pic' && config.env.isExpenseProduct) {
+      return null;
+    }
     return /*#__PURE__*/React.createElement(IUIGrid, {
       item: true,
       sm: 12,
@@ -8547,6 +8509,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
         endIcon: null,
         outlinedBtn: false,
         className: "threedotMenuBtn",
+        MoreHorizIcon: true,
         placement: "bottom-end"
       }));
     },
@@ -8609,17 +8572,17 @@ var SingupRequests = function SingupRequests(props) {
     return dt.getDate() + " " + months[dt.getMonth()] + " " + dt.getFullYear();
   };
   var columns = [{
-    id: 'fname',
+    id: 'first_name',
     label: 'Name',
     minWidth: 250,
     sortable: true,
     cell: function cell(row) {
       var _row$profile_pic2;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIProfileBox, {
-        firstName: row.fname,
-        lastName: row.lname,
+        firstName: row.first_name,
+        lastName: row.last_name,
         isLetterAvatar: row.profile_pic && row.profile_pic.presigned_url ? false : true,
-        primaryText: row.fname + ' ' + row.lname,
+        primaryText: row.first_name + ' ' + row.last_name,
         secondaryText: row.email,
         letterAvatarTextColor: "black",
         letterAvatarBackgroundColor: "#d3d3d3",
@@ -8628,7 +8591,7 @@ var SingupRequests = function SingupRequests(props) {
       }));
     }
   }, {
-    id: 'created',
+    id: 'created_at',
     label: 'Requested on',
     minWidth: 100,
     sortable: true,
@@ -8638,7 +8601,7 @@ var SingupRequests = function SingupRequests(props) {
         width: 100
       }, /*#__PURE__*/React.createElement(IUITypography, {
         className: clsx(styles$5.rowText, styles$5.textTransform)
-      }, formatDate(row.created)));
+      }, formatDate(row.created_at)));
     }
   }, {
     id: 'actions',
@@ -8911,7 +8874,7 @@ var UserList = function UserList(_ref2) {
   var _React$useState11 = React.useState('asc'),
     signup_order = _React$useState11[0],
     setSignUpOrder = _React$useState11[1];
-  var _React$useState12 = React.useState('fname'),
+  var _React$useState12 = React.useState('first_name'),
     signup_orderBy = _React$useState12[0],
     setSignUpOrderBy = _React$useState12[1];
   var _useState22 = useState(''),
@@ -8945,31 +8908,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);
@@ -9727,10 +9673,7 @@ var UserList = function UserList(_ref2) {
     }));
   })), selectedUsersNotApprover !== null && selectedUsersNotApprover !== void 0 && selectedUsersNotApprover.length ? /*#__PURE__*/React.createElement(IUIBox, null, /*#__PURE__*/React.createElement("hr", {
     style: {
-      borderColor: '#E5E9ED',
-      borderLeft: 'none',
-      borderTop: 'none',
-      borderRight: 'none'
+      borderColor: '#E5E9ED'
     }
   }), /*#__PURE__*/React.createElement(IUIBox, {
     className: "iui__my-15"