Fixed data import when record has date/time keys (#3092)

Co-authored-by: Stefano Ricci <[email protected]>

core/record/nodeValues.js

@@ -1,6 +1,6 @@
 import * as R from 'ramda'
 
-import { Objects } from '@openforis/arena-core'
+import { DateFormats, Dates, Objects } from '@openforis/arena-core'
 
 import * as StringUtils from '@core/stringUtils'
 import * as Survey from '@core/survey/survey'
@@ -37,12 +37,21 @@ const extractCategoryItemUuidFromValue = ({ survey, nodeDef, record, parentNode,
   return null
 }
 
+const dateTimeComparator =
+  ({ dateTimeFormats }) =>
+  ({ value, valueSearch }) => {
+    const toISODateTime = (val) => {
+      const fromFormat = dateTimeFormats.find((format) => Dates.isValidDateInFormat(val, format))
+      return fromFormat ? Dates.convertDate(val, fromFormat, DateFormats.datetimeStorage) : null
+    }
+    const dateTime = toISODateTime(value)
+    const dateTimeSearch = toISODateTime(valueSearch)
+    return dateTime === dateTimeSearch
+  }
+
 const valueComparatorByNodeDefType = {
   [NodeDef.nodeDefType.boolean]: singlePropValueEqualComparator,
   [NodeDef.nodeDefType.code]: ({ survey, nodeDef, record, parentNode, value, valueSearch, strict }) => {
-    if (value === valueSearch) return true
-    if (Objects.isEmpty(value) || Objects.isEmpty(valueSearch)) return false
-
     const itemUuid = extractCategoryItemUuidFromValue({ survey, nodeDef, record, parentNode, value, strict })
     const itemUuidSearch = extractCategoryItemUuidFromValue({
       survey,
@@ -55,7 +64,9 @@ const valueComparatorByNodeDefType = {
     return itemUuidSearch === itemUuid
   },
   [NodeDef.nodeDefType.coordinate]: ({ value, valueSearch }) => R.equals(value, valueSearch),
-  [NodeDef.nodeDefType.date]: singlePropValueEqualComparator,
+  [NodeDef.nodeDefType.date]: dateTimeComparator({
+    dateTimeFormats: [DateFormats.dateDisplay, DateFormats.dateStorage],
+  }),
   [NodeDef.nodeDefType.decimal]: singlePropValueEqualComparator,
   [NodeDef.nodeDefType.integer]: singlePropValueEqualComparator,
   [NodeDef.nodeDefType.taxon]: ({ value, valueSearch }) => {
@@ -65,7 +76,9 @@ const valueComparatorByNodeDefType = {
     return value[Node.valuePropsTaxon.taxonUuid] === valueSearch[Node.valuePropsTaxon.taxonUuid]
   },
   [NodeDef.nodeDefType.text]: singlePropValueEqualComparator,
-  [NodeDef.nodeDefType.time]: singlePropValueEqualComparator,
+  [NodeDef.nodeDefType.time]: dateTimeComparator({
+    dateTimeFormats: [DateFormats.timeStorage, 'HH:mm:ss'],
+  }),
 }
 
 /**
@@ -82,6 +95,9 @@ const valueComparatorByNodeDefType = {
  * @returns {boolean} - True if the values are equal.
  */
 const isValueEqual = ({ survey, nodeDef, value, valueSearch, record = null, parentNode = null, strict = false }) => {
+  if (value === valueSearch) return true
+  if (Objects.isEmpty(value) || Objects.isEmpty(valueSearch)) return false
+
   const valueComparator = valueComparatorByNodeDefType[NodeDef.getType(nodeDef)]
   return valueComparator && valueComparator({ survey, nodeDef, record, parentNode, value, valueSearch, strict })
 }