@itilite/iui-user-management 0.4.215 → 0.4.217

package/dist/index.js

@@ -6218,15 +6218,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 '';
             }()
@@ -8579,17 +8574,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__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(iuistyles.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",
@@ -8598,7 +8593,7 @@ var SingupRequests = function SingupRequests(props) {
       }));
     }
   }, {
-    id: 'created',
+    id: 'created_at',
     label: 'Requested on',
     minWidth: 100,
     sortable: true,
@@ -8608,7 +8603,7 @@ var SingupRequests = function SingupRequests(props) {
         width: 100
       }, /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
         className: clsx(styles$5.rowText, styles$5.textTransform)
-      }, formatDate(row.created)));
+      }, formatDate(row.created_at)));
     }
   }, {
     id: 'actions',
@@ -8881,7 +8876,7 @@ var UserList = function UserList(_ref2) {
   var _React$useState11 = React__default.useState('asc'),
     signup_order = _React$useState11[0],
     setSignUpOrder = _React$useState11[1];
-  var _React$useState12 = React__default.useState('fname'),
+  var _React$useState12 = React__default.useState('first_name'),
     signup_orderBy = _React$useState12[0],
     setSignUpOrderBy = _React$useState12[1];
   var _useState22 = React.useState(''),
@@ -8915,22 +8910,31 @@ var UserList = function UserList(_ref2) {
       var _SelectedUsersNotApprover = [].concat(selectedUsersNotApprover);
       var _SelectedUsersApprover = [].concat(selectedUsersApprover);
       var _selected = Object.values(selected).flat();
-      var uniqueArray1 = [].concat(new Map(_SelectedUsersNotApprover.map(function (item) {
-        return [item.id, item];
-      })).values());
-      var uniqueArray2 = [].concat(new Map(_SelectedUsersApprover.map(function (item) {
-        return [item.id, item];
-      })).values());
-      _SelectedUsersNotApprover = uniqueArray1.filter(function (item) {
-        return _selected.includes(item.id);
+      var temp1 = {};
+      var temp2 = {};
+      var tempArray1 = [];
+      var tempArray2 = [];
+      _SelectedUsersNotApprover.map(function (item) {
+        if (temp1[item.id] !== item) {
+          temp1[item.id] = item;
+        }
       });
-      _SelectedUsersApprover = uniqueArray2.filter(function (item) {
-        return _selected.includes(item.id);
+      _SelectedUsersApprover.map(function (item) {
+        if (temp2[item.id] !== item) {
+          temp2[item.id] = item;
+        }
       });
-      console.log('uniqueArray1', _SelectedUsersNotApprover);
-      console.log('uniqueArray2', _SelectedUsersApprover);
-      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);
@@ -9688,7 +9692,10 @@ 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'
+      borderColor: '#E5E9ED',
+      borderLeft: 'none',
+      borderTop: 'none',
+      borderRight: 'none'
     }
   }), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     className: "iui__my-15"