From 2d21cd7e1269a2116c0bcddf90a4ea70cd9ed559 Mon Sep 17 00:00:00 2001 From: Israel Leon Date: Wed, 24 Feb 2021 16:16:30 -0500 Subject: [PATCH 1/7] fix: TT-165 Warning message in the console (#641) --- .../components/details-fields/details-fields.component.html | 4 ++-- .../components/details-fields/details-fields.component.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 5a04f4b87..a876cb26a 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -99,8 +99,8 @@ [format]="24" formControlName="start_hour" id="start_hour" - [disabled]="!(project_name.value && project_id.value)" class="timepicker-input" + [class.timepicker-input--disabled]="!(project_id.value && project_name.value)" > @@ -126,8 +126,8 @@ [format]="24" formControlName="end_hour" id="end_hour" - [disabled]="!(project_name.value && project_id.value)" class="timepicker-input" + [class.timepicker-input--disabled]="!(project_id.value && project_name.value)" > diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.scss b/src/app/modules/shared/components/details-fields/details-fields.component.scss index 88b00d6e7..25dd0337a 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.scss +++ b/src/app/modules/shared/components/details-fields/details-fields.component.scss @@ -103,3 +103,8 @@ input[type="date"]::-webkit-clear-button { border-radius: 0.25rem; } +.timepicker-input--disabled ::ng-deep div{ + pointer-events: none; + background-color: #e9ecef; + opacity: 1; +} From 7d593c85e57615b1aeb11e7da9c9c32285d12a85 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 24 Feb 2021 21:17:59 +0000 Subject: [PATCH 2/7] chore(release): 1.31.17 [skip ci]nn --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31f593150..970319399 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.31.16", + "version": "1.31.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c286b54b7..47b6417c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.31.16", + "version": "1.31.17", "scripts": { "preinstall": "npx npm-force-resolutions", "ng": "ng", From 3d41cbe9e574f65b2d63fa09fb3091dae07a28a4 Mon Sep 17 00:00:00 2001 From: wobravo Date: Mon, 22 Feb 2021 14:24:34 -0500 Subject: [PATCH 3/7] fix: TT-149 When-edit-Date-In-update-the-Date-Out --- .../details-fields.component.html | 1 + .../details-fields.component.spec.ts | 32 +++++++++++++++++++ .../details-fields.component.ts | 8 +++++ 3 files changed, 41 insertions(+) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index a876cb26a..4cf945809 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -90,6 +90,7 @@ aria-describedby="inputGroup-sizing-sm" [class.is-invalid]="start_date.invalid && start_date.touched" required + (ngModelChange)="onInitialDatepickerUpdated($event)" /> diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index 60139632f..265febd07 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -443,6 +443,38 @@ describe('DetailsFieldsComponent', () => { expect(component.projectSelected.emit).toHaveBeenCalledWith(data); }); + it('on Selected Initial Date should change end date', () => { + const expectedDate = '2020-02-05'; + + component.onInitialDatepickerUpdated(expectedDate); + fixture.detectChanges(); + const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); + + expect(endDateInput.value).toEqual(expectedDate); + + }); + + it('on Selected End Date should not change initial date', () => { + const expectedInitialDate = '2020-02-05'; + const expectedEndDate = '2020-02-06'; + component.onInitialDatepickerUpdated(expectedInitialDate); + fixture.detectChanges(); + const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); + + expect(endDateInput.value).toEqual(expectedInitialDate); + + }); + + fit('should be ok', () => { + component.ngOnInit(); + fixture.detectChanges(); + const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); + endDateInput.value = '2021-02-21'; + endDateInput.dispatchEvent(new Event('#end_date')); + + expect(endDateInput.value).toBe('2021-02-21'); + }); + /* TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component, and now these couple of tests are failing. A solution to this error might be generate a Test Wrapper Component. More details here: diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index 5a0434d8a..3d0cb1b37 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -124,6 +124,14 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { }); } + onInitialDatepickerUpdated($event: string) { + console.log($event); + this.end_date.setValue($event); + + } + + + ngOnChanges(): void { this.goingToWorkOnThis = this.entryToEdit ? this.entryToEdit.running : false; this.shouldRestartEntry = false; From 85016d9fa6dfdb8f5acc376b725e39bb2839518a Mon Sep 17 00:00:00 2001 From: wobravo Date: Mon, 22 Feb 2021 18:55:17 -0500 Subject: [PATCH 4/7] fix: TT-149 When edit Date In update the Date Out --- .../details-fields.component.spec.ts | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index 265febd07..aff85c2db 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -444,36 +444,46 @@ describe('DetailsFieldsComponent', () => { }); it('on Selected Initial Date should change end date', () => { - const expectedDate = '2020-02-05'; + const expectedInitialDate = '2020-02-05'; - component.onInitialDatepickerUpdated(expectedDate); + component.onInitialDatepickerUpdated(expectedInitialDate); fixture.detectChanges(); const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); - expect(endDateInput.value).toEqual(expectedDate); - + expect(endDateInput.value).toEqual(expectedInitialDate); }); it('on Selected End Date should not change initial date', () => { const expectedInitialDate = '2020-02-05'; const expectedEndDate = '2020-02-06'; - component.onInitialDatepickerUpdated(expectedInitialDate); + + component.ngOnInit(); fixture.detectChanges(); + const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date'); const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); + startDateInput.value = expectedInitialDate; + endDateInput.value = expectedEndDate; + endDateInput.dispatchEvent(new Event('#end_date')); - expect(endDateInput.value).toEqual(expectedInitialDate); - + expect(endDateInput.value).not.toEqual(startDateInput.value); }); + /* fit('should be ok', () => { + const expectedInitialDate = '2020-02-05'; + const expectedEndDate = '2020-02-06'; + component.ngOnInit(); fixture.detectChanges(); + const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date'); const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); - endDateInput.value = '2021-02-21'; + startDateInput.value = expectedInitialDate; + endDateInput.value = expectedEndDate; endDateInput.dispatchEvent(new Event('#end_date')); - expect(endDateInput.value).toBe('2021-02-21'); + expect(endDateInput.value).not.toEqual(expectedInitialDate); }); + */ /* TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component, From 102a22c91afd511a539dd3242e1be44bffeebbb5 Mon Sep 17 00:00:00 2001 From: wobravo Date: Tue, 23 Feb 2021 12:47:39 -0500 Subject: [PATCH 5/7] fix: TT-149 When edit Date In update the Date Out --- .../details-fields.component.html | 2 +- .../details-fields.component.spec.ts | 30 +++++-------------- .../details-fields.component.ts | 4 +-- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 4cf945809..c1114e007 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -90,7 +90,7 @@ aria-describedby="inputGroup-sizing-sm" [class.is-invalid]="start_date.invalid && start_date.touched" required - (ngModelChange)="onInitialDatepickerUpdated($event)" + (ngModelChange)="onStartDateChange($event)" /> diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index aff85c2db..f156b88f3 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -443,47 +443,31 @@ describe('DetailsFieldsComponent', () => { expect(component.projectSelected.emit).toHaveBeenCalledWith(data); }); - it('on Selected Initial Date should change end date', () => { - const expectedInitialDate = '2020-02-05'; + it('on Selected Start Date should change End Date', () => { + const expectedStartDate = '2020-02-05'; - component.onInitialDatepickerUpdated(expectedInitialDate); + component.onStartDateChange(expectedStartDate); fixture.detectChanges(); const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); - expect(endDateInput.value).toEqual(expectedInitialDate); + expect(endDateInput.value).toEqual(expectedStartDate); }); - it('on Selected End Date should not change initial date', () => { - const expectedInitialDate = '2020-02-05'; + it('on Selected End Date should not change Start Date', () => { + const expectedStartDate = '2020-02-05'; const expectedEndDate = '2020-02-06'; component.ngOnInit(); fixture.detectChanges(); const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date'); const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); - startDateInput.value = expectedInitialDate; + startDateInput.value = expectedStartDate; endDateInput.value = expectedEndDate; endDateInput.dispatchEvent(new Event('#end_date')); expect(endDateInput.value).not.toEqual(startDateInput.value); }); - /* - fit('should be ok', () => { - const expectedInitialDate = '2020-02-05'; - const expectedEndDate = '2020-02-06'; - - component.ngOnInit(); - fixture.detectChanges(); - const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date'); - const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date'); - startDateInput.value = expectedInitialDate; - endDateInput.value = expectedEndDate; - endDateInput.dispatchEvent(new Event('#end_date')); - - expect(endDateInput.value).not.toEqual(expectedInitialDate); - }); - */ /* TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component, diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index 3d0cb1b37..177f1d3f6 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -124,10 +124,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { }); } - onInitialDatepickerUpdated($event: string) { - console.log($event); + onStartDateChange($event: string) { this.end_date.setValue($event); - } From 8f6c6a51604c4536ff09549af68c189872f86e17 Mon Sep 17 00:00:00 2001 From: wobravo Date: Tue, 23 Feb 2021 13:51:55 -0500 Subject: [PATCH 6/7] fix: TT-149 When edit Date In update the Date Out --- .../components/details-fields/details-fields.component.spec.ts | 1 + .../components/details-fields/details-fields.component.ts | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index f156b88f3..b8a0d9abf 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -466,6 +466,7 @@ describe('DetailsFieldsComponent', () => { endDateInput.dispatchEvent(new Event('#end_date')); expect(endDateInput.value).not.toEqual(startDateInput.value); + expect(startDateInput.value).toEqual(expectedStartDate); }); diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index 177f1d3f6..be8c13d9a 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -128,8 +128,6 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { this.end_date.setValue($event); } - - ngOnChanges(): void { this.goingToWorkOnThis = this.entryToEdit ? this.entryToEdit.running : false; this.shouldRestartEntry = false; From 76e4ff5cbd31a1321675da3953d6abe5e748aa40 Mon Sep 17 00:00:00 2001 From: Sandro Castillo Date: Wed, 24 Feb 2021 16:49:41 -0500 Subject: [PATCH 7/7] fix: TT-149 rename tests --- .../details-fields/details-fields.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index b8a0d9abf..5dc627335 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -443,7 +443,7 @@ describe('DetailsFieldsComponent', () => { expect(component.projectSelected.emit).toHaveBeenCalledWith(data); }); - it('on Selected Start Date should change End Date', () => { + it('on selected start_date should change end_date', () => { const expectedStartDate = '2020-02-05'; component.onStartDateChange(expectedStartDate); @@ -453,7 +453,7 @@ describe('DetailsFieldsComponent', () => { expect(endDateInput.value).toEqual(expectedStartDate); }); - it('on Selected End Date should not change Start Date', () => { + it('on selected end_date should not change start_date', () => { const expectedStartDate = '2020-02-05'; const expectedEndDate = '2020-02-06';