ordering-ui-admin-external 1.22.1 → 1.22.3

package/_modules/components/Delivery/DriversGroupLogs/index.js

@@ -119,7 +119,7 @@ var DriversGroupLogsUI = function DriversGroupLogsUI(props) {
   }, [logsList.logs, paginationProps]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.DriversGroupLogsContainer, {
     disabled: actionDisabled
-  }, /*#__PURE__*/_react.default.createElement(_styles.TableWrapper, null, logsList.loading || logsList.logs.length > 0 ? /*#__PURE__*/_react.default.createElement(_styles.Table, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('CONTROL_PANEL_USERS', 'Users')), /*#__PURE__*/_react.default.createElement("th", null, t('DETAILS', 'Details')), /*#__PURE__*/_react.default.createElement("th", null, t('EXPORT_DATE', 'Date')), /*#__PURE__*/_react.default.createElement("th", null, t('USER_AGENT', 'User agent')))), logsList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
+  }, /*#__PURE__*/_react.default.createElement(_styles.TableWrapper, null, logsList.loading || logsList.logs.length > 0 ? /*#__PURE__*/_react.default.createElement(_styles.Table, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('CONTROL_PANEL_USERS', 'Users')), /*#__PURE__*/_react.default.createElement("th", null, t('EVENTS_TYPE', 'Events type')), /*#__PURE__*/_react.default.createElement("th", null, t('DETAILS', 'Details')), /*#__PURE__*/_react.default.createElement("th", null, t('EXPORT_DATE', 'Date')), /*#__PURE__*/_react.default.createElement("th", null, t('USER_AGENT', 'User agent')))), logsList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement("tbody", {
       key: i
     }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.UserInfoContainer, null, /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
@@ -137,7 +137,7 @@ var DriversGroupLogsUI = function DriversGroupLogsUI(props) {
     var _log$user, _log$user2, _log$user3;
     return /*#__PURE__*/_react.default.createElement("tbody", {
       key: log.id
-    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.UserInfoContainer, null, /*#__PURE__*/_react.default.createElement("p", null, log === null || log === void 0 ? void 0 : (_log$user = log.user) === null || _log$user === void 0 ? void 0 : _log$user.name, " ", log === null || log === void 0 ? void 0 : (_log$user2 = log.user) === null || _log$user2 === void 0 ? void 0 : _log$user2.lastname), /*#__PURE__*/_react.default.createElement("p", null, log === null || log === void 0 ? void 0 : (_log$user3 = log.user) === null || _log$user3 === void 0 ? void 0 : _log$user3.email))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DataListTable, null, (log === null || log === void 0 ? void 0 : log.data) && (_typeof(log === null || log === void 0 ? void 0 : log.data) === 'object' ? Object.values(log === null || log === void 0 ? void 0 : log.data) : log === null || log === void 0 ? void 0 : log.data).map(function (item, i) {
+    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.UserInfoContainer, null, /*#__PURE__*/_react.default.createElement("p", null, log === null || log === void 0 ? void 0 : (_log$user = log.user) === null || _log$user === void 0 ? void 0 : _log$user.name, " ", log === null || log === void 0 ? void 0 : (_log$user2 = log.user) === null || _log$user2 === void 0 ? void 0 : _log$user2.lastname), /*#__PURE__*/_react.default.createElement("p", null, log === null || log === void 0 ? void 0 : (_log$user3 = log.user) === null || _log$user3 === void 0 ? void 0 : _log$user3.email))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.EventTypeContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t(log === null || log === void 0 ? void 0 : log.event)))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DataListTable, null, (log === null || log === void 0 ? void 0 : log.data) && (_typeof(log === null || log === void 0 ? void 0 : log.data) === 'object' ? Object.values(log === null || log === void 0 ? void 0 : log.data) : log === null || log === void 0 ? void 0 : log.data).map(function (item, i) {
       return /*#__PURE__*/_react.default.createElement("tbody", {
         key: i
       }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, getAttributeName(item === null || item === void 0 ? void 0 : item.attribute)), /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.new) !== 'undefined' ? "".concat(item === null || item === void 0 ? void 0 : item.new) : (item === null || item === void 0 ? void 0 : item.added.length) > 0 ? item === null || item === void 0 ? void 0 : item.added.toString() : t('NONE', 'None')), /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.old) !== 'undefined' ? "".concat(item === null || item === void 0 ? void 0 : item.old) : (item === null || item === void 0 ? void 0 : item.removed.length) > 0 ? item === null || item === void 0 ? void 0 : item.removed.toString() : t('NONE', 'None'))));

