@itilite/iui-user-management 0.4.27 → 0.4.28

package/dist/index.js

@@ -14,7 +14,6 @@ var moment = _interopDefault(require('moment'));
 var reduxDevtoolsExtension = require('redux-devtools-extension');
 var reactRouterDom = require('react-router-dom');
 var styles$8 = require('@material-ui/core/styles');
-var Tooltip = _interopDefault(require('@material-ui/core/Tooltip'));
 var Switch = _interopDefault(require('@material-ui/core/Switch'));
 var MoreHorizIcon = _interopDefault(require('@material-ui/icons/MoreHoriz'));
 var Button = _interopDefault(require('@material-ui/core/Button'));
@@ -449,10 +448,10 @@ var userPanelUrl = {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?action=delete&table=" + tableName;
   },
   getUnit: function getUnit(tableName, length, sort) {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&order=" + sort;
+    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&ordering=" + sort;
   },
   getPaginationUnit: function getPaginationUnit(tableName, length, page, sort) {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&page=" + page + "&order=" + sort;
+    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&page=" + page + "&ordering=" + sort;
   },
   moveUnit: function moveUnit() {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/transfer-users";
@@ -1254,6 +1253,7 @@ var fetchRenderFileds = function fetchRenderFileds() {
           var _res$data;
           IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.message) || 'Opps, Something went wrong.');
           dispatch(stopLoader());
+          reject();
         }
       })["catch"](function (err) {
         reject(err);
@@ -1425,9 +1425,11 @@ var createUser = function createUser(payload) {
         } else {
           if (res.data.errors && typeof res.data.errors === 'object') {
             reject(res.data.errors);
+            return;
           } else if (!Object.keys(res.data.errors).length) {
             IUIToastMessageService$1.warningNotify(res.data.message);
           }
+          reject();
         }
       })["catch"](function (err) {
         var _err$response6;
@@ -1543,48 +1545,6 @@ var undoneSignUpRejection = function undoneSignUpRejection(userId) {
     });
   };
 };
-var resetPasswordForUser = function resetPasswordForUser(data) {
-  return function (dispatch) {
-    return new Promise(function (resolve, reject) {
-      api$2.post("" + userAddEditUrl.resetPasswordForUserApi(), {
-        email: data.email
-      }).then(function (res) {
-        IUIToastMessageService$1.sNotify("The link to reset the password has been sent to the user's email address. Check your \"junk mail\" or \"spam\" folders in case it's not received.");
-        resolve();
-      })["catch"](function (err) {
-        var _err$response9, _err$response9$data;
-        if (!(err !== null && err !== void 0 && (_err$response9 = err.response) !== null && _err$response9 !== void 0 && (_err$response9$data = _err$response9.data) !== null && _err$response9$data !== void 0 && _err$response9$data.status)) {
-          var _err$response10, _err$response10$data, _err$response10$data$;
-          IUIToastMessageService$1.errNotify(err === null || err === void 0 ? void 0 : (_err$response10 = err.response) === null || _err$response10 === void 0 ? void 0 : (_err$response10$data = _err$response10.data) === null || _err$response10$data === void 0 ? void 0 : (_err$response10$data$ = _err$response10$data.message) === null || _err$response10$data$ === void 0 ? void 0 : _err$response10$data$.email[0]);
-          reject(err);
-          return;
-        }
-        reject(err);
-      });
-    });
-  };
-};
-var resendInviteForUser = function resendInviteForUser(data) {
-  return function (dispatch) {
-    return new Promise(function (resolve, reject) {
-      api$2.post(userAddEditUrl.resendInviteForUserApi(), {
-        user_ids: data
-      }).then(function (res) {
-        IUIToastMessageService$1.sNotify(res.data.message);
-        resolve();
-      })["catch"](function (err) {
-        var _err$response11, _err$response11$data;
-        if (!(err !== null && err !== void 0 && (_err$response11 = err.response) !== null && _err$response11 !== void 0 && (_err$response11$data = _err$response11.data) !== null && _err$response11$data !== void 0 && _err$response11$data.status)) {
-          var _err$response12, _err$response12$data, _err$response12$data$;
-          IUIToastMessageService$1.errNotify(err === null || err === void 0 ? void 0 : (_err$response12 = err.response) === null || _err$response12 === void 0 ? void 0 : (_err$response12$data = _err$response12.data) === null || _err$response12$data === void 0 ? void 0 : (_err$response12$data$ = _err$response12$data.message) === null || _err$response12$data$ === void 0 ? void 0 : _err$response12$data$.email[0]);
-          reject(err);
-          return;
-        }
-        reject(err);
-      });
-    });
-  };
-};
 var updateUser = function updateUser(payload, userId, inputChangeLog) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
