From 62a2a38c7e98002210f078ce029bc8dbaf5853de Mon Sep 17 00:00:00 2001
From: Alex Karpov <akarpov@ixsystems.com>
Date: Fri, 5 Jul 2024 15:40:21 +0300
Subject: [PATCH] NAS-129774 / 24.10 / UI task manager shows "Invalid date" for
 running jobs (#10274)

* NAS-129774: UI task manager shows "Invalid date" for running jobs

* NAS-129774: PR update
---
 .../ix-cell-date/ix-cell-date.component.html  |  2 +-
 .../ix-cell-date.component.spec.ts            | 32 ++++++++++++++-----
 .../ix-cell-date/ix-cell-date.component.ts    |  2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.html b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.html
index 5ec16b61110..07c0a369bed 100644
--- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.html
+++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.html
@@ -1,5 +1,5 @@
 <ix-date
-  *ngIf="!!date; else noDate"
+  *ngIf="date; else noDate"
   [ixTest]="[title, rowTestId(row), 'row-date']"
   [date]="date"
 ></ix-date>
diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.spec.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.spec.ts
index 837b93c67bd..a556d0a7ab6 100644
--- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.spec.ts
+++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.spec.ts
@@ -25,15 +25,31 @@ describe('IxCellDateComponent', () => {
     ],
   });
 
-  beforeEach(() => {
-    spectator = createComponent();
-    spectator.component.propertyName = 'dateField';
-    spectator.component.setRow({ dateField: new Date('2023-07-12 09:10:00') });
-    spectator.component.rowTestId = () => '';
-    spectator.detectChanges();
+  describe('date provided', () => {
+    beforeEach(() => {
+      spectator = createComponent();
+      spectator.component.propertyName = 'dateField';
+      spectator.component.setRow({ dateField: new Date('2023-07-12 09:10:00') });
+      spectator.component.rowTestId = () => '';
+      spectator.detectChanges();
+    });
+
+    it('shows default format datetime in template', () => {
+      expect(spectator.element.textContent.trim()).toBe('2023-07-11 23:10:00');
+    });
   });
 
-  it('shows default format datetime in template', () => {
-    expect(spectator.element.textContent.trim()).toBe('2023-07-11 23:10:00');
+  describe('no date provided', () => {
+    beforeEach(() => {
+      spectator = createComponent();
+      spectator.component.propertyName = 'dateField';
+      spectator.component.setRow({ dateField: null });
+      spectator.component.rowTestId = () => '';
+      spectator.detectChanges();
+    });
+
+    it('shows default format datetime in template', () => {
+      expect(spectator.element.textContent.trim()).toBe('N/A');
+    });
   });
 });
diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts
index a732456430c..edf992eceae 100644
--- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts
+++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts
@@ -9,7 +9,7 @@ import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/table-c
 })
 export class IxCellDateComponent<T> extends ColumnComponent<T> {
   get date(): number | null | Date {
-    if (this.value === null) {
+    if (!this.value) {
       return null;
     }
     if ((this.value as ApiTimestamp)?.$date) {