ordering-ui-admin-external 1.43.97 → 1.43.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/_bundles/{ordering-ui-admin.375da7562a308d9a2e99.js → ordering-ui-admin.332418468be0f49b4414.js} +2 -2
  2. package/_modules/components/Delivery/DriversGroupLogs/index.js +7 -3
  3. package/_modules/components/Delivery/DriversGroupLogs/styles.js +2 -2
  4. package/package.json +1 -1
  5. package/src/components/Delivery/DriversGroupLogs/index.js +5 -5
  6. package/src/components/Delivery/DriversGroupLogs/styles.js +2 -0
  7. /package/_bundles/{ordering-ui-admin.375da7562a308d9a2e99.js.LICENSE.txt → ordering-ui-admin.332418468be0f49b4414.js.LICENSE.txt} +0 -0
package/_modules/components/Delivery/DriversGroupLogs/index.js CHANGED
@@ -132,7 +132,9 @@ var DriversGroupLogsUI = exports.DriversGroupLogsUI = function DriversGroupLogsU
132
132
  var _item$added, _item$added2;
133
133
  return /*#__PURE__*/_react.default.createElement("tbody", {
134
134
  key: i
135
- }, /*#__PURE__*/_react.default.createElement("tr", null, item.attribute !== 'schedule' ? /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.new) !== 'undefined' && (item === null || item === void 0 ? void 0 : item.new) !== null ? "".concat(item === null || item === void 0 ? void 0 : item.new) : (item === null || item === void 0 || (_item$added = item.added) === null || _item$added === void 0 ? void 0 : _item$added.length) > 0 ? item === null || item === void 0 || (_item$added2 = item.added) === null || _item$added2 === void 0 ? void 0 : _item$added2.toString() : t('NONE', 'None')) : /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.SeeChanges, {
135
+ }, /*#__PURE__*/_react.default.createElement("tr", null, (item === null || item === void 0 ? void 0 : item.attribute) !== 'schedule' ? /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.new) !== 'undefined' && (item === null || item === void 0 ? void 0 : item.new) !== null ? (item === null || item === void 0 ? void 0 : item.attribute) === 'last_available_at' ? parseDate(item === null || item === void 0 ? void 0 : item.new, {
136
+ utc: true
137
+ }) : "".concat(item === null || item === void 0 ? void 0 : item.new) : (item === null || item === void 0 || (_item$added = item.added) === null || _item$added === void 0 ? void 0 : _item$added.length) > 0 ? item === null || item === void 0 || (_item$added2 = item.added) === null || _item$added2 === void 0 ? void 0 : _item$added2.toString() : t('NONE', 'None')) : /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.SeeChanges, {
136
138
  onClick: function onClick() {
137
139
  return scheduleModalData(item, 'new');
138
140
  }
@@ -141,13 +143,15 @@ var DriversGroupLogsUI = exports.DriversGroupLogsUI = function DriversGroupLogsU
141
143
  var _item$removed, _item$removed2;
142
144
  return /*#__PURE__*/_react.default.createElement("tbody", {
143
145
  key: i
144
- }, /*#__PURE__*/_react.default.createElement("tr", null, item.attribute !== 'schedule' ? /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.old) !== 'undefined' && (item === null || item === void 0 ? void 0 : item.old) !== null ? "".concat(item === null || item === void 0 ? void 0 : item.old) : (item === null || item === void 0 || (_item$removed = item.removed) === null || _item$removed === void 0 ? void 0 : _item$removed.length) > 0 ? item === null || item === void 0 || (_item$removed2 = item.removed) === null || _item$removed2 === void 0 ? void 0 : _item$removed2.toString() : t('NONE', 'None')) : /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.SeeChanges, {
146
+ }, /*#__PURE__*/_react.default.createElement("tr", null, (item === null || item === void 0 ? void 0 : item.attribute) !== 'schedule' ? /*#__PURE__*/_react.default.createElement("td", null, typeof (item === null || item === void 0 ? void 0 : item.old) !== 'undefined' && (item === null || item === void 0 ? void 0 : item.old) !== null ? (item === null || item === void 0 ? void 0 : item.attribute) === 'last_available_at' ? parseDate(item === null || item === void 0 ? void 0 : item.old, {
147
+ utc: true
148
+ }) : "".concat(item === null || item === void 0 ? void 0 : item.old) : (item === null || item === void 0 || (_item$removed = item.removed) === null || _item$removed === void 0 ? void 0 : _item$removed.length) > 0 ? item === null || item === void 0 || (_item$removed2 = item.removed) === null || _item$removed2 === void 0 ? void 0 : _item$removed2.toString() : t('NONE', 'None')) : /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.SeeChanges, {
145
149
  onClick: function onClick() {
146
150
  return scheduleModalData(item, 'old');
147
151
  }
148
152
  }, t('SEE_CHANGES', 'See changes')))));