@@ -8164,10 +8124,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
     selected = props.selected,
     _props$handleSingleCh = props.handleSingleCheckBoxClick,
     handleSingleCheckBoxClick = _props$handleSingleCh === void 0 ? function () {} : _props$handleSingleCh,
-    _props$onResetPasswor = props.onResetPasswordHandler,
-    onResetPasswordHandler = _props$onResetPasswor === void 0 ? function () {} : _props$onResetPasswor,
-    _props$toggleInviteMo = props.toggleInviteModal,
-    toggleInviteModal = _props$toggleInviteMo === void 0 ? function () {} : _props$toggleInviteMo,
     orderBy = props.orderBy,
     order = props.order,
     _props$onRequestSort = props.onRequestSort,
@@ -8185,21 +8141,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
     searchValue = props.searchValue,
     _props$isILadmin = props.isILadmin,
     isILadmin = _props$isILadmin === void 0 ? false : _props$isILadmin;
-  var useStyles = styles$8.makeStyles(function (theme) {
-    return {
-      tooltip: {
-        background: '#1F2937',
-        fontSize: '14px',
-        color: '#ffffff',
-        padding: '12px 16px',
-        borderRadius: '6px'
-      },
-      arrow: {
-        color: '#1F2937'
-      }
-    };
-  });
-  var classes = useStyles();
   var columns = [{
     id: 'first_name',
     label: 'Name',
@@ -8219,27 +8160,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
         profilePath: row === null || row === void 0 ? void 0 : (_row$profile_pic = row.profile_pic) === null || _row$profile_pic === void 0 ? void 0 : _row$profile_pic.presigned_url
       }));
     }
-  }, {
-    id: 'first_name',
-    label: '',
-    minWidth: 60,
-    sortable: true,
-    cell: function cell(row) {
-      return /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
-        component: "div",
-        width: 60
-      }, row && row.has_visited === 0 ? /*#__PURE__*/React__default.createElement(Tooltip, {
-        title: "This user hasn't logged on to the platform yet",
-        arrow: true,
-        classes: {
-          arrow: classes.arrow,
-          tooltip: classes.tooltip
-        },
-        placement: "top-start"
-      }, /*#__PURE__*/React__default.createElement("div", {
-        className: clsx(styles$5.tooltipText)
-      }, "Invited")) : null);
-    }
   }, {
     id: 'emp_info__department__name',
     label: 'Department',
@@ -8327,21 +8247,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
           return onEditHandler(row.id);
         }
       }];