package/_modules/components/Delivery/DriversGroupLogs/styles.js

@@ -4,9 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperPagination = exports.UserInfoContainer = exports.TableWrapper = exports.Table = exports.NoData = exports.DriversGroupLogsContainer = exports.DateTimeWrapper = exports.DataListTable = void 0;
+exports.WrapperPagination = exports.UserInfoContainer = exports.TableWrapper = exports.Table = exports.NoData = exports.EventTypeContainer = exports.DriversGroupLogsContainer = exports.DateTimeWrapper = exports.DataListTable = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -17,7 +17,7 @@ var DriversGroupLogsContainer = _styledComponents.default.div(_templateObject ||
 exports.DriversGroupLogsContainer = DriversGroupLogsContainer;
 var TableWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  overflow: auto;\n  height: 100%;\n"])));
 exports.TableWrapper = TableWrapper;
-var Table = _styledComponents.default.table(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 100%;\n  min-width: 1000px;\n  color: ", ";\n\n  thead {\n    tr {\n      border-bottom: solid 1px ", ";\n      th {\n        padding: 13px 0;\n        font-size: 12px;\n        &:first-child {\n          width: 10%;\n          ", "\n          box-sizing: border-box;\n        }\n        &:nth-child(2) {\n          width: 35%;\n          padding-left: 15px;\n          padding-right: 15px;\n          box-sizing: border-box;\n        }\n        &:nth-child(3) {\n          ", "\n          box-sizing: border-box;\n        }\n      }\n    }\n  }\n\n  > tbody {\n    border-bottom: 1px solid ", ";\n    td {\n      padding: 13px 0;\n      font-size: 12px;\n      &:first-child {\n        width: 10%;\n        ", "\n        box-sizing: border-box;\n      }\n      &:nth-child(2) {\n        width: 35%;\n      }\n      &:nth-child(3) {\n        ", "\n        box-sizing: border-box;\n      }\n    }\n  }\n"])), function (props) {
+var Table = _styledComponents.default.table(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 100%;\n  min-width: 1000px;\n  color: ", ";\n\n  thead {\n    tr {\n      border-bottom: solid 1px ", ";\n      th {\n        padding: 13px 0;\n        font-size: 12px;\n        &:first-child {\n          width: 10%;\n          ", "\n          box-sizing: border-box;\n        }\n        &:nth-child(3) {\n          width: 35%\n          padding-left: 15px;\n          padding-right: 15px;\n          box-sizing: border-box;\n        }\n        &:nth-child(4) {\n          ", "\n          box-sizing: border-box;\n        }\n      }\n    }\n  }\n\n  > tbody {\n    border-bottom: 1px solid ", ";\n    td {\n      padding: 13px 0;\n      font-size: 12px;\n      &:first-child {\n        width: 10%;\n        ", "\n        box-sizing: border-box;\n      }\n      &:nth-child(3) {\n        width: 35%;\n      }\n      &:nth-child(4) {\n        ", "\n        box-sizing: border-box;\n      }\n    }\n  }\n"])), function (props) {
   var _props$theme$colors;
   return (_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.headingColor;
 }, function (props) {
@@ -65,4 +65,13 @@ var DataListTable = _styledComponents.default.table(_templateObject19 || (_templ
   var _props$theme6;
   return (_props$theme6 = props.theme) !== null && _props$theme6 !== void 0 && _props$theme6.rtl ? (0, _styledComponents.css)(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n        padding-left: 15px;\n      "]))) : (0, _styledComponents.css)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n        padding-right: 15px;\n      "])));
 });
-exports.DataListTable = DataListTable;
+exports.DataListTable = DataListTable;
+var EventTypeContainer = _styledComponents.default.div(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n  white-space: nowrap;\n  font-size: 12px;\n  min-height: 36px;\n  display: flex;\n  align-items: center;\n  p{\n    margin-bottom: 0px;\n  }\n  ", "\n"])), function (props) {
+  var _props$theme7;
+  return (_props$theme7 = props.theme) !== null && _props$theme7 !== void 0 && _props$theme7.rtl ? (0, _styledComponents.css)(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["\n    padding-right: 15px;\n    margin-right: 15px;\n    border-right: 1px solid ", ";\n  "])), function (props) {
+    return props.theme.colors.borderColor;
+  }) : (0, _styledComponents.css)(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n    padding-left: 15px;\n    margin-left: 15px;\n    border-left: 1px solid ", ";\n  "])), function (props) {
+    return props.theme.colors.borderColor;
+  });
+});
+exports.EventTypeContainer = EventTypeContainer;

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

