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
truenas · Jul 5, 2024 · 62a2a38 · 62a2a38
1 parent 12db9d9
commit 62a2a38
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/.../modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.html b/.../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/...dules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.spec.ts b/...dules/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/...pp/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts b/...pp/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) {