ordering-ui-admin-external 1.21.0 → 1.21.2

package/_modules/components/Orders/OrdersListing/index.js

@@ -54,7 +54,8 @@ var OrdersListing = function OrdersListing(props) {
     allowColumns = props.allowColumns,
     setAllowColumns = props.setAllowColumns,
     handleDrop = props.handleDrop,
-    isDelivery = props.isDelivery;
+    isDelivery = props.isDelivery,
+    saveUserSettings = props.saveUserSettings;
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -118,7 +119,8 @@ var OrdersListing = function OrdersListing(props) {
     groupStatus: groupStatus,
     allowColumns: allowColumns,
     setAllowColumns: setAllowColumns,
-    handleDrop: handleDrop
+    handleDrop: handleDrop,
+    saveUserSettings: saveUserSettings
   }) : /*#__PURE__*/_react.default.createElement(_OrdersCards.OrdersCards, {
     isMessagesView: isMessagesView,
     orderList: orderList,

package/_modules/components/Orders/OrdersTable/index.js

@@ -52,7 +52,8 @@ var OrdersTable = function OrdersTable(props) {
     groupStatus = props.groupStatus,
     allowColumns = props.allowColumns,
     setAllowColumns = props.setAllowColumns,
-    handleDrop = props.handleDrop;
+    handleDrop = props.handleDrop,
+    saveUserSettings = props.saveUserSettings;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -273,11 +274,14 @@ var OrdersTable = function OrdersTable(props) {
     return objectStatus && objectStatus;
   };
   var handleChangeAllowColumns = function handleChangeAllowColumns(type) {
-    console.log(type, 'type', allowColumns);
     var _column = allowColumns[type];
-    setAllowColumns(_objectSpread(_objectSpread({}, allowColumns), {}, _defineProperty({}, type, _objectSpread(_objectSpread({}, _column), {}, {
+    var updatedAllowColumns = _objectSpread(_objectSpread({}, allowColumns), {}, _defineProperty({}, type, _objectSpread(_objectSpread({}, _column), {}, {
       visable: !(_column !== null && _column !== void 0 && _column.visable)
-    }))));
+    })));
+    setAllowColumns(updatedAllowColumns);
+    if (type === 'externalId') {
+      saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)));
+    }
   };
   var handleClickOrder = function handleClickOrder(order, e) {
     var inValid = !isSelectedOrders && (e.target.closest('.orderCheckBox') || e.target.closest('.driverInfo') || e.target.closest('.orderStatusTitle'));

package/_modules/components/Orders/OrdersTable/styles.js

@@ -45,7 +45,7 @@ var Table = _styledComponents.default.table(_templateObject5 || (_templateObject
   return (_props$theme$colors4 = props.theme.colors) === null || _props$theme$colors4 === void 0 ? void 0 : _props$theme$colors4.headingColor;
 });
 exports.Table = Table;
-var OrderTbody = _styledComponents.default.tbody(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  border-bottom: 1px solid ", ";\n  cursor: pointer;\n\n  &[data-status=\"delayed\"] {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  }\n  &[data-status=\"at_risk\"] {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  }\n  &:hover {\n    background-color: ", ";\n  }\n  &.active {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  }\n"])), function (props) {
+var OrderTbody = _styledComponents.default.tbody(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  border-bottom: 1px solid ", ";\n  cursor: pointer;\n\n  /* &[data-status=\"delayed\"] {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  }\n  &[data-status=\"at_risk\"] {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  } */\n  &:hover {\n    background-color: ", ";\n  }\n  &.active {\n    background-color: ", ";\n    td {\n      border-top: 1px solid ", " !important;\n      border-bottom: 1px solid ", " !important;\n    }\n  }\n"])), function (props) {
   return props.theme.colors.borderColor;
 }, function (props) {
   return props.theme.colors.danger100;

package/package.json

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

package/src/components/Orders/OrdersListing/index.js

@@ -47,7 +47,8 @@ export const OrdersListing = (props) => {
     allowColumns,
     setAllowColumns,
     handleDrop,
-    isDelivery
+    isDelivery,
+    saveUserSettings
   } = props
 
   const theme = useTheme()
@@ -130,6 +131,7 @@ export const OrdersListing = (props) => {
                   allowColumns={allowColumns}
                   setAllowColumns={setAllowColumns}
                   handleDrop={handleDrop}
+                  saveUserSettings={saveUserSettings}
                 />
               ) : (
                 <OrdersCards

package/src/components/Orders/OrdersTable/index.js

@@ -53,7 +53,8 @@ export const OrdersTable = (props) => {
     groupStatus,
     allowColumns,
     setAllowColumns,
-    handleDrop
+    handleDrop,
+    saveUserSettings
   } = props
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -232,12 +233,15 @@ export const OrdersTable = (props) => {
   }
 
   const handleChangeAllowColumns = (type) => {
-    console.log(type, 'type', allowColumns)
     const _column = allowColumns[type]
-    setAllowColumns({
+    const updatedAllowColumns = {
       ...allowColumns,
       [type]: { ..._column, visable: !_column?.visable }
-    })
+    }
+    setAllowColumns(updatedAllowColumns)
+    if (type === 'externalId') {
+      saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)))
+    }
   }
 
   const handleClickOrder = (order, e) => {

package/src/components/Orders/OrdersTable/styles.js

@@ -102,7 +102,7 @@ export const OrderTbody = styled.tbody`
   border-bottom: 1px solid ${props => props.theme.colors.borderColor};
   cursor: pointer;
 
-  &[data-status="delayed"] {
+  /* &[data-status="delayed"] {
     background-color: ${props => props.theme.colors.danger100};
     td {
       border-top: 1px solid ${props => props.theme.colors.danger} !important;
@@ -115,7 +115,7 @@ export const OrderTbody = styled.tbody`
       border-top: 1px solid ${props => props.theme.colors.warning} !important;
       border-bottom: 1px solid ${props => props.theme.colors.warning} !important;
     }
-  }
+  } */
   &:hover {
     background-color: ${props => props.theme.colors.lightPrimary};
   }