149
153
  }))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DateTimeWrapper, null, parseDate(log.created_at, {
150
- utc: false
154
+ utc: true
151
155
  }))), /*#__PURE__*/_react.default.createElement("td", null, log === null || log === void 0 ? void 0 : log.user_agent)));
152
156
  }))) : /*#__PURE__*/_react.default.createElement(_styles.NoData, null, t('NO_DATA', 'No Data'))), (logsList === null || logsList === void 0 ? void 0 : logsList.logs.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperPagination, null, /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
153
157
  isHidePagecontrol: true,
package/_modules/components/Delivery/DriversGroupLogs/styles.js CHANGED
@@ -45,9 +45,9 @@ var UserInfoContainer = exports.UserInfoContainer = _styledComponents.default.di
45
45
  });
46
46
  var DateTimeWrapper = exports.DateTimeWrapper = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n white-space: nowrap;\n font-size: 12px;\n min-height: 36px;\n display: flex;\n align-items: center;\n\n ", "\n"])), function (props) {
47
47
  var _props$theme5;
48
- return (_props$theme5 = props.theme) !== null && _props$theme5 !== void 0 && _props$theme5.rtl ? (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n padding-left: 15px;\n margin-left: 15px;\n border-left: 1px solid ", ";\n "])), function (props) {
48
+ return (_props$theme5 = props.theme) !== null && _props$theme5 !== void 0 && _props$theme5.rtl ? (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n padding-right: 15px;\n padding-left: 15px;\n margin-left: 15px;\n border-left: 1px solid ", ";\n "])), function (props) {
49
49
  return props.theme.colors.borderColor;
50
- }) : (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n padding-right: 15px;\n margin-right: 15px;\n border-right: 1px solid ", ";\n "])), function (props) {
50
+ }) : (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n padding-left: 15px;\n padding-right: 15px;\n margin-right: 15px;\n border-right: 1px solid ", ";\n "])), function (props) {
51
51
  return props.theme.colors.borderColor;
52
52
  });
53
53
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.43.97",
3
+ "version": "1.43.98",
4
4
  "description": "Ordering UI Admin Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
package/src/components/Delivery/DriversGroupLogs/index.js CHANGED
@@ -190,12 +190,12 @@ export const DriversGroupLogsUI = (props) => {
190
190
  {log?.data && getValidLogData(log?.data).map((item, i) => (
191
191
  <tbody key={i}>
192
192
  <tr>
193
- {item.attribute !== 'schedule'
193
+ {item?.attribute !== 'schedule'
194
194
  ? (
195
195
  <td>
196
196
  {
197
197
  (typeof item?.new !== 'undefined' && item?.new !== null)
198
- ? `${item?.new}`
198
+ ? item?.attribute === 'last_available_at' ? parseDate(item?.new, { utc: true }) : `${item?.new}`
199
199
  : item?.added?.length > 0 ? item?.added?.toString() : t('NONE', 'None')
200
200
  }
201
201
  </td>
@@ -215,12 +215,12 @@ export const DriversGroupLogsUI = (props) => {
215
215
  {log?.data && getValidLogData(log?.data).map((item, i) => (
216
216
  <tbody key={i}>
217
217
  <tr>
218
- {item.attribute !== 'schedule'
218
+ {item?.attribute !== 'schedule'
219
219
  ? (
220
220
  <td>
221
221
  {
222
222
  (typeof item?.old !== 'undefined' && item?.old !== null)
223
- ? `${item?.old}`
223
+ ? item?.attribute === 'last_available_at' ? parseDate(item?.old, { utc: true }) : `${item?.old}`
224
224
  : item?.removed?.length > 0 ? item?.removed?.toString() : t('NONE', 'None')
225
225
  }
226
226
  </td>
@@ -237,7 +237,7 @@ export const DriversGroupLogsUI = (props) => {
237
237
  </td>
238
238
  <td>
239
239
  <DateTimeWrapper>
240
- {parseDate(log.created_at, { utc: false })}
240
+ {parseDate(log.created_at, { utc: true })}
241
241
  </DateTimeWrapper>
242
242
  </td>
243
243
  <td>
package/src/components/Delivery/DriversGroupLogs/styles.js CHANGED
@@ -108,10 +108,12 @@ export const DateTimeWrapper = styled.div`
108
108
  align-items: center;
109
109
 
110
110
  ${props => props.theme?.rtl ? css`
111
+ padding-right: 15px;
111
112
  padding-left: 15px;
112
113
  margin-left: 15px;
113
114
  border-left: 1px solid ${props => props.theme.colors.borderColor};
114
115
  ` : css`
116
+ padding-left: 15px;
115
117
  padding-right: 15px;
116
118
  margin-right: 15px;
117
119
  border-right: 1px solid ${props => props.theme.colors.borderColor};