fix: correct dates in tests

libs/portal-integration-angular/src/index.ts

@@ -95,4 +95,5 @@ export * from './lib/core/primeng.module'
 export * from './lib/functions/flatten-object'
 
 // utils
-export * from './lib/core/utils/objectutils'
+export * from './lib/core/utils/objectutils'
+export * from './lib/core/utils/dateutils'

libs/portal-integration-angular/src/lib/core/components/interactive-data-view/interactive-data-view.component.spec.ts

@@ -36,6 +36,7 @@ import {
 import { RouterTestingModule } from '@angular/router/testing'
 import { TranslateTestingModule } from 'ngx-translate-testing'
 import { NoopAnimationsModule } from '@angular/platform-browser/animations'
+import { DateUtils } from '../../utils/dateutils'
 
 describe('InteractiveDataViewComponent', () => {
   let component: InteractiveDataViewComponent
@@ -46,6 +47,8 @@ describe('InteractiveDataViewComponent', () => {
   let editItemEvent: RowListGridData | undefined
   let deleteItemEvent: RowListGridData | undefined
 
+  let dateUtils: DateUtils
+
   const mockData = [
     {
       version: 0,
@@ -256,6 +259,8 @@ describe('InteractiveDataViewComponent', () => {
 
     loader = TestbedHarnessEnvironment.loader(fixture)
 
+    dateUtils = TestBed.inject(DateUtils)
+
     viewItemEvent = undefined
     editItemEvent = undefined
     deleteItemEvent = undefined
@@ -338,6 +343,7 @@ describe('InteractiveDataViewComponent', () => {
       ['name 3', '', 'status name 3', ''],
     ]
 
+
     it('should load table', async () => {
       expect(dataTable).toBeTruthy()
       expect(await dataLayoutSelection.getCurrentLayout()).toEqual('table')
@@ -557,24 +563,24 @@ describe('InteractiveDataViewComponent', () => {
         [
           'some name',
           '',
-          'Sep 13, 2023, 11:34:05 AM',
-          'Sep 14, 2023, 11:34:09 AM',
+          dateUtils.localizedDate('2023-09-13T09:34:05Z'),
+          dateUtils.localizedDate('2023-09-14T09:34:09Z'),
           'some status',
           'someone responsible',
           '1',
         ],
         [
           'example',
           'example description',
-          'Sep 12, 2023, 11:33:53 AM',
-          'Sep 13, 2023, 11:33:55 AM',
+          dateUtils.localizedDate('2023-09-12T09:33:53Z'),
+          dateUtils.localizedDate('2023-09-13T09:33:55Z'),
           'status example',
           '',
           '3.141',
         ],
-        ['name 1', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 1', '', '123,456,789'],
-        ['name 2', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 2', '', '12,345.679'],
-        ['name 3', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 3', '', '7.1'],
+        ['name 1', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 1', '', '123,456,789'],
+        ['name 2', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 2', '', '12,345.679'],
+        ['name 3', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 3', '', '7.1'],
       ]
 
       const columnGroupSelectionDropdown = await loader.getHarness(
@@ -594,28 +600,29 @@ describe('InteractiveDataViewComponent', () => {
 
     it('should select option in column group selection dropdown and sort ascending', async () => {
       window.HTMLElement.prototype.scrollIntoView = jest.fn()
-      const expectedRowsData = [
+      const expectedRowsData = 
+      [
         [
           'some name',
           '',
-          'Sep 13, 2023, 11:34:05 AM',
-          'Sep 14, 2023, 11:34:09 AM',
+          dateUtils.localizedDate('2023-09-13T09:34:05Z'),
+          dateUtils.localizedDate('2023-09-14T09:34:09Z'),
           'some status',
           'someone responsible',
           '1',
         ],
         [
           'example',
           'example description',
-          'Sep 12, 2023, 11:33:53 AM',
-          'Sep 13, 2023, 11:33:55 AM',
+          dateUtils.localizedDate('2023-09-12T09:33:53Z'),
+          dateUtils.localizedDate('2023-09-13T09:33:55Z'),
           'status example',
           '',
           '3.141',
         ],
-        ['name 3', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 3', '', '7.1'],
-        ['name 2', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 2', '', '12,345.679'],
-        ['name 1', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 1', '', '123,456,789'],
+        ['name 3', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 3', '', '7.1'],
+        ['name 2', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 2', '', '12,345.679'],
+        ['name 1', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 1', '', '123,456,789'],
       ]
 
       const columnGroupSelectionDropdown = await loader.getHarness(
@@ -636,24 +643,25 @@ describe('InteractiveDataViewComponent', () => {
 
     it('should select option in column group selection dropdown and sort descending', async () => {
       window.HTMLElement.prototype.scrollIntoView = jest.fn()
-      const expectedRowsData = [
-        ['name 1', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 1', '', '123,456,789'],
-        ['name 2', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 2', '', '12,345.679'],
-        ['name 3', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 3', '', '7.1'],
+      const expectedRowsData =
+      [
+        ['name 1', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 1', '', '123,456,789'],
+        ['name 2', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 2', '', '12,345.679'],
+        ['name 3', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 3', '', '7.1'],
         [
           'example',
           'example description',
-          'Sep 12, 2023, 11:33:53 AM',
-          'Sep 13, 2023, 11:33:55 AM',
+          dateUtils.localizedDate('2023-09-12T09:33:53Z'),
+          dateUtils.localizedDate('2023-09-13T09:33:55Z'),
           'status example',
           '',
           '3.141',
         ],
         [
           'some name',
           '',
-          'Sep 13, 2023, 11:34:05 AM',
-          'Sep 14, 2023, 11:34:09 AM',
+          dateUtils.localizedDate('2023-09-13T09:34:05Z'),
+          dateUtils.localizedDate('2023-09-14T09:34:09Z'),
           'some status',
           'someone responsible',
           '1',
@@ -683,24 +691,24 @@ describe('InteractiveDataViewComponent', () => {
         [
           'some name',
           '',
-          'Sep 13, 2023, 11:34:05 AM',
-          'Sep 14, 2023, 11:34:09 AM',
+          dateUtils.localizedDate('2023-09-13T09:34:05Z'),
+          dateUtils.localizedDate('2023-09-14T09:34:09Z'),
           'some status',
           'someone responsible',
           '1',
         ],
         [
           'example',
           'example description',
-          'Sep 12, 2023, 11:33:53 AM',
-          'Sep 13, 2023, 11:33:55 AM',
+          dateUtils.localizedDate('2023-09-12T09:33:53Z'),
+          dateUtils.localizedDate('2023-09-13T09:33:55Z'),
           'status example',
           '',
           '3.141',
         ],
-        ['name 1', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 1', '', '123,456,789'],
-        ['name 2', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 2', '', '12,345.679'],
-        ['name 3', '', 'Sep 14, 2023, 11:34:22 AM', 'Sep 15, 2023, 11:34:24 AM', 'status name 3', '', '7.1'],
+        ['name 1', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 1', '', '123,456,789'],
+        ['name 2', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 2', '', '12,345.679'],
+        ['name 3', '', dateUtils.localizedDate('2023-09-14T09:34:22Z'), dateUtils.localizedDate('2023-09-15T09:34:24Z'), 'status name 3', '', '7.1'],
       ]
 
       const columnGroupSelectionDropdown = await loader.getHarness(
@@ -862,11 +870,13 @@ describe('InteractiveDataViewComponent', () => {
         'Actions',
       ]
       const expectedRowsData = [
-        ['some name', '', 'some status', 'someone responsible', 'Sep 13, 2023, 11:34:05 AM'],
-        ['example', 'example description', 'status example', '', 'Sep 12, 2023, 11:33:53 AM'],
-        ['name 1', '', 'status name 1', '', 'Sep 14, 2023, 11:34:22 AM'],
-        ['name 2', '', 'status name 2', '', 'Sep 14, 2023, 11:34:22 AM'],
-        ['name 3', '', 'status name 3', '', 'Sep 14, 2023, 11:34:22 AM'],
+        ['some name', '', 'some status', 'someone responsible', dateUtils.localizedDate('2023-09-13T09:34:05Z'),
+      ],
+        ['example', 'example description', 'status example', '', dateUtils.localizedDate('2023-09-12T09:33:53Z'),
+      ],
+        ['name 1', '', 'status name 1', '', dateUtils.localizedDate('2023-09-14T09:34:22Z')],
+        ['name 2', '', 'status name 2', '', dateUtils.localizedDate('2023-09-14T09:34:22Z')],
+        ['name 3', '', 'status name 3', '', dateUtils.localizedDate('2023-09-14T09:34:22Z')],
       ]
 
       await inActiveColumnsList[0].selectItem()
@@ -1280,7 +1290,9 @@ describe('InteractiveDataViewComponent', () => {
       expect(listItemsData).toEqual(expectedSortedListItemsDataAscending)
 
       const sortingDropdown = await loader.getHarness(PDropdownHarness.with({ id: 'dataListGridSortingDropdown' }))
-      const dataListGridSortingButton = await loader.getHarness(PButtonHarness.with({ id: 'dataListGridSortingButton' }))
+      const dataListGridSortingButton = await loader.getHarness(
+        PButtonHarness.with({ id: 'dataListGridSortingButton' })
+      )
 
       expect(await (await sortingDropdown.host()).text()).toEqual('COLUMN_HEADER_NAME.TEST_NUMBER')
       await dataListGridSortingButton.click()
@@ -1301,12 +1313,8 @@ describe('InteractiveDataViewComponent', () => {
 
     it('should remain filtered with third filter option after switching view data view from table view to grid view and to list view', async () => {
       const expectedFilteredRowsData = [['name 1', '', 'status name 1', '']]
-      const expectedFilteredListItemsData = [
-        ['name 1', '2023-09-14T09:34:22Z', '123456789'],
-      ]
-      const expectedFilteredGridItemsData = [
-        ['', 'name 1', '2023-09-14T09:34:22Z', '123456789'],
-      ]
+      const expectedFilteredListItemsData = [['name 1', '2023-09-14T09:34:22Z', '123456789']]
+      const expectedFilteredGridItemsData = [['', 'name 1', '2023-09-14T09:34:22Z', '123456789']]
       const filterMultiSelect = await tableHeaders[0].getFilterMultiSelect()
       allFilterOptions = await filterMultiSelect.getAllOptions()
       await allFilterOptions[2].click()

libs/portal-integration-angular/src/lib/core/utils/dateutils.ts

@@ -0,0 +1,26 @@
+import { TranslateService } from '@ngx-translate/core'
+import { Injectable } from '@angular/core'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DateUtils {
+  constructor(private translateService: TranslateService) {}
+
+  options: Intl.DateTimeFormatOptions = {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+    second: '2-digit',
+  }
+
+  localizedDate(date: string | number | Date | undefined): string {
+    return date
+      ? new Intl.DateTimeFormat(this.translateService.getBrowserLang(), this.options).format(
+          date instanceof Date ? date : new Date(date)
+        )
+      : ''
+  }
+}