fix: FLUI-146 fix date test and typo

Ferlab-Ste-Justine · Jan 7, 2025 · 28a72ae · 28a72ae
1 parent c131304
commit 28a72ae
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 42 deletions.
diff --git a/packages/ui/Release.md b/packages/ui/Release.md
@@ -1,3 +1,6 @@
+### 10.15.3 2025-01-07
+- fix: FLUI-146 fix test + typo yesterday
+
 ### 10.15.2 2025-01-02
 - fix: SKFP-1379 fis JS errors in graph
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "10.15.2",
+    "version": "10.15.3",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"

diff --git a/packages/ui/src/components/Flag/types.ts b/packages/ui/src/components/Flag/types.ts
@@ -23,7 +23,7 @@ export interface IFlagDictionary {
 export interface IFlagDate {
     now?: string;
     today?: string;
-    yesteday?: string;
+    yesterday?: string;
     thisYear?: string;
     pastYear?: string;
 }

diff --git a/packages/ui/src/utils/dateUtils.test.ts b/packages/ui/src/utils/dateUtils.test.ts
@@ -7,7 +7,7 @@ describe('Relative date', () => {
         pastYear: 'Past Years',
         thisYear: 'This Years',
         today: 'today',
-        yesteday: 'yesteday',
+        yesterday: 'yesterday',
     };
     test('should return now', () => {
         const date = new Date();
@@ -17,19 +17,23 @@ describe('Relative date', () => {
         const date = new Date(Date.now() - 1000 * 60);
         expect(getRelativeDate(date, format)).toEqual('today');
     });
-    test('should return yesteday', () => {
+    test('should return yesterday', () => {
         const today = new Date();
         const yesterday = new Date(today);
         yesterday.setDate(today.getDate() - 1);
-        expect(getRelativeDate(yesterday, format)).toEqual('yesteday');
+        expect(getRelativeDate(yesterday, format)).toEqual('yesterday');
+    });
+    test('should return this years date', () => {
+        const today = new Date();
+        const startYear = new Date(today.getFullYear(), 0, 1);
+        const endPeriodTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 2);
+
+        const randomDate = new Date(
+            startYear.getTime() + Math.random() * (endPeriodTime.getTime() - startYear.getTime()),
+        );
+
+        expect(getRelativeDate(randomDate, format)).toEqual('This Years');
     });
-    // FLUI-146 failed the seven first days of a year
-    // test('should return this years date', () => {
-    //     const today = new Date();
-    //     const pastDate = new Date(today);
-    //     pastDate.setDate(today.getDate() - 7);
-    //     expect(getRelativeDate(pastDate, format)).toEqual('This Years');
-    // });
     test('should return past years date', () => {
         const today = new Date();
         const pastDate = new Date(today);
@@ -56,56 +60,56 @@ describe('Relative date', () => {
     });
     test('should return correct time am en', () => {
         const formatTime = {
-            yesteday: 'Yesteday at {hour}{ampm}',
+            yesterday: 'Yesterday at {hour}{ampm}',
         };
         setLocale('en');
 
-        const yesteday = new Date();
-        yesteday.setDate(yesteday.getDate() - 1);
-        yesteday.setHours(11);
-        yesteday.setMinutes(52);
+        const yesterday = new Date();
+        yesterday.setDate(yesterday.getDate() - 1);
+        yesterday.setHours(11);
+        yesterday.setMinutes(52);
 
-        expect(getRelativeDate(yesteday, formatTime)).toEqual('Yesteday at 11:52am');
+        expect(getRelativeDate(yesterday, formatTime)).toEqual('Yesterday at 11:52am');
     });
     test('should return correct time am fr', () => {
         const formatTime = {
-            yesteday: 'Hier à {hour}{ampm}',
+            yesterday: 'Hier à {hour}{ampm}',
         };
         setLocale('fr');
 
-        const yesteday = new Date();
-        yesteday.setDate(yesteday.getDate() - 1);
-        yesteday.setHours(11);
-        yesteday.setMinutes(52);
+        const yesterday = new Date();
+        yesterday.setDate(yesterday.getDate() - 1);
+        yesterday.setHours(11);
+        yesterday.setMinutes(52);
 
-        expect(getRelativeDate(yesteday, formatTime)).toEqual('Hier à 11h52');
+        expect(getRelativeDate(yesterday, formatTime)).toEqual('Hier à 11h52');
     });
 
     test('should return correct time pm en', () => {
         const formatTime = {
-            yesteday: 'Yesteday at {hour}{ampm}',
+            yesterday: 'Yesterday at {hour}{ampm}',
         };
         setLocale('en');
 
-        const yesteday = new Date();
-        yesteday.setDate(yesteday.getDate() - 1);
-        yesteday.setHours(16);
-        yesteday.setMinutes(52);
+        const yesterday = new Date();
+        yesterday.setDate(yesterday.getDate() - 1);
+        yesterday.setHours(16);
+        yesterday.setMinutes(52);
 
-        expect(getRelativeDate(yesteday, formatTime)).toEqual('Yesteday at 4:52pm');
+        expect(getRelativeDate(yesterday, formatTime)).toEqual('Yesterday at 4:52pm');
     });
 
     test('should return correct time pm fr', () => {
         const formatTime = {
-            yesteday: 'Hier à {hour}{ampm}',
+            yesterday: 'Hier à {hour}{ampm}',
         };
         setLocale('fr');
 
-        const yesteday = new Date();
-        yesteday.setDate(yesteday.getDate() - 1);
-        yesteday.setHours(16);
-        yesteday.setMinutes(52);
+        const yesterday = new Date();
+        yesterday.setDate(yesterday.getDate() - 1);
+        yesterday.setHours(16);
+        yesterday.setMinutes(52);
 
-        expect(getRelativeDate(yesteday, formatTime)).toEqual('Hier à 16h52');
+        expect(getRelativeDate(yesterday, formatTime)).toEqual('Hier à 16h52');
     });
 });
diff --git a/packages/ui/src/utils/dateUtils.ts b/packages/ui/src/utils/dateUtils.ts
@@ -30,14 +30,14 @@ export default (
         pastYear: '{month} {day}th {year}',
         thisYear: '{month} {day}th at {time}{ampm}',
         today: 'Today at {hour}{ampm}',
-        yesteday: 'Yesterday at {hour}{ampm}',
+        yesterday: 'Yesterday at {hour}{ampm}',
     },
 ): string | undefined => {
     const diff = Math.round((new Date().getTime() - new Date(date).getTime()) / 1000);
     const now = new Date();
     const hours = date.getHours();
-    const yesteday = new Date();
-    yesteday.setDate(yesteday.getDate() - 1);
+    const yesterday = new Date();
+    yesterday.setDate(yesterday.getDate() - 1);
     const locale = localStorage.getItem('locale') === 'fr' ? 'fr-CA' : 'en-US';
     const ampm = hours >= 12 ? 'pm' : 'am';
 
@@ -49,9 +49,9 @@ export default (
         return format?.today
             ?.replace('{hour}', formatTimeToLocal(date, locale))
             .replace('{ampm}', locale === 'en-US' ? ampm : '');
-    } else if (date.toDateString() === yesteday.toDateString()) {
-        //Yesteday
-        return format?.yesteday
+    } else if (date.toDateString() === yesterday.toDateString()) {
+        //Yesterday
+        return format?.yesterday
             ?.replace('{hour}', formatTimeToLocal(date, locale))
             .replace('{ampm}', locale === 'en-US' ? ampm : '');
     } else if (date.getFullYear() === now.getFullYear()) {