cozy-ui 79.0.0 → 79.1.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [79.1.0](https://github.com/cozy/cozy-ui/compare/v79.0.0...v79.1.0) (2022-12-21)
+
+
+### Features
+
+* Add a `formatLocallyDistanceToNowStrict` helper ([ff6b565](https://github.com/cozy/cozy-ui/commit/ff6b565))
+
 # [79.0.0](https://github.com/cozy/cozy-ui/compare/v78.1.1...v79.0.0) (2022-12-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "79.0.0",
+  "version": "79.1.0",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/I18n/format.jsx

@@ -1,6 +1,7 @@
 import format from 'date-fns/format'
 import { DEFAULT_LANG } from '.'
 import formatDistanceToNow from 'date-fns/distance_in_words_to_now'
+import formatDistanceStrict from 'date-fns/distance_in_words_strict'
 
 const locales = {}
 let lang = DEFAULT_LANG
@@ -36,3 +37,6 @@ export const initFormat = (userLang, defaultLang = DEFAULT_LANG) => (
 
 export const formatLocallyDistanceToNow = date =>
   formatDistanceToNow(date, { locale: locales[lang] })
+
+export const formatLocallyDistanceToNowStrict = date =>
+  formatDistanceStrict(Date.now(), date, { locale: locales[lang] })

package/react/I18n/format.spec.jsx

@@ -1,4 +1,8 @@
-import { initFormat, formatLocallyDistanceToNow } from './format'
+import {
+  initFormat,
+  formatLocallyDistanceToNow,
+  formatLocallyDistanceToNowStrict
+} from './format'
 
 describe('initFormat', () => {
   beforeEach(() => {
@@ -14,7 +18,7 @@ describe('initFormat', () => {
 
 describe('formatLocallyDistanceToNow', () => {
   it('should formatDistanceToNow with small value', () => {
-    const date = Date.now() + 29 * 1000
+    const date = Date.now() + 29 * 1000 // 29s
 
     const result = formatLocallyDistanceToNow(date)
 
@@ -22,7 +26,7 @@ describe('formatLocallyDistanceToNow', () => {
   })
 
   it('should formatDistanceToNow with medium value', () => {
-    const date = Date.now() + 2671 * 1000
+    const date = Date.now() + (44 * 60 + 31) * 1000 // 44min 31s
 
     const result = formatLocallyDistanceToNow(date)
 
@@ -30,18 +34,52 @@ describe('formatLocallyDistanceToNow', () => {
   })
 
   it('should formatDistanceToNow with high value', () => {
-    const date = Date.now() + 5371 * 1000
+    const date = Date.now() + (89 * 60 + 31) * 1000 // 89min 31s
 
     const result = formatLocallyDistanceToNow(date)
 
     expect(result).toEqual('about 2 hours')
   })
 
-  it('should not throw if a date-fns locale can not be found', () => {
-    jest.spyOn(console, 'warn').mockImplementation()
+  it('should formatDistanceToNow with very high value', () => {
+    const date = Date.now() + 42 * 24 * 60 * 60 * 1000 // 42d
 
-    expect(() => formatLocallyDistanceToNow('unknown-lang')).not.toThrow()
+    const result = formatLocallyDistanceToNow(date)
 
-    console.warn.mockRestore()
+    expect(result).toEqual('about 1 month')
+  })
+})
+
+describe('formatLocallyDistanceToNowStrict', () => {
+  it('should formatDistanceToNowStrict with small value', () => {
+    const date = Date.now() + 29 * 1000 // 29s
+
+    const result = formatLocallyDistanceToNowStrict(date)
+
+    expect(result).toEqual('29 seconds')
+  })
+
+  it('should formatDistanceToNowStrict with medium value', () => {
+    const date = Date.now() + (44 * 60 + 31) * 1000 // 44min 31s
+
+    const result = formatLocallyDistanceToNowStrict(date)
+
+    expect(result).toEqual('44 minutes')
+  })
+
+  it('should formatDistanceToNowStrict with high value', () => {
+    const date = Date.now() + (89 * 60 + 31) * 1000 // 89min 31s
+
+    const result = formatLocallyDistanceToNowStrict(date)
+
+    expect(result).toEqual('1 hour')
+  })
+
+  it('should formatDistanceToNowStrict with very high value', () => {
+    const date = Date.now() + 42 * 24 * 60 * 60 * 1000 // 42d
+
+    const result = formatLocallyDistanceToNowStrict(date)
+
+    expect(result).toEqual('1 month')
   })
 })

package/react/Viewer/components/ExpirationAlert.jsx

@@ -9,7 +9,7 @@ import Link from '../../Link'
 import Typography from '../../Typography'
 import { withViewerLocales } from '../hoc/withViewerLocales'
 import { useI18n } from '../../I18n'
-import { formatLocallyDistanceToNow } from '../../I18n/format'
+import { formatLocallyDistanceToNowStrict } from '../../I18n/format'
 
 const FILES_DOCTYPE = 'io.cozy.files'
 
@@ -51,7 +51,7 @@ const ExpirationAlert = ({ file }) => {
       <Typography component="span" variant="inherit">
         <Typography component="span" variant="inherit">
           {t('Viewer.panel.expiration.description', {
-            duration: formatLocallyDistanceToNow(expirationDate)
+            duration: formatLocallyDistanceToNowStrict(expirationDate)
           })}
         </Typography>
         {expirationNoticeLink && (

package/react/Viewer/components/ExpirationAnnotation.jsx

@@ -5,7 +5,7 @@ import { models } from 'cozy-client'
 
 import Typography from '../../Typography'
 import { useI18n } from '../../I18n'
-import { formatLocallyDistanceToNow } from '../../I18n/format'
+import { formatLocallyDistanceToNowStrict } from '../../I18n/format'
 
 const { computeExpirationDate, isExpired } = models.paper
 
@@ -25,7 +25,7 @@ const ExpirationAnnotation = ({ file }) => {
   return (
     <Typography component="span" variant="inherit" className="u-warning">
       {t('Viewer.panel.qualification.expiresIn', {
-        duration: formatLocallyDistanceToNow(expirationDate)
+        duration: formatLocallyDistanceToNowStrict(expirationDate)
       })}
     </Typography>
   )

package/transpiled/react/I18n/format.js

@@ -1,6 +1,7 @@
 import format from 'date-fns/format';
 import { DEFAULT_LANG } from "cozy-ui/transpiled/react/I18n";
 import formatDistanceToNow from 'date-fns/distance_in_words_to_now';
+import formatDistanceStrict from 'date-fns/distance_in_words_strict';
 var locales = {};
 var lang = DEFAULT_LANG;
 
@@ -41,4 +42,9 @@ export var formatLocallyDistanceToNow = function formatLocallyDistanceToNow(date
   return formatDistanceToNow(date, {
     locale: locales[lang]
   });
+};
+export var formatLocallyDistanceToNowStrict = function formatLocallyDistanceToNowStrict(date) {
+  return formatDistanceStrict(Date.now(), date, {
+    locale: locales[lang]
+  });
 };

package/transpiled/react/Viewer/components/ExpirationAlert.js

@@ -16,7 +16,7 @@ import Link from "cozy-ui/transpiled/react/Link";
 import Typography from "cozy-ui/transpiled/react/Typography";
 import { withViewerLocales } from "cozy-ui/transpiled/react/Viewer/hoc/withViewerLocales";
 import { useI18n } from "cozy-ui/transpiled/react/I18n";
-import { formatLocallyDistanceToNow } from "cozy-ui/transpiled/react/I18n/format";
+import { formatLocallyDistanceToNowStrict } from "cozy-ui/transpiled/react/I18n/format";
 var FILES_DOCTYPE = 'io.cozy.files';
 var _models$paper = models.paper,
     computeExpirationDate = _models$paper.computeExpirationDate,
@@ -84,7 +84,7 @@ var ExpirationAlert = function ExpirationAlert(_ref) {
     component: "span",
     variant: "inherit"
   }, t('Viewer.panel.expiration.description', {
-    duration: formatLocallyDistanceToNow(expirationDate)
+    duration: formatLocallyDistanceToNowStrict(expirationDate)
   })), expirationNoticeLink && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Typography, {
     component: "span",
     variant: "inherit"

package/transpiled/react/Viewer/components/ExpirationAnnotation.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { models } from 'cozy-client';
 import Typography from "cozy-ui/transpiled/react/Typography";
 import { useI18n } from "cozy-ui/transpiled/react/I18n";
-import { formatLocallyDistanceToNow } from "cozy-ui/transpiled/react/I18n/format";
+import { formatLocallyDistanceToNowStrict } from "cozy-ui/transpiled/react/I18n/format";
 var _models$paper = models.paper,
     computeExpirationDate = _models$paper.computeExpirationDate,
     isExpired = _models$paper.isExpired;
@@ -28,7 +28,7 @@ var ExpirationAnnotation = function ExpirationAnnotation(_ref) {
     variant: "inherit",
     className: "u-warning"
   }, t('Viewer.panel.qualification.expiresIn', {
-    duration: formatLocallyDistanceToNow(expirationDate)
+    duration: formatLocallyDistanceToNowStrict(expirationDate)
   }));
 };