-      if (row && row.has_visited && row.is_active) {
-        options.push({
-          label: 'Reset password',
-          handler: function handler() {
-            return onResetPasswordHandler(row.email);
-          }
-        });
-      } else if (row && row.is_active) {
-        options.push({
-          label: 'Resend invite',
-          handler: function handler() {
-            return toggleInviteModal(row.id, 'single');
-          }
-        });
-      }
       if (isILadmin) {
         options.push({
           label: 'Make primary admin',
@@ -8509,22 +8414,6 @@ var SingupRequests = function SingupRequests(props) {
   });
 };
 
-function InviteInfoIcon() {
-  return /*#__PURE__*/React__default.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "20",
-    height: "20",
-    fill: "none",
-    viewBox: "0 0 20 20"
-  }, /*#__PURE__*/React__default.createElement("path", {
-    fill: "#CA8A04",
-    d: "M11 5a1 1 0 11-2 0 1 1 0 012 0zM8 8a1 1 0 000 2h1v3H8a1 1 0 100 2h4a1 1 0 100-2h-1V9a1 1 0 00-1-1H8z"
-  }), /*#__PURE__*/React__default.createElement("path", {
-    fill: "#CA8A04",
-    d: "M0 10c0 5.522 4.477 10 10 10s10-4.478 10-10c0-5.523-4.477-10-10-10S0 4.477 0 10zm10-8a8 8 0 110 16 8 8 0 010-16z"
-  }));
-}
-
 var IUIToastMessageService$7 = utils.services.IUIToastMessageService;
 var env$7 = utils.configs.env;
 var UndoButton = function UndoButton(_ref) {
@@ -8613,39 +8502,33 @@ var UserList = function UserList(_ref2) {
   var _useState10 = React.useState(false),
     isApiFetching = _useState10[0],
     setisApiFetching = _useState10[1];
-  var _useState11 = React.useState(false),
-    showInviteModal = _useState11[0],
-    setToggleInviteModal = _useState11[1];
-  var _useState12 = React.useState(''),
-    userIds = _useState12[0],
-    setUserIds = _useState12[1];
   var _React$useState5 = React__default.useState(1),
     signup_page = _React$useState5[0],
     setSignUpPage = _React$useState5[1];
-  var _useState13 = React.useState(5),
-    signup_rowsPerPage = _useState13[0],
-    setSignUpRowsPerPage = _useState13[1];
+  var _useState11 = React.useState(5),
+    signup_rowsPerPage = _useState11[0],
+    setSignUpRowsPerPage = _useState11[1];
   var _React$useState6 = React__default.useState('asc'),
     signup_order = _React$useState6[0],
     setSignUpOrder = _React$useState6[1];
   var _React$useState7 = React__default.useState('fname'),
     signup_orderBy = _React$useState7[0],
     setSignUpOrderBy = _React$useState7[1];
-  var _useState14 = React.useState(''),
-    signup_searchValue = _useState14[0],
-    set_signup_SearchValue = _useState14[1];
+  var _useState12 = React.useState(''),
+    signup_searchValue = _useState12[0],
+    set_signup_SearchValue = _useState12[1];
+  var _useState13 = React.useState(false),
+    isSignUpSortingChange = _useState13[0],
+    setSignUpSortingChange = _useState13[1];
+  var _useState14 = React.useState(false),
+    isSignUpSearchingChange = _useState14[0],
+    setSignUpSearchingChange = _useState14[1];
   var _useState15 = React.useState(false),
-    isSignUpSortingChange = _useState15[0],
-    setSignUpSortingChange = _useState15[1];
+    isSignUpSortingChangeTemp = _useState15[0],
+    setSignUpSortingChangeTemp = _useState15[1];
   var _useState16 = React.useState(false),
-    isSignUpSearchingChange = _useState16[0],
-    setSignUpSearchingChange = _useState16[1];
-  var _useState17 = React.useState(false),
-    isSignUpSortingChangeTemp = _useState17[0],
-    setSignUpSortingChangeTemp = _useState17[1];
-  var _useState18 = React.useState(false),
-    isSignUpSearchingChangeTemp = _useState18[0],
-    setSignUpSearchingChangeTemp = _useState18[1];
+    isSignUpSearchingChangeTemp = _useState16[0],
+    setSignUpSearchingChangeTemp = _useState16[1];
   var _useSelector3 = reactRedux.useSelector(function (state) {
       return state.userList;
     }),
@@ -8792,37 +8675,6 @@ var UserList = function UserList(_ref2) {
     setOpenImportUsersModal(false);
     handleImportPagenavigation(jobId);
   };
-  var onResetPasswordHandler = function onResetPasswordHandler(email) {
-    dispatch(resetPasswordForUser({
-      email: email
-    }));
-  };
-  var toggleInviteModal = function toggleInviteModal(ids, type) {
-    console.log(type);
-    if (!type && (Object.values(selected).flat().length === 0 || Object.values(selected).flat() === undefined)) {
-      IUIToastMessageService$7.warningNotify('Select at least one user to invite.');
-      return false;
-    }
-    setUserIds(ids);
-    setToggleInviteModal(!showInviteModal);
-  };
-  var onResendInviteHandler = function onResendInviteHandler() {
-    var userIdArr = [];
-    if (userIds && !isNaN(userIds)) {
-      userIdArr = [userIds];
-    } else if (Object.keys(selected).length) {
-      Object.values(selected).map(function (val, i) {
-        if (val.length) {
-          val.map(function (idx, i) {
-            userIdArr.push(idx);
-          });
-        }
-      });
-    }
-    setUserIds('');
-    dispatch(resendInviteForUser(userIdArr));
-    setToggleInviteModal(!showInviteModal);
-  };
   var handleExportUsers = function handleExportUsers() {
     try {
       setDownlStatus(true);
@@ -8862,9 +8714,6 @@ var UserList = function UserList(_ref2) {
   }, {
     label: 'Bulk action history',
     handler: handleBulkActionHistoryClick
-  }, {
-    label: 'Resend invite',
-    handler: toggleInviteModal
   }];
   React.useEffect(function () {
     var roleCanAccess = ['travel_itilite_admin', 'travel_admin', 'expense_itilite_admin', 'expense_admin'];
@@ -8882,7 +8731,7 @@ var UserList = function UserList(_ref2) {
       var pageNum = page;
       var searchParam = searchValue.trim() !== '' ? '&search=' + searchValue : '';
       var orderingParam = orderBy === '' ? '' : order === 'asc' ? '&ordering=' + orderBy : '&ordering=-' + orderBy;
-      var url = userListUrl.getUser + '?length=' + rowsPerPage + '&page=' + pageNum + searchParam + orderingParam;
+      var url = userListUrl.getUser + '?length=' + rowsPerPage + '&page=' + pageNum + searchParam + orderingParam + '&pagename=company';
       if (isSearchingChange) {
         var delayDebounceFn = setTimeout(function () {
           setisApiFetching(true);
@@ -9067,9 +8916,7 @@ var UserList = function UserList(_ref2) {
         disableRowCheckbox: deactivatedUsers,
         searchValue: searchValue,
         isILadmin: isILadmin,
-        onPrimaryAdminHandler: onPrimaryAdminHandler,
-        onResetPasswordHandler: onResetPasswordHandler,
-        toggleInviteModal: toggleInviteModal
+        onPrimaryAdminHandler: onPrimaryAdminHandler
       }))
     }, {
       label: /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, null, "Sign-up requests", ' ', /*#__PURE__*/React__default.createElement(TabLabelCount, {
@@ -9142,41 +8989,7 @@ var UserList = function UserList(_ref2) {
     className: styles$5.headerText
   }, 'Are you sure you want to deactivate ' + Object.values(selected).flat().length.toString() + (Object.values(selected).flat().length === 1 ? ' user ?' : ' users ?')), /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
     className: styles$5.description
-  }, "The", ' ', Object.values(selected).flat().length === 1 ? ' user ' : ' users ', "won\u2019t be able to access itilite platform"))), /*#__PURE__*/React__default.createElement(iuistyles.IUIModal, {
-    isOpen: showInviteModal,
-    closeHandler: toggleInviteModal,
-    cancelLabel: "Cancel",
-    headerText: "Resend Invites?",
-    submitLabel: "Send",
-    submitHandler: function submitHandler() {
-      return onResendInviteHandler();
-    },
-    width: "400px",
-    modalBodyStyle: {
-      padding: '0px'
-    },
-    footerStyle: {
-      justifyContent: 'center'
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      display: 'flex',
-      padding: '16px',
-      margin: '8px 24px',
-      border: '1px solid #FDE047',
-      background: '#FEFCE8',
-      borderRadius: '5px'
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      marginRight: '5px'
-    }
-  }, /*#__PURE__*/React__default.createElement(InviteInfoIcon, null)), /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      fontSize: '14px',
-      color: '#374151'
-    }
-  }, "This invitation will be sent to users who have not logged into the platform."))), /*#__PURE__*/React__default.createElement(BulkUploadModal, {
+  }, "The", ' ', Object.values(selected).flat().length === 1 ? ' user ' : ' users ', "won\u2019t be able to access itilite platform"))), /*#__PURE__*/React__default.createElement(BulkUploadModal, {
     isOpenImportUsersModal: isOpenImportUsersModal,
     closeImportUsersModal: closeImportUsersModal,
     closeImportModal: closeImportModal