diff --git a/package.json b/package.json
index 2a58e3818da63ee5b0aa447af6bd0074946b757c..a22cf6bcfbf68a1b65c204d64a9a30e3f62231bf 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"cozy-logger": ">1.7.0",
"cozy-realtime": "4.2.8",
"cozy-scripts": "8.1",
- "cozy-ui": "81.9.0",
+ "cozy-ui": "^86.0.0",
"d3": "^6.0.0",
"detect-browser": "^5.1.1",
"file-saver": "^2.0.5",
diff --git a/src/components/Charts/AxisBottom.tsx b/src/components/Charts/AxisBottom.tsx
index 86cb03e3e4f8e3646c697cb9e396c470e02a9ee3..35dbdfe9e9d85202d7346a2c91b96f9ca9adce55 100644
--- a/src/components/Charts/AxisBottom.tsx
+++ b/src/components/Charts/AxisBottom.tsx
@@ -39,7 +39,9 @@ function TextAxis({
return (
<text y="10" dy="0.71em" transform={`translate(${width})`}>
<tspan className={style} textAnchor="middle">
- {dataload.date.toLocaleString({ year: 'numeric' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ year: 'numeric' })}
</tspan>
</text>
)
@@ -47,7 +49,9 @@ function TextAxis({
return (
<text y="10" dy="0.71em" transform={`translate(${width})`}>
<tspan className={style} textAnchor="middle">
- {dataload.date.toLocaleString({ month: 'narrow' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ month: 'narrow' })}
</tspan>
</text>
)
@@ -57,10 +61,14 @@ function TextAxis({
return (
<>
<tspan className={style} x="0" textAnchor="middle">
- {dataload.date.toLocaleString({ weekday: 'narrow' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ weekday: 'narrow' })}
</tspan>
<tspan className={style} x="0" dy="1.2em" textAnchor="middle">
- {dataload.date.toLocaleString({ day: 'numeric' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ day: 'numeric' })}
</tspan>
</>
)
@@ -70,12 +78,15 @@ function TextAxis({
<tspan className={style} x="0" textAnchor="middle">
{capitalize(
dataload.date
+ .setLocale('fr-FR')
.toLocaleString({ weekday: 'short' })
.substring(0, 3)
)}
</tspan>
<tspan className={style} x="0" dy="1.2em" textAnchor="middle">
- {dataload.date.toLocaleString({ day: 'numeric' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ day: 'numeric' })}
</tspan>
</>
)
@@ -93,10 +104,14 @@ function TextAxis({
return (
<text y="10" dy="0.71em" transform={`translate(${width})`}>
<tspan className={style} x="0" textAnchor="middle">
- {dataload.date.toLocaleString({ weekday: 'narrow' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ weekday: 'narrow' })}
</tspan>
<tspan className={style} x="0" dy="1.2em" textAnchor="middle">
- {dataload.date.toLocaleString({ day: 'numeric' })}
+ {dataload.date
+ .setLocale('fr-FR')
+ .toLocaleString({ day: 'numeric' })}
</tspan>
</text>
)
diff --git a/src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap b/src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
index f468fcd4dbd5c46e5528dbf9e34a4a8e16e8a4a3..dd321196e7290b0bf856235e533e89b974dada6a 100644
--- a/src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
+++ b/src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`AxisBottom component test should correctly render DAY format of AxisBot
text-anchor="middle"
x="0"
>
- T
+ J
</tspan>
<tspan
class="tick-text tick-text-selected chart-ticks-x-text"
@@ -49,7 +49,7 @@ exports[`AxisBottom component test should correctly render DAY format of AxisBot
text-anchor="middle"
x="0"
>
- F
+ V
</tspan>
<tspan
class="tick-text chart-ticks-x-text"
@@ -266,7 +266,7 @@ exports[`AxisBottom component test should correctly render WEEK format of AxisBo
text-anchor="middle"
x="0"
>
- T
+ J
</tspan>
<tspan
class="tick-text tick-text-selected chart-ticks-x-text"
@@ -293,7 +293,7 @@ exports[`AxisBottom component test should correctly render WEEK format of AxisBo
text-anchor="middle"
x="0"
>
- F
+ V
</tspan>
<tspan
class="tick-text chart-ticks-x-text"
diff --git a/yarn.lock b/yarn.lock
index 421f54db99ad4410a9d3fd5ba71b3b365eb6a2b4..22349dc1c76234c6ecc60078ea30773ce2fa08fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6289,10 +6289,10 @@ cozy-stack-client@^40.2.1:
mime "^2.4.0"
qs "^6.7.0"
-cozy-ui@81.9.0:
- version "81.9.0"
- resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-81.9.0.tgz#ad6e79cb608851676cf1f80093df500a943f06bf"
- integrity sha512-f++0oOvAt1JNRrmiilFFu9ZdhnYl8Iv6x+fBTyw8ertRhTg5YdFHdYsrK6lDjnm6AxXNU1mpnKX4GvrKlaV46A==
+cozy-ui@^86.0.0:
+ version "86.3.0"
+ resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-86.3.0.tgz#02df54285e043c03489a53c9c83f7a49f47d5328"
+ integrity sha512-eUnkIWY4hszVYB5qMQ5U7wxagFPzpvIlpA+7ke52fjcs2Z8uJ5vsbNfHjIgwxDn+hzOm09nUkwjDmQXIbO33bA==
dependencies:
"@babel/runtime" "^7.3.4"
"@material-ui/core" "4.12.3"
@@ -6313,7 +6313,7 @@ cozy-ui@81.9.0:
piwik-react-router "0.12.1"
react-chartjs-2 "4.1.0"
react-markdown "^4.0.8"
- react-pdf "^4.0.5"
+ react-pdf "^5.7.2"
react-popper "^2.2.3"
react-remove-scroll "^2.4.0"
react-select "^4.3.0"
@@ -8695,6 +8695,14 @@ file-loader@3.0.1:
loader-utils "^1.0.2"
schema-utils "^1.0.0"
+file-loader@^6.0.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+ integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
+ dependencies:
+ loader-utils "^2.0.0"
+ schema-utils "^3.0.0"
+
file-saver@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
@@ -11627,7 +11635,7 @@ loader-utils@^0.2.16:
json5 "^0.5.0"
object-assign "^4.0.1"
-loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.1, loader-utils@^1.2.3, loader-utils@^1.4.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.1, loader-utils@^1.2.3, loader-utils@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -12017,6 +12025,11 @@ merge-options@1.0.1:
dependencies:
is-plain-obj "^1.1"
+merge-refs@^1.0.0:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/merge-refs/-/merge-refs-1.2.2.tgz#6142633398dd0d10a37626cae77ddeb1db26db0c"
+ integrity sha512-RwcT7GsQR3KbuLw1rRuodq4Nt547BKEBkliZ0qqsrpyNne9bGTFtsFIsIpx82huWhcl3kOlOlH4H0xkPk/DqVw==
+
merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -12823,11 +12836,6 @@ nock@^12.0.3:
lodash "^4.17.13"
propagate "^2.0.0"
-node-ensure@^0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
- integrity sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==
-
node-fetch@2.6.7, node-fetch@^2.0.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -13699,13 +13707,10 @@ pbkdf2@^3.0.3:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-pdfjs-dist@2.1.266:
- version "2.1.266"
- resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
- integrity sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==
- dependencies:
- node-ensure "^0.0.0"
- worker-loader "^2.0.0"
+pdfjs-dist@2.12.313:
+ version "2.12.313"
+ resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz#62f2273737bb956267ae2e02cdfaddcb1099819c"
+ integrity sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==
peek-readable@^4.1.0:
version "4.1.0"
@@ -14590,17 +14595,21 @@ react-markdown@^4.0.8, react-markdown@^4.2.2:
unist-util-visit "^1.3.0"
xtend "^4.0.1"
-react-pdf@^4.0.5:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/react-pdf/-/react-pdf-4.2.0.tgz#b83a01eb070912522075b7a51aee7d63b2c912ed"
- integrity sha512-Ao44mZszfPwtCUsrXHtXnhM+czTvPxfG5wqssbWgj2onL70TKSOKGzQfCH4csCnNDOKji/Pc/s0Og70/VOE+Rg==
+react-pdf@^5.7.2:
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/react-pdf/-/react-pdf-5.7.2.tgz#c458dedf7983822668b40dcac1eae052c1f6e056"
+ integrity sha512-hdDwvf007V0i2rPCqQVS1fa70CXut17SN3laJYlRHzuqcu8sLLjEoeXihty6c0Ev5g1mw31b8OT8EwRw1s8C4g==
dependencies:
"@babel/runtime" "^7.0.0"
+ file-loader "^6.0.0"
make-cancellable-promise "^1.0.0"
make-event-props "^1.1.0"
merge-class-names "^1.1.1"
- pdfjs-dist "2.1.266"
+ merge-refs "^1.0.0"
+ pdfjs-dist "2.12.313"
prop-types "^15.6.2"
+ tiny-invariant "^1.0.0"
+ tiny-warning "^1.0.0"
react-popper@^2.2.3:
version "2.3.0"
@@ -15508,14 +15517,6 @@ scheduler@^0.23.0:
dependencies:
loose-envify "^1.1.0"
-schema-utils@^0.4.0:
- version "0.4.7"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
- integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
- dependencies:
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
-
schema-utils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -16817,7 +16818,12 @@ timers-browserify@^2.0.4:
dependencies:
setimmediate "^1.0.4"
-tiny-warning@^1.0.2:
+tiny-invariant@^1.0.0:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
+ integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+
+tiny-warning@^1.0.0, tiny-warning@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
@@ -18016,14 +18022,6 @@ worker-farm@^1.7.0:
dependencies:
errno "~0.1.7"
-worker-loader@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
- integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
- dependencies:
- loader-utils "^1.0.0"
- schema-utils "^0.4.0"
-
wrap-ansi@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"