Skip to content

Commit

Permalink
Merge branch 'master' into enhancement/csv-data-export-uuids
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Oct 7, 2024
2 parents 623362e + 6f57569 commit 6e7ef31
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@
"@mui/x-data-grid": "^7.14.0",
"@mui/x-date-pickers": "^7.14.0",
"@mui/x-tree-view": "^7.7.1",
"@openforis/arena-core": "^0.0.204",
"@openforis/arena-core": "^0.0.206",
"@openforis/arena-server": "^0.1.35",
"@reduxjs/toolkit": "^2.2.5",
"@sendgrid/mail": "^8.1.3",
"@shopify/draggable": "^1.1.3",
"@uiw/react-codemirror": "^4.23.0",
"@turf/area": "^7.1.0",
"@turf/centroid": "^7.1.0",
"@turf/length": "^7.1.0",
"@uiw/react-codemirror": "^4.23.0",
"ace-builds": "^1.32.6",
"adm-zip": "^0.5.10",
"archiver": "^7.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const NodeDefDate = (props) => {
const node = entry ? nodes[0] : null

const dateStr = Node.getValue(node, null)
const nodeValueFormatted = DateUtils.convertDate({ dateStr, formatTo: dateFormat.display })
const nodeValueFormatted = DateUtils.convertDate({ dateStr, formatTo: dateFormat.display, keepTimeZone: false })

const handleChangeDateInput = useCallback(
(newDate) => {
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2761,10 +2761,10 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"

"@openforis/arena-core@^0.0.204":
version "0.0.204"
resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.204/aa4aec1004bbd93b778ea3d720f165501f0b4f26#aa4aec1004bbd93b778ea3d720f165501f0b4f26"
integrity sha512-RwcJZD2IU/CBKhktLZZxMb0DzA8afHJSXg6GEzpnJI+VDU6NPhqNyQnNuzWZRotDh8XiU2gctbiLN6Vg0BoIJA==
"@openforis/arena-core@^0.0.205":
version "0.0.205"
resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.205/7a4a1074ac76b00880789904fc5fd5dc7d1d6382#7a4a1074ac76b00880789904fc5fd5dc7d1d6382"
integrity sha512-JISauhuzUbN/UReULxRRe50P7IhCcowkayt6pXAy8gF4m8VypKU1AfJgXLXZ3eSGnvXwyuk2TXzwrxIJ7epw/Q==
dependencies:
"@jsep-plugin/regex" "^1.0.3"
bignumber.js "^9.1.2"
Expand All @@ -2777,10 +2777,10 @@
proj4 "^2.11.0"
uuid "^10.0.0"

"@openforis/arena-core@^0.0.205":
version "0.0.205"
resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.205/7a4a1074ac76b00880789904fc5fd5dc7d1d6382#7a4a1074ac76b00880789904fc5fd5dc7d1d6382"
integrity sha512-JISauhuzUbN/UReULxRRe50P7IhCcowkayt6pXAy8gF4m8VypKU1AfJgXLXZ3eSGnvXwyuk2TXzwrxIJ7epw/Q==
"@openforis/arena-core@^0.0.206":
version "0.0.206"
resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.206/0d81659dd4b4931eb3d8d8e42d7b2066ebacf75a#0d81659dd4b4931eb3d8d8e42d7b2066ebacf75a"
integrity sha512-5nJff0AysFX06qih+Iu3bgr/E8+5GBXNgwzrNIkYSEmNnISGGjWs3wtO84NmFS3TS/ascJQjtW0b5Cg5qbEaKw==
dependencies:
"@jsep-plugin/regex" "^1.0.3"
bignumber.js "^9.1.2"
Expand Down

0 comments on commit 6e7ef31

Please sign in to comment.