@@ -29,6 +29,7 @@ var OrdersDashboardList = function OrdersDashboardList(props) {
     isSearchByCustomerEmail: true,
     isSearchByCustomerPhone: true,
     isSearchByBusinessName: true,
+    isSearchByDriverName: true,
     driverId: props.driverId
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isMessagesView ? /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.DashboardOrdersList, _extends({

package/package.json

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

package/src/components/Delivery/DriversGroupLogs/index.js

@@ -11,7 +11,8 @@ import {
   DateTimeWrapper,
   NoData,
   WrapperPagination,
-  DataListTable
+  DataListTable,
+  EventTypeContainer
 } from './styles'
 
 export const DriversGroupLogsUI = (props) => {
@@ -82,6 +83,7 @@ export const DriversGroupLogsUI = (props) => {
               <thead>
                 <tr>
                   <th>{t('CONTROL_PANEL_USERS', 'Users')}</th>
+                  <th>{t('EVENTS_TYPE', 'Events type')}</th>
                   <th>{t('DETAILS', 'Details')}</th>
                   <th>{t('EXPORT_DATE', 'Date')}</th>
                   <th>{t('USER_AGENT', 'User agent')}</th>
@@ -129,6 +131,11 @@ export const DriversGroupLogsUI = (props) => {
                           <p>{log?.user?.email}</p>
                         </UserInfoContainer>
                       </td>
+                      <td>
+                        <EventTypeContainer>
+                          <p>{t(log?.event)}</p>
+                        </EventTypeContainer>
+                      </td>
                       <td>
                         <DataListTable>
                           {log?.data && (typeof log?.data === 'object' ? Object.values(log?.data) : log?.data).map((item, i) => (

package/src/components/Delivery/DriversGroupLogs/styles.js

@@ -33,13 +33,13 @@ export const Table = styled.table`
           `}
           box-sizing: border-box;
         }
-        &:nth-child(2) {
-          width: 35%;
+        &:nth-child(3) {
+          width: 35%
           padding-left: 15px;
           padding-right: 15px;
           box-sizing: border-box;
         }
-        &:nth-child(3) {
+        &:nth-child(4) {
           ${props => props.theme?.rtl ? css`
             padding-right: 15px;
           ` : css`
@@ -65,10 +65,10 @@ export const Table = styled.table`
         `}
         box-sizing: border-box;
       }
-      &:nth-child(2) {
+      &:nth-child(3) {
         width: 35%;
       }
-      &:nth-child(3) {
+      &:nth-child(4) {
         ${props => props.theme?.rtl ? css`
           padding-right: 15px;
         ` : css`
@@ -148,3 +148,23 @@ export const DataListTable = styled.table`
     }
   }
 `
+
+export const EventTypeContainer = styled.div`
+  white-space: nowrap;
+  font-size: 12px;
+  min-height: 36px;
+  display: flex;
+  align-items: center;
+  p{
+    margin-bottom: 0px;
+  }
+  ${props => props.theme?.rtl ? css`
+    padding-right: 15px;
+    margin-right: 15px;
+    border-right: 1px solid ${props => props.theme.colors.borderColor};
+  ` : css`
+    padding-left: 15px;
+    margin-left: 15px;
+    border-left: 1px solid ${props => props.theme.colors.borderColor};
+  `}
+`

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

@@ -22,6 +22,7 @@ export const OrdersDashboardList = (props) => {
     isSearchByCustomerEmail: true,
     isSearchByCustomerPhone: true,
     isSearchByBusinessName: true,
+    isSearchByDriverName: true,
     driverId: props.driverId
   }