ordering-ui-admin-external 1.45.26 → 1.45.27

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

@@ -81,10 +81,10 @@ var DriversAdvancedLogsUI = exports.DriversAdvancedLogsUI = function DriversAdva
     }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__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) || '').toUpperCase())))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DataListTable, null, (log === null || log === void 0 ? void 0 : log.data) && getValidLogData(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, JSON.stringify((0, _utils.getAttributeName)(item)))));
-    }))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DateTimeWrapper, null, parseDate(log.created_at, {
-      utc: false
-    })))));
+      }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, (0, _utils.getAttributeName)(item, {
+        parseDate: parseDate
+      }))));
+    }))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.DateTimeWrapper, null, parseDate(log.created_at)))));
   }))) : /*#__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, {
     isHidePagecontrol: true,
     currentPage: paginationProps.currentPage,

package/_modules/utils/index.js

@@ -937,7 +937,8 @@ var disableReasons = exports.disableReasons = function disableReasons() {
   };
   return disableReasonDictionary;
 };
-var getAttributeName = exports.getAttributeName = function getAttributeName(key) {
+var getAttributeName = exports.getAttributeName = function getAttributeName(key, _ref5) {
+  var parseDate = _ref5.parseDate;
   var _useLanguage5 = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage6 = _slicedToArray(_useLanguage5, 2),
     t = _useLanguage6[1];
@@ -1011,7 +1012,11 @@ var getAttributeName = exports.getAttributeName = function getAttributeName(key)
   if (found) {
     return found.content;
   } else {
-    return key;
+    if (parseDate && (0, _moment.default)(key).isValid()) {
+      return parseDate(key);
+    } else {
+      return key;
+    }
   }
 };
 var usePreventDoubleClick = exports.usePreventDoubleClick = function usePreventDoubleClick(_callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.45.26",
+  "version": "1.45.27",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {

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

@@ -111,7 +111,7 @@ export const DriversAdvancedLogsUI = (props) => {
                           {log?.data && getValidLogData(log?.data).map((item, i) => (
                             <tbody key={i}>
                               <tr>
-                                <td>{JSON.stringify(getAttributeName(item))}</td>
+                                <td>{getAttributeName(item, { parseDate })}</td>
                               </tr>
                             </tbody>
                           ))}
@@ -119,7 +119,7 @@ export const DriversAdvancedLogsUI = (props) => {
                       </td>
                       <td>
                         <DateTimeWrapper>
-                          {parseDate(log.created_at, { utc: false })}
+                          {parseDate(log.created_at)}
                         </DateTimeWrapper>
                       </td>
                     </tr>

package/src/utils/index.js

@@ -717,7 +717,7 @@ export const disableReasons = () => {
   return disableReasonDictionary
 }
 
-export const getAttributeName = (key) => {
+export const getAttributeName = (key, { parseDate }) => {
   const [, t] = useLanguage()
   const attributes = [
     { key: 'autoassign_amount_drivers', content: t('AUTO_ASSIGN_GROUP_ORDERS_TO_DRIVERS', 'Auto assign the order of group to this amount of drivers') },
@@ -743,10 +743,15 @@ export const getAttributeName = (key) => {
     { key: 'busy', content: t('BUSY', 'Busy') }
   ]
   const found = attributes.find(attribute => attribute.key === key)
+
   if (found) {
     return found.content
   } else {
-    return key
+    if (parseDate && moment(key).isValid()) {
+      return parseDate(key)
+    } else {
+      return key
+    }
   }
 }