@itilite/iui-user-management 1.4.94 → 1.4.96

package/dist/index.css

@@ -358,8 +358,28 @@
   margin: 0 !important;
 }
 ._3MVKj {
-  opacity: 0.6;
-  filter: grayscale(1);
+  opacity: 0.65;
+}
+
+._2_sgJ {
+  color: #cf2231;
+  border-radius: 4px;
+  padding: 4px;
+  border: 0.5px solid var(--color-red-200, #ffaba9);
+  background: var(--surface-critical, #fff1f0);
+  font-size: 10px;
+  font-weight: 500;
+  line-height: 12px; /* 120% */
+  letter-spacing: 0.1px;
+  display: inline-block;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+._3G7La._2_sgJ {
+  color: #9A6700;
+  border: 0.5px solid #EAC54F;
+  background: #FFFBE0;
 }
 
 ._2d_OH {
@@ -476,6 +496,10 @@
   margin-bottom: 0;
 }
 
+._19m4v {
+  margin-right: 6px;
+}
+
 ._3l4HZ {
   font-size: 11px;
   font-weight: 500;

package/dist/index.js

@@ -414,7 +414,7 @@ var userAddEditUrl = {
     return env.getPaymentUrl() + "/api/v1/card/default";
   },
   disablePaymentCard: function disablePaymentCard() {
-    return env.getPaymentUrl() + "/api/v1/payment/card-management/card/status";
+    return env.getPaymentUrl() + "/api/v1/card/status";
   },
   verifyUserInfo: function verifyUserInfo(userId) {
     return "api/v1/onboarding/user-sign-up-info/" + userId + "?company_id=" + IUILocalStorageService.getCompanyId();
@@ -832,7 +832,7 @@ var UserRole = function UserRole(_ref) {
 
 var styles$1 = {"defaultLabel":"_smjc4","card":"_3_S9J","cardNumber":"_36E9M","cardDigit":"_2pm-T","expiryDate":"_2tBnF","cardImage":"_3QvZh","visa":"_1IpBm","mastercard":"_2x6IX","amex":"_2a38S","discover":"_2vksl","diners":"_2kQRs","jcb":"_2bO1f","unionpay":"_2_jfu","is_nothing":"_1Lrzs","addCard":"_3711U","cardDeleteBtn":"_7Da2t","cardLabel":"_PQTex","defaultBtn":"_1_ArA","cursonPointer":"_1L115","sectionWrapper":"_VpUCK","margin":"_1Fs_D","minGridWidth":"_1hl-Z","firstRowMargin":"_1WZZj","firstChildMargin":"_IT_O_","paddingTop":"_Mhnl7","dividerColor":"_3ltFd"};
 
-var classes = {"disabledCard":"_3MVKj","sectionHeader":"_2d_OH","myCardsSection":"_3MNHj","companyCardsSection":"_34lN6","disabledNotice":"_1yV0j","cardsGrid":"_1oHGu","card":"_3ZTQc","moreIcon":"_3utA0","personal":"_duePd","corporate":"_3O33a","company":"_180_L","cardHeader":"_1eF61","cardTitleSection":"_2c40W","cardMaskedNumber":"_2Vlhq","cardName":"_bp-Mt","cardType":"_3l4HZ","menuButton":"_3TTEn","lockIcon":"_1S27X","cardDetails":"_IP2rg","cardNumber":"_7FOPe","cardExpiry":"_CI_p2","cardCvv":"_3Gzqu","cardUnhide":"_ivgBf","cardFooter":"_1WgPL","brandLogo":"_EV0l8","addCardButton":"_1oaCc","plusIcon":"_w9L5L"};
+var classes = {"disabledCard":"_3MVKj","expiredLabel":"_2_sgJ","expiresoonLabel":"_3G7La","sectionHeader":"_2d_OH","myCardsSection":"_3MNHj","companyCardsSection":"_34lN6","disabledNotice":"_1yV0j","cardsGrid":"_1oHGu","card":"_3ZTQc","moreIcon":"_3utA0","personal":"_duePd","corporate":"_3O33a","company":"_180_L","cardHeader":"_1eF61","cardTitleSection":"_2c40W","cardMaskedNumber":"_2Vlhq","cardName":"_bp-Mt","cardAlias":"_19m4v","cardType":"_3l4HZ","menuButton":"_3TTEn","lockIcon":"_1S27X","cardDetails":"_IP2rg","cardNumber":"_7FOPe","cardExpiry":"_CI_p2","cardCvv":"_3Gzqu","cardUnhide":"_ivgBf","cardFooter":"_1WgPL","brandLogo":"_EV0l8","addCardButton":"_1oaCc","plusIcon":"_w9L5L"};
 
 var SHOW_LOADER = 'SHOW_LOADER';
 var STOP_LOADER = 'STOP_LOADER';
@@ -849,6 +849,27 @@ var SET_PAYMENT_DETAILS = 'SET_PAYMENT_DETAILS';
 
 var env$1 = utils.configs.env;
 var IUILocalStorageService$1 = utils.services.IUILocalStorageService;
+var resolveMembershipName = function resolveMembershipName(membership) {
+  var _membership;
+  if (membership === void 0) {
+    membership = {};
+  }
+  if (((_membership = membership) === null || _membership === void 0 ? void 0 : _membership.membership_type) === 'rental_car') {
+    var _membership2, _membership3, _membership3$program_, _membership5, _membership6, _membership6$loyalty_;
+    if ((_membership2 = membership) !== null && _membership2 !== void 0 && _membership2.program_name && (_membership3 = membership) !== null && _membership3 !== void 0 && (_membership3$program_ = _membership3.program_name) !== null && _membership3$program_ !== void 0 && _membership3$program_.trim()) {
+      var _membership4, _membership4$program_;
+      return (_membership4 = membership) === null || _membership4 === void 0 ? void 0 : (_membership4$program_ = _membership4.program_name) === null || _membership4$program_ === void 0 ? void 0 : _membership4$program_.trim();
+    }
+    if ((_membership5 = membership) !== null && _membership5 !== void 0 && _membership5.loyalty_program_name && (_membership6 = membership) !== null && _membership6 !== void 0 && (_membership6$loyalty_ = _membership6.loyalty_program_name) !== null && _membership6$loyalty_ !== void 0 && _membership6$loyalty_.trim()) {
+      var _membership7, _membership7$loyalty_;
+      return (_membership7 = membership) === null || _membership7 === void 0 ? void 0 : (_membership7$loyalty_ = _membership7.loyalty_program_name) === null || _membership7$loyalty_ === void 0 ? void 0 : _membership7$loyalty_.trim();
+    } else {
+      return '';
+    }
+  } else {
+    return membership.name;
+  }
+};
 var formatCreateUserPayload = function formatCreateUserPayload(payload) {
   var _payload$employeeInfo, _payload$employeeInfo2, _payload$employeeInfo3, _payload$employeeInfo4, _payload$employeeInfo5, _payload$employeeInfo6, _payload$employeeInfo7, _payload$employeeInfo8, _payload$employeeInfo9, _payload$employeeInfo10;
   var res = {
@@ -943,7 +964,7 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
           loyalty_program_id = _ref$loyalty_program_ === void 0 ? null : _ref$loyalty_program_;
         var res = {
           membership_type: membership.membership_type,
-          name: membership.name,
+          name: resolveMembershipName(membership),
           number: membership.number,
           iata_code: iata_code,
           loyalty_program_id: loyalty_program_id
@@ -1131,7 +1152,7 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
           loyalty_program_id = _ref2$loyalty_program === void 0 ? null : _ref2$loyalty_program;
         var res = {
           membership_type: membership.membership_type,
-          name: membership.name,
+          name: resolveMembershipName(membership),
           number: membership.number,
           id: membership.id,
           iata_code: iata_code,
@@ -2792,13 +2813,18 @@ var CardsManagement = function CardsManagement(_ref) {
   });
   var cardsCount = (personalCards === null || personalCards === void 0 ? void 0 : personalCards.length) + (corporateCards === null || corporateCards === void 0 ? void 0 : corporateCards.length);
   var renderCard = function renderCard(card) {
-    var _card$metadata, _card$metadata2, _clsx, _card$card, _card$card2, _card$card3, _card$card4;
-    console.log('_paymentDetails2', card, cards);
+    var _card$metadata, _clsx, _card$card, _card$card2, _card$card3, _card$card4;
     var isCompanyCard = (card === null || card === void 0 ? void 0 : card.category) === 'Company';
     var cardClass = getCardTypeClass(card === null || card === void 0 ? void 0 : card.category);
     var isDefaultCard = !!+(card === null || card === void 0 ? void 0 : (_card$metadata = card.metadata) === null || _card$metadata === void 0 ? void 0 : _card$metadata.default_card);
-    var isDisabled = (card === null || card === void 0 ? void 0 : (_card$metadata2 = card.metadata) === null || _card$metadata2 === void 0 ? void 0 : _card$metadata2.is_enabled) === '0';
-    var showMenuButton = cardsCount === 1 || cardsCount > 1 && !isDefaultCard;
+    var isExpired = card.metadata.is_enabled === '2';
+    var isDisabled = card.metadata.is_enabled === '0' || isExpired;
+    var currentDate = new Date();
+    var cardExpDate = new Date(parseInt(card.card.exp_year, 10), parseInt(card.card.exp_month, 10) - 1);
+    var timeDiff = cardExpDate.getTime() - currentDate.getTime();
+    var daysToExpire = Math.ceil(timeDiff / (1000 * 3600 * 24));
+    var expiresSoon = daysToExpire <= 30 && !isExpired;
+    var showMenuButton = !isExpired && (cardsCount === 1 || cardsCount > 1 && !isDefaultCard);
     return /*#__PURE__*/React__default.createElement("div", {
       key: card.id,
       className: clsx(classes.card, classes[cardClass], (_clsx = {}, _clsx[classes.disabledCard] = isDisabled, _clsx))
@@ -2808,7 +2834,13 @@ var CardsManagement = function CardsManagement(_ref) {
       className: classes.cardTitleSection
     }, /*#__PURE__*/React__default.createElement("h3", {
       className: classes.cardName
-    }, card === null || card === void 0 ? void 0 : card.alias), /*#__PURE__*/React__default.createElement("span", {
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: classes.cardAlias
+    }, card === null || card === void 0 ? void 0 : card.alias), isExpired && /*#__PURE__*/React__default.createElement("span", {
+      className: classes.expiredLabel
+    }, "Expired"), expiresSoon && /*#__PURE__*/React__default.createElement("span", {
+      className: clsx(classes.expiresoonLabel, classes.expiredLabel)
+    }, "Expires Soon")), /*#__PURE__*/React__default.createElement("span", {
       className: classes.cardType
     }, getCardTypeLabel(card.category), isDefaultCard && /*#__PURE__*/React__default.createElement("span", null, ' (Default)'))), isCompanyCard ? /*#__PURE__*/React__default.createElement(LockIcon, {
       className: classes.lockIcon
@@ -3616,7 +3648,7 @@ var personalInfo = [{
     maxLength: 100,
     minLength: 0
   },
-  disableText: 'Please get in touch with your administrator to change this value.'
+  disableText: 'A user’s email is their primary identifier and cannot be changed for security reasons. To update it, please deactivate the existing user and create a new one with the correct email address.'
 }, {
   id: 4,
   label: 'Phone number',
@@ -5670,14 +5702,37 @@ var AddMembershipButton = React.memo(function (_ref) {
 var IUIToastMessageService$5 = utils.services.IUIToastMessageService;
 var api$7 = utils.configs.api;
 var sixteenDigitNumber$1 = /^\d{16}$/;
-var Membership = function Membership(_ref) {
+var resolveMembershipName$1 = function resolveMembershipName(membership, customName) {
+  var _membership, _ref;
+  if (membership === void 0) {
+    membership = {};
+  }
+  if (customName === void 0) {
+    customName = '';
+  }
+  if (((_membership = membership) === null || _membership === void 0 ? void 0 : _membership.membership_type) === 'rental_car') {
+    var _membership2, _membership3, _membership3$program_, _membership5, _membership6, _membership6$loyalty_;
+    if ((_membership2 = membership) !== null && _membership2 !== void 0 && _membership2.program_name && (_membership3 = membership) !== null && _membership3 !== void 0 && (_membership3$program_ = _membership3.program_name) !== null && _membership3$program_ !== void 0 && _membership3$program_.trim()) {
+      var _membership4, _membership4$program_;
+      return (_membership4 = membership) === null || _membership4 === void 0 ? void 0 : (_membership4$program_ = _membership4.program_name) === null || _membership4$program_ === void 0 ? void 0 : _membership4$program_.trim();
+    }
+    if ((_membership5 = membership) !== null && _membership5 !== void 0 && _membership5.loyalty_program_name && (_membership6 = membership) !== null && _membership6 !== void 0 && (_membership6$loyalty_ = _membership6.loyalty_program_name) !== null && _membership6$loyalty_ !== void 0 && _membership6$loyalty_.trim()) {
+      var _membership7, _membership7$loyalty_;
+      return (_membership7 = membership) === null || _membership7 === void 0 ? void 0 : (_membership7$loyalty_ = _membership7.loyalty_program_name) === null || _membership7$loyalty_ === void 0 ? void 0 : _membership7$loyalty_.trim();
+    } else {
+      return '';
+    }
+  }
+  return (_ref = customName || '') === null || _ref === void 0 ? void 0 : _ref.trim();
+};
+var Membership = function Membership(_ref2) {
   var _clsx;
-  var _ref$membershipInfoIn = _ref.membershipInfoInput,
-    membershipInfoInput = _ref$membershipInfoIn === void 0 ? [] : _ref$membershipInfoIn,
-    _ref$setMembershipInf = _ref.setMembershipInfoInput,
-    setMembershipInfoInput = _ref$setMembershipInf === void 0 ? function () {} : _ref$setMembershipInf,
-    _ref$isProfile = _ref.isProfile,
-    isProfile = _ref$isProfile === void 0 ? false : _ref$isProfile;
+  var _ref2$membershipInfoI = _ref2.membershipInfoInput,
+    membershipInfoInput = _ref2$membershipInfoI === void 0 ? [] : _ref2$membershipInfoI,
+    _ref2$setMembershipIn = _ref2.setMembershipInfoInput,
+    setMembershipInfoInput = _ref2$setMembershipIn === void 0 ? function () {} : _ref2$setMembershipIn,
+    _ref2$isProfile = _ref2.isProfile,
+    isProfile = _ref2$isProfile === void 0 ? false : _ref2$isProfile;
   var _useParams = reactRouterDom.useParams(),
     editUserId = _useParams.userId;
   var _useSelector = reactRedux.useSelector(function (state) {
@@ -5880,22 +5935,24 @@ var Membership = function Membership(_ref) {
   };
   var handleSubmit = function handleSubmit() {
     try {
-      var _ref2, _ref3;
       if (isAAAloyaltySelected && !sixteenDigitNumber$1.test(membershipNumber)) {
         IUIToastMessageService$5.warningNotify('Enter 16-digit AAA membership ID');
         return Promise.resolve();
       }
       var url = "/api/v1/user-management/users/" + userID + "/membership";
+      var resolvedMembershipName = resolveMembershipName$1(_extends({}, selectedMembershipChain, {
+        membership_type: type
+      }), membershipName);
       var payload = isEditing ? _extends({}, selectedMembershipChain, {
         number: membershipNumber === null || membershipNumber === void 0 ? void 0 : membershipNumber.trim(),
-        name: (_ref2 = membershipName || '') === null || _ref2 === void 0 ? void 0 : _ref2.trim()
+        name: resolvedMembershipName
       }) : {
         membership_type: type,
         number: membershipNumber === null || membershipNumber === void 0 ? void 0 : membershipNumber.trim(),
         iata_code: null,
         user: userID,
         loyalty_program_id: selectedMembershipChain === null || selectedMembershipChain === void 0 ? void 0 : selectedMembershipChain.loyalty_program_id,
-        name: (_ref3 = membershipName || '') === null || _ref3 === void 0 ? void 0 : _ref3.trim()
+        name: resolvedMembershipName
       };
       setIsUpdating(true);
       var _temp4 = _finallyRethrows(function () {
@@ -5946,7 +6003,7 @@ var Membership = function Membership(_ref) {
   var handleEdit = function handleEdit(mem, index, isOther) {
     setEditIndex(index);
     setSelectedMembershipChain(mem);
-    setMembershipName((mem === null || mem === void 0 ? void 0 : mem.name) || '');
+    setMembershipName((mem === null || mem === void 0 ? void 0 : mem.name) || resolveMembershipName$1(mem, mem === null || mem === void 0 ? void 0 : mem.name));
     setMembershipNumber(mem === null || mem === void 0 ? void 0 : mem.number);
     setIsOtherMembership(isOther);
     var currentModalState = _extends({}, modalState);
@@ -10334,6 +10391,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
     id: 'status',
     label: 'Status',
     minWidth: 160,
+    sortable: true,
     cell: function cell(row) {
       return /*#__PURE__*/React__default.createElement(iuistyles.IUIFormGroup, null, /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
         component: "div",
@@ -11173,7 +11231,7 @@ var UserList = function UserList(_ref2) {
     if (isTokenVerified === true) {
       var pageNum = page;
       var searchParam = searchValue.trim() !== '' ? '&search=' + searchValue : '';
-      var orderingParam = orderBy === '' ? '' : order === 'asc' ? '&ordering=' + orderBy : '&ordering=-' + orderBy;
+      var orderingParam = orderBy === '' ? '' : orderBy === 'status' ? order === 'asc' ? '&ordering=is_active,-has_visited' : '&ordering=-is_active,-has_visited' : order === 'asc' ? '&ordering=' + orderBy : '&ordering=-' + orderBy;
       var url = userListUrl.getUser + '?length=' + rowsPerPage + '&page=' + pageNum + searchParam + orderingParam;
       if (isSearchingChange) {
         var delayDebounceFn = setTimeout(function () {