ordering-ui-admin-external 1.42.7 → 1.42.8

package/_modules/components/Stores/BusinessProductList/index.js

@@ -166,6 +166,7 @@ var BusinessProductList = exports.BusinessProductList = function BusinessProduct
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (isLazyLoadProducts ? categoryState.products : currentProducts).sort(function (a, b) {
     return a.rank - b.rank;
   }).map(function (product, i) {
+    var _categorySelected$sub;
     return /*#__PURE__*/_react.default.createElement(_SingleBusinessProduct.SingleBusinessProduct, _extends({}, props, {
       key: "".concat(product === null || product === void 0 ? void 0 : product.id, "_").concat(i),
       productDetailsId: productDetailsId,
@@ -176,7 +177,11 @@ var BusinessProductList = exports.BusinessProductList = function BusinessProduct
       dataSelected: dataSelected,
       setDataSelected: setDataSelected,
       category: categoryState,
-      isLastProduct: currentProducts.length - 1 === i
+      isLastProduct: currentProducts.length - 1 === i,
+      hasSubcategories: categorySelected === null || categorySelected === void 0 || (_categorySelected$sub = categorySelected.subcategories) === null || _categorySelected$sub === void 0 ? void 0 : _categorySelected$sub.some(function (subcategory) {
+        var _subcategory$products;
+        return (subcategory === null || subcategory === void 0 || (_subcategory$products = subcategory.products) === null || _subcategory$products === void 0 ? void 0 : _subcategory$products.length) > 0;
+      })
     }));
   })))), /*#__PURE__*/_react.default.createElement(_styles2.ProductListBottom, null, !businessState.loading && (businessState === null || businessState === void 0 || (_businessState$busine2 = businessState.business) === null || _businessState$busine2 === void 0 || (_businessState$busine2 = _businessState$busine2.categories) === null || _businessState$busine2 === void 0 ? void 0 : _businessState$busine2.length) > 0 && categorySelected && /*#__PURE__*/_react.default.createElement(_styles2.AddProductBtnWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.LinkButton, {
     onClick: function onClick() {

package/_modules/components/Stores/SingleBusinessProduct/index.js

@@ -48,7 +48,8 @@ var SingleBusinessProductUI = function SingleBusinessProductUI(props) {
     handleDrop = props.handleDrop,
     handleDragEnd = props.handleDragEnd,
     isLastProduct = props.isLastProduct,
-    isProductsBottom = props.isProductsBottom;
+    isProductsBottom = props.isProductsBottom,
+    hasSubcategories = props.hasSubcategories;
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -171,7 +172,7 @@ var SingleBusinessProductUI = function SingleBusinessProductUI(props) {
     onDragEnd: function onDragEnd(e) {
       return handleDragEnd(e);
     },
-    className: "draggable-product",
+    className: !hasSubcategories ? 'draggable-product' : '',
     "data-index": product.id,
     isAccept: dataSelected && dataSelected === (product === null || product === void 0 || (_product$id = product.id) === null || _product$id === void 0 ? void 0 : _product$id.toString()),
     isBorderBottom: isProductsBottom && isLastProduct
@@ -179,12 +180,12 @@ var SingleBusinessProductUI = function SingleBusinessProductUI(props) {
     className: "products"
   }, /*#__PURE__*/_react.default.createElement(_styles.DragableContainer, {
     className: "product_info"
-  }, /*#__PURE__*/_react.default.createElement(_styles.DragImageWrapper, null, /*#__PURE__*/_react.default.createElement("img", {
+  }, /*#__PURE__*/_react.default.createElement(_styles.DragImageWrapper, null, !hasSubcategories && /*#__PURE__*/_react.default.createElement("img", {
     src: (_theme$images$icons = theme.images.icons) === null || _theme$images$icons === void 0 ? void 0 : _theme$images$icons.sixDots,
     alt: "six dots",
-    draggable: true,
+    draggable: !hasSubcategories,
     onDragStart: function onDragStart(e) {
-      return handleDragStart === null || handleDragStart === void 0 ? void 0 : handleDragStart(e, product.id);
+      return handleDragStart === null || handleDragStart === void 0 ? void 0 : handleDragStart(e, product);
     }
   })), /*#__PURE__*/_react.default.createElement(_styles.BusinessGeneralInfo, null, /*#__PURE__*/_react.default.createElement(_styles.ProductTypeImage, {
     onClick: function onClick() {

package/_modules/components/Stores/SingleBusinessProduct/styles.js

@@ -62,7 +62,7 @@ var UploadWrapper = exports.UploadWrapper = _styledComponents.default.div(_templ
   return props.theme.colors.lightGray;
 });
 var DragableContainer = exports.DragableContainer = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n"])));
-var DragImageWrapper = exports.DragImageWrapper = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  img {\n    ", "\n    &:hover {\n      cursor: grab;\n    }\n  }\n"])), function (props) {
+var DragImageWrapper = exports.DragImageWrapper = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  ", "\n\n  img {\n    &:hover {\n      cursor: grab;\n    }\n  }\n"])), function (props) {
   var _props$theme4;
   return (_props$theme4 = props.theme) !== null && _props$theme4 !== void 0 && _props$theme4.rtl ? (0, _styledComponents.css)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n      margin-left: 14px;\n    "]))) : (0, _styledComponents.css)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n      margin-right: 14px;\n    "])));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.42.7",
+  "version": "1.42.8",
   "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.42.4",
+    "ordering-components-admin-external": "1.42.5",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Stores/BusinessProductList/index.js

@@ -187,6 +187,7 @@ export const BusinessProductList = (props) => {
                         setDataSelected={setDataSelected}
                         category={categoryState}
                         isLastProduct={currentProducts.length - 1 === i}
+                        hasSubcategories={categorySelected?.subcategories?.some(subcategory => subcategory?.products?.length > 0)}
                       />
                     ))
                   }

package/src/components/Stores/SingleBusinessProduct/index.js

@@ -45,7 +45,8 @@ const SingleBusinessProductUI = (props) => {
     handleDrop,
     handleDragEnd,
     isLastProduct,
-    isProductsBottom
+    isProductsBottom,
+    hasSubcategories
   } = props
 
   const theme = useTheme()
@@ -189,7 +190,7 @@ const SingleBusinessProductUI = (props) => {
               onDragOver={e => handleDragOver?.(e, isLastProduct)}
               onDrop={e => handleDrop(e)}
               onDragEnd={e => handleDragEnd(e)}
-              className='draggable-product'
+              className={!hasSubcategories ? 'draggable-product' : ''}
               data-index={product.id}
               isAccept={dataSelected && dataSelected === product?.id?.toString()}
               isBorderBottom={isProductsBottom && isLastProduct}
@@ -199,12 +200,14 @@ const SingleBusinessProductUI = (props) => {
                   <td className='products'>
                     <DragableContainer className='product_info'>
                       <DragImageWrapper>
-                        <img
-                          src={theme.images.icons?.sixDots}
-                          alt='six dots'
-                          draggable
-                          onDragStart={e => handleDragStart?.(e, product.id)}
-                        />
+                        {!hasSubcategories && (
+                          <img
+                            src={theme.images.icons?.sixDots}
+                            alt='six dots'
+                            draggable={!hasSubcategories}
+                            onDragStart={e => handleDragStart?.(e, product)}
+                          />
+                        )}
                       </DragImageWrapper>
                       <BusinessGeneralInfo>
                         <ProductTypeImage

package/src/components/Stores/SingleBusinessProduct/styles.js

@@ -160,12 +160,13 @@ export const DragableContainer = styled.div`
 `
 
 export const DragImageWrapper = styled.div`
-  img {
-    ${props => props.theme?.rtl ? css`
+  ${props => props.theme?.rtl ? css`
       margin-left: 14px;
     ` : css`
       margin-right: 14px;
     `}
+
+  img {
     &:hover {
       cursor: grab;
     }