fix: Fixing Time picker comparison time in dropdown by palbizu · Pull Request #1364 · hypertrace/hypertrace-ui · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions projects/common/src/time/time.test.ts
4 changes: 4 additions & 0 deletions projects/common/src/time/time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ export class Time {
public toISOString(): string {
return this.date.toISOString().substring(11);
}

public equals(other?: Time): boolean {
return this.toISOString() === other?.toISOString();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fakeAsync } from '@angular/core/testing';
import { NavigationService, Time } from '@hypertrace/common';
import { MemoizeModule, NavigationService, Time } from '@hypertrace/common';
import { createHostFactory, mockProvider, SpectatorHost } from '@ngneat/spectator/jest';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
Expand All @@ -14,7 +14,7 @@ describe('Time Picker Component', () => {
const createHost = createHostFactory({
component: TimePickerComponent,
shallow: true,
imports: [PopoverModule],
imports: [PopoverModule, MemoizeModule],
providers: [
mockProvider(PredefinedTimeService, {
getPredefinedTimes: jest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { PredefinedTimeService } from '../time-range/predefined-time.service';
*ngFor="let predefinedTime of this.predefinedTimes"
(click)="this.onTimeChange(predefinedTime)"
[ngClass]="{
selected: predefinedTime.hours === this.time?.hours && predefinedTime.minutes === this.time?.minutes
selected: this.time && (this.areEqualTimes | htMemoize: this.time:predefinedTime)
}"
>
<span>{{ predefinedTime.label }}</span>
Expand Down Expand Up @@ -81,6 +81,8 @@ export class TimePickerComponent {
this.time = time;
this.timeChange.emit(time);
}

public areEqualTimes = (time: Time, predefinedTime: Time) => time.equals(predefinedTime);
}

export const enum TimePickerDisplayMode {
Expand Down
3 changes: 2 additions & 1 deletion projects/components/src/time-picker/time-picker.module.ts