ordering-components-external 13.2.8 → 13.2.10

package/_modules/components/BusinessReviews/index.js

@@ -75,7 +75,7 @@ var BusinessReviews = exports.BusinessReviews = function BusinessReviews(props)
   };
   var onChangeReview = function onChangeReview(text) {
     var reviews = text !== '' ? reviewsList.filter(function (review) {
-      return review.comment.toLowerCase().includes(text === null || text === void 0 ? void 0 : text.toLowerCase());
+      return review.comment && review.comment.toLowerCase().includes(text === null || text === void 0 ? void 0 : text.toLowerCase());
     }) : reviewsList;
     setBusinessReviewsList(_objectSpread(_objectSpread({}, businessReviewsList), {}, {
       loading: false,
@@ -159,9 +159,7 @@ var BusinessReviews = exports.BusinessReviews = function BusinessReviews(props)
   }, []);
   (0, _react.useEffect)(function () {
     if (!(reviews !== null && reviews !== void 0 && reviews.length)) return;
-    var reviewsListing = sortReviews(reviews.filter(function (r) {
-      return r.comment;
-    }));
+    var reviewsListing = sortReviews(reviews);
     if (!searchValue) {
       setBusinessReviewsList(_objectSpread(_objectSpread({}, businessReviewsList), {}, {
         reviews: reviewsListing,
@@ -170,7 +168,7 @@ var BusinessReviews = exports.BusinessReviews = function BusinessReviews(props)
     } else {
       setBusinessReviewsList(_objectSpread(_objectSpread({}, businessReviewsList), {}, {
         reviews: reviewsListing.filter(function (item) {
-          return item.comment.toLowerCase().includes(searchValue.toLowerCase());
+          return item.comment && item.comment.toLowerCase().includes(searchValue.toLowerCase());
         }),
         loading: false
       }));

package/_modules/components/MapView/index.js

@@ -62,12 +62,11 @@ var MapView = exports.MapView = function MapView(props) {
     setAlertState = _useState10[1];
   var getBusinessLocations = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var markerGroupsObject, customerMarkerGroupsObject, options, _yield$ordering$setAc, _yield$ordering$setAc2, result, error;
+      var options, _yield$ordering$setAc, _yield$ordering$setAc2, result, error, markerGroupsObject, customerMarkerGroupsObject;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            markerGroupsObject = {};
-            customerMarkerGroupsObject = {};
+            _context.prev = 0;
             setIsLoadingBusinessMakers(true);
             options = {
               query: {
@@ -77,31 +76,45 @@ var MapView = exports.MapView = function MapView(props) {
                 }]
               }
             };
-            _context.next = 6;
+            _context.next = 5;
             return ordering.setAccessToken(session.token).orders().asDashboard().get(options);
-          case 6:
+          case 5:
             _yield$ordering$setAc = _context.sent;
             _yield$ordering$setAc2 = _yield$ordering$setAc.content;
             result = _yield$ordering$setAc2.result;
             error = _yield$ordering$setAc2.error;
-            if (!error) {
-              result.map(function (order) {
-                markerGroupsObject[order === null || order === void 0 ? void 0 : order.business_id] = markerGroupsObject !== null && markerGroupsObject !== void 0 && markerGroupsObject[order === null || order === void 0 ? void 0 : order.business_id] ? [].concat(_toConsumableArray(markerGroupsObject[order === null || order === void 0 ? void 0 : order.business_id]), [order]) : [order];
-                customerMarkerGroupsObject[order === null || order === void 0 ? void 0 : order.customer_id] = customerMarkerGroupsObject !== null && customerMarkerGroupsObject !== void 0 && customerMarkerGroupsObject[order === null || order === void 0 ? void 0 : order.customer_id] ? [].concat(_toConsumableArray(customerMarkerGroupsObject[order === null || order === void 0 ? void 0 : order.customer_id]), [order]) : [order];
-              });
-              setMarkerGroups(markerGroupsObject);
-              setCustomerMarkerGroups(customerMarkerGroupsObject);
-              setIsLoadingBusinessMakers(false);
-              setBusinessMarkers(result);
-            } else {
+            if (error) {
               setAlertState(result);
-              setIsLoadingBusinessMakers(false);
             }
-          case 11:
+            markerGroupsObject = result.reduce(function (acc, order) {
+              acc[order.business_id] = acc[order.business_id] ? [].concat(_toConsumableArray(acc[order.business_id]), [order]) : [order];
+              return acc;
+            }, {});
+            customerMarkerGroupsObject = result.reduce(function (acc, order) {
+              acc[order.customer_id] = acc[order.customer_id] ? [].concat(_toConsumableArray(acc[order.customer_id]), [order]) : [order];
+              return acc;
+            }, {});
+            setMarkerGroups(markerGroupsObject);
+            setCustomerMarkerGroups(customerMarkerGroupsObject);
+            setBusinessMarkers(result);
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](0);
+            setAlertState({
+              open: true,
+              content: [_context.t0.message]
+            });
+          case 20:
+            _context.prev = 20;
+            setIsLoadingBusinessMakers(false);
+            return _context.finish(20);
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[0, 17, 20, 23]]);
     }));
     return function getBusinessLocations() {
       return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.8",
+  "version": "13.2.10",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/BusinessReviews/index.js

@@ -11,7 +11,7 @@ export const BusinessReviews = (props) => {
 
   const [ordering] = useApi()
   const requestsState = {}
-  const [searchValue, setSearchValue] = useState(null);
+  const [searchValue, setSearchValue] = useState(null)
 
   /**
    * businessReviewsList, this must be contain a reviews, loading and error to send UIComponent
@@ -40,7 +40,7 @@ export const BusinessReviews = (props) => {
 
   const onChangeReview = (text) => {
     const reviews = text !== ''
-      ? reviewsList.filter(review => review.comment.toLowerCase().includes(text?.toLowerCase()))
+      ? reviewsList.filter(review => review.comment && review.comment.toLowerCase().includes(text?.toLowerCase()))
       : reviewsList
     setBusinessReviewsList({
       ...businessReviewsList,
@@ -111,7 +111,7 @@ export const BusinessReviews = (props) => {
 
   useEffect(() => {
     if (!reviews?.length) return
-    const reviewsListing = sortReviews(reviews.filter(r => r.comment))
+    const reviewsListing = sortReviews(reviews)
     if (!searchValue) {
       setBusinessReviewsList({
         ...businessReviewsList,
@@ -121,11 +121,11 @@ export const BusinessReviews = (props) => {
     } else {
       setBusinessReviewsList({
         ...businessReviewsList,
-        reviews: reviewsListing.filter(item => item.comment.toLowerCase().includes(searchValue.toLowerCase())),
+        reviews: reviewsListing.filter(item => item.comment && item.comment.toLowerCase().includes(searchValue.toLowerCase())),
         loading: false
       })
     }
-  }, [searchValue]);
+  }, [searchValue])
 
   return (
     <>

package/src/components/MapView/index.js

@@ -16,31 +16,37 @@ export const MapView = (props) => {
   const [alertState, setAlertState] = useState({ open: false, content: [], key: null })
 
   const getBusinessLocations = async () => {
-    const markerGroupsObject = {}
-    const customerMarkerGroupsObject = {}
-    setIsLoadingBusinessMakers(true)
-    const options = {
-      query: {
-        where: [
-          {
-            attribute: 'status',
-            value: [0, 13, 7, 4, 3, 8, 9, 14, 18, 19, 20, 21, 23, 26]
-          }
-        ]
+    try {
+      setIsLoadingBusinessMakers(true)
+      const options = {
+        query: {
+          where: [
+            {
+              attribute: 'status',
+              value: [0, 13, 7, 4, 3, 8, 9, 14, 18, 19, 20, 21, 23, 26]
+            }
+          ]
+        }
       }
-    }
-    const { content: { result, error } } = await ordering.setAccessToken(session.token).orders().asDashboard().get(options)
-    if (!error) {
-      result.map(order => {
-        markerGroupsObject[order?.business_id] = markerGroupsObject?.[order?.business_id] ? [...markerGroupsObject[order?.business_id], order] : [order]
-        customerMarkerGroupsObject[order?.customer_id] = customerMarkerGroupsObject?.[order?.customer_id] ? [...customerMarkerGroupsObject[order?.customer_id], order] : [order]
-      })
+      const { content: { result, error } } = await ordering.setAccessToken(session.token).orders().asDashboard().get(options)
+      if (error) {
+        setAlertState(result)
+      }
+      const markerGroupsObject = result.reduce((acc, order) => {
+        acc[order.business_id] = acc[order.business_id] ? [...acc[order.business_id], order] : [order]
+        return acc
+      }, {})
+      const customerMarkerGroupsObject = result.reduce((acc, order) => {
+        acc[order.customer_id] = acc[order.customer_id] ? [...acc[order.customer_id], order] : [order]
+        return acc
+      }, {})
+
       setMarkerGroups(markerGroupsObject)
       setCustomerMarkerGroups(customerMarkerGroupsObject)
-      setIsLoadingBusinessMakers(false)
       setBusinessMarkers(result)
-    } else {
-      setAlertState(result)
+    } catch (error) {
+      setAlertState({ open: true, content: [error.message] })
+    } finally {
       setIsLoadingBusinessMakers(false)
     }
   }