ordering-ui-admin-external 1.43.43 → 1.43.45

package/_modules/components/Marketing/CampaignHeader/index.js

@@ -21,8 +21,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CampaignHeader = exports.CampaignHeader = function CampaignHeader(props) {
   var _sessionState$user;
   var searchValue = props.searchValue,
+    paginationProps = props.paginationProps,
     handleChangeSearch = props.handleChangeSearch,
-    handleOpenDetail = props.handleOpenDetail;
+    handleOpenDetail = props.handleOpenDetail,
+    getCampaignList = props.getCampaignList;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -33,6 +35,10 @@ var CampaignHeader = exports.CampaignHeader = function CampaignHeader(props) {
     _useInfoShare2 = _slicedToArray(_useInfoShare, 2),
     isCollapse = _useInfoShare2[0].isCollapse,
     handleMenuCollapse = _useInfoShare2[1].handleMenuCollapse;
+  var handleReloadCampaigns = function handleReloadCampaigns() {
+    var _paginationProps$curr, _paginationProps$page;
+    getCampaignList((_paginationProps$curr = paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage) !== null && _paginationProps$curr !== void 0 ? _paginationProps$curr : 1, (_paginationProps$page = paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize) !== null && _paginationProps$page !== void 0 ? _paginationProps$page : 10);
+  };
   return /*#__PURE__*/_react.default.createElement(_styles2.CampaignHeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderSection, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
@@ -45,6 +51,12 @@ var CampaignHeader = exports.CampaignHeader = function CampaignHeader(props) {
     target: "_blank",
     rel: "noopener noreferrer"
   }, t('CUSTOMER_SUPPORT', 'Customer support'))))), /*#__PURE__*/_react.default.createElement(_styles2.TopRightSection, null, /*#__PURE__*/_react.default.createElement(_styles2.WrapperSearch, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
+    borderRadius: "8px",
+    color: "lightPrimary",
+    onClick: function onClick() {
+      return handleReloadCampaigns();
+    }
+  }, t('REFRESH', 'Refresh')), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "lightPrimary",
     onClick: function onClick() {

package/_modules/components/Marketing/CampaignList/index.js

@@ -32,7 +32,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CampaignList = exports.CampaignList = function CampaignList(props) {
-  var _campaignList$campaig, _campaignList$campaig2;
+  var _campaignList$campaig2, _campaignList$campaig3;
   var campaignList = props.campaignList,
     getCampaignList = props.getCampaignList,
     paginationProps = props.paginationProps,
@@ -140,6 +140,15 @@ var CampaignList = exports.CampaignList = function CampaignList(props) {
     setSelectedCampaign(campaign);
     setOpenBounced(true);
   };
+  (0, _react.useEffect)(function () {
+    var _campaignList$campaig;
+    if (campaignList !== null && campaignList !== void 0 && campaignList.loading || (campaignList === null || campaignList === void 0 || (_campaignList$campaig = campaignList.campaigns) === null || _campaignList$campaig === void 0 ? void 0 : _campaignList$campaig.length) > 0 || (paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages) <= 1) return;
+    if ((paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage) !== (paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages)) {
+      handleChangePage(paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage);
+    } else {
+      handleChangePage((paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage) - 1);
+    }
+  }, [campaignList === null || campaignList === void 0 ? void 0 : campaignList.campaigns, paginationProps]);
   (0, _react.useEffect)(function () {
     if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
     (0, _utils.addQueryToUrl)({
@@ -148,7 +157,7 @@ var CampaignList = exports.CampaignList = function CampaignList(props) {
     });
   }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.Table, {
-    isRelative: (campaignList === null || campaignList === void 0 || (_campaignList$campaig = campaignList.campaigns) === null || _campaignList$campaig === void 0 ? void 0 : _campaignList$campaig.length) > 5
+    isRelative: (campaignList === null || campaignList === void 0 || (_campaignList$campaig2 = campaignList.campaigns) === null || _campaignList$campaig2 === void 0 ? void 0 : _campaignList$campaig2.length) > 5
   }, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.campaign) && /*#__PURE__*/_react.default.createElement("th", null, t('CAMPAIGN', 'Campaign')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.contact_type) && /*#__PURE__*/_react.default.createElement("th", null, t('CONTACT_TYPE', 'Contact type')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.audience) && /*#__PURE__*/_react.default.createElement("th", null, t('AUDIENCE', 'Audience')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.in_queue) && /*#__PURE__*/_react.default.createElement("th", null, t('IN_QUEUE', 'In Queue')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.sent_count) && /*#__PURE__*/_react.default.createElement("th", null, t('SENT', 'Sent')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.open_count) && /*#__PURE__*/_react.default.createElement("th", null, t('OPENS', 'Opens')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.unsubscribed_count) && /*#__PURE__*/_react.default.createElement("th", null, t('UNSUBSCRIBED', 'Unsubscribed')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.bounced_count) && /*#__PURE__*/_react.default.createElement("th", null, t('BOUNCES', 'Bounces')), /*#__PURE__*/_react.default.createElement("th", {
     className: "allow-colums action"
   }, /*#__PURE__*/_react.default.createElement(_Shared.ColumnAllowSettingPopover, {
@@ -237,7 +246,7 @@ var CampaignList = exports.CampaignList = function CampaignList(props) {
     onClick: function onClick() {
       return handleOpenDetail({});
     }
-  }, t('ADD_NEW_CAMPAIGN', 'Add new campaign')), (campaignList === null || campaignList === void 0 || (_campaignList$campaig2 = campaignList.campaigns) === null || _campaignList$campaig2 === void 0 ? void 0 : _campaignList$campaig2.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
+  }, t('ADD_NEW_CAMPAIGN', 'Add new campaign')), (campaignList === null || campaignList === void 0 || (_campaignList$campaig3 = campaignList.campaigns) === null || _campaignList$campaig3 === void 0 ? void 0 : _campaignList$campaig3.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
     currentPage: paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage,
     totalPages: paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages,
     handleChangePage: handleChangePage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.43",
+  "version": "1.43.45",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.29",
+    "ordering-components-admin-external": "1.43.30",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Marketing/CampaignHeader/index.js

@@ -18,14 +18,20 @@ import {
 export const CampaignHeader = (props) => {
   const {
     searchValue,
+    paginationProps,
     handleChangeSearch,
-    handleOpenDetail
+    handleOpenDetail,
+    getCampaignList
   } = props
 
   const [, t] = useLanguage()
   const [sessionState] = useSession()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
 
+  const handleReloadCampaigns = () => {
+    getCampaignList(paginationProps?.currentPage ?? 1, paginationProps?.pageSize ?? 10)
+  }
+
   return (
     <CampaignHeaderContainer>
       <HeaderSection>
@@ -54,6 +60,13 @@ export const CampaignHeader = (props) => {
       </HeaderSection>
       <TopRightSection>
         <WrapperSearch>
+          <Button
+            borderRadius='8px'
+            color='lightPrimary'
+            onClick={() => handleReloadCampaigns()}
+          >
+            {t('REFRESH', 'Refresh')}
+          </Button>
           <Button
             borderRadius='8px'
             color='lightPrimary'

package/src/components/Marketing/CampaignList/index.js

@@ -137,6 +137,15 @@ export const CampaignList = (props) => {
     setOpenBounced(true)
   }
 
+  useEffect(() => {
+    if (campaignList?.loading || campaignList?.campaigns?.length > 0 || paginationProps?.totalPages <= 1) return
+    if (paginationProps?.currentPage !== paginationProps?.totalPages) {
+      handleChangePage(paginationProps?.currentPage)
+    } else {
+      handleChangePage(paginationProps?.currentPage - 1)
+    }
+  }, [campaignList?.campaigns, paginationProps])
+
   useEffect(() => {
     if (!isUseQuery || !paginationProps?.currentPage || !paginationProps?.pageSize || !paginationProps?.totalPages) return
     addQueryToUrl({