From 2601396961cf6920bfeaeab92460159656e43b58 Mon Sep 17 00:00:00 2001 From: Jan Szumotalski Date: Wed, 11 Jun 2025 11:12:05 +0200 Subject: [PATCH] fix: removed all mentions of momentjs --- src/app/admin-view/grades/grades.component.spec.ts | 4 ++-- .../grades/summary/summary.component.spec.ts | 8 ++------ src/app/admin-view/menu-new/menu-new.component.spec.ts | 8 ++------ src/app/app-view/menu/menu.component.spec.ts | 10 +++------- .../app-view/personal/clean/clean.component.spec.ts | 4 ++-- .../date-selector/date-selector.component.spec.ts | 8 ++------ 6 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/app/admin-view/grades/grades.component.spec.ts b/src/app/admin-view/grades/grades.component.spec.ts index 4a7d185..63c5104 100644 --- a/src/app/admin-view/grades/grades.component.spec.ts +++ b/src/app/admin-view/grades/grades.component.spec.ts @@ -18,8 +18,8 @@ import { DateTime } from 'luxon'; }) class DateSelectorStub { @Input() date: string = DateTime.now().toISODate(); - @Output() dateChange = new EventEmitter(); - @Input() filter: (date: moment.Moment | null) => boolean = () => true + @Output() dateChange = new EventEmitter(); + @Input() filter: (date: DateTime | null) => boolean = () => true } @Component({ diff --git a/src/app/admin-view/grades/summary/summary.component.spec.ts b/src/app/admin-view/grades/summary/summary.component.spec.ts index a181634..1641397 100644 --- a/src/app/admin-view/grades/summary/summary.component.spec.ts +++ b/src/app/admin-view/grades/summary/summary.component.spec.ts @@ -5,13 +5,12 @@ import { RouterModule } from '@angular/router'; import { AdminCommService } from '../../admin-comm.service'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MAT_MOMENT_DATE_FORMATS, MomentDateAdapter, provideMomentDateAdapter } from '@angular/material-moment-adapter'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; import { MatIconModule } from '@angular/material/icon'; import { of } from 'rxjs'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatTableModule } from '@angular/material/table'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter'; describe('SummaryComponent', () => { let component: SummaryComponent; @@ -29,10 +28,7 @@ describe('SummaryComponent', () => { declarations: [SummaryComponent], providers: [ { provide: AdminCommService, useValue: acMock }, - { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE, MAT_DATE_FORMATS, MAT_MOMENT_DATE_ADAPTER_OPTIONS] }, - { provide: MAT_DATE_LOCALE, useValue: "pl-PL" }, - { provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS }, - { provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }, + provideLuxonDateAdapter() ], imports: [ RouterModule.forRoot([]), diff --git a/src/app/admin-view/menu-new/menu-new.component.spec.ts b/src/app/admin-view/menu-new/menu-new.component.spec.ts index 8a7d1e1..eb0ee61 100644 --- a/src/app/admin-view/menu-new/menu-new.component.spec.ts +++ b/src/app/admin-view/menu-new/menu-new.component.spec.ts @@ -4,8 +4,6 @@ import { MenuNewComponent } from './menu-new.component'; import { MatTableModule } from '@angular/material/table'; import { MatInputModule } from '@angular/material/input'; import { MAT_DATE_RANGE_SELECTION_STRATEGY, MatDatepickerModule } from '@angular/material/datepicker'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; -import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from '@angular/material-moment-adapter'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FDSelection } from 'src/app/fd.da'; import { ReactiveFormsModule } from '@angular/forms'; @@ -13,6 +11,7 @@ import { AdminCommService } from '../admin-comm.service'; import { of } from 'rxjs'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; +import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter'; describe('MenuNewComponent', () => { let component: MenuNewComponent; @@ -26,10 +25,7 @@ describe('MenuNewComponent', () => { declarations: [MenuNewComponent], imports: [MatTableModule, MatInputModule, MatDatepickerModule, BrowserAnimationsModule, ReactiveFormsModule, MatDialogModule, MatIconModule], providers: [ - {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MAT_DATE_LOCALE, useValue: "pl-PL"}, - {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, - {provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: {useUtc: true}}, + provideLuxonDateAdapter(), {provide: MAT_DATE_RANGE_SELECTION_STRATEGY, useClass: FDSelection}, {provide: AdminCommService, useValue: acMock} ], diff --git a/src/app/app-view/menu/menu.component.spec.ts b/src/app/app-view/menu/menu.component.spec.ts index 059df4f..a44fec2 100644 --- a/src/app/app-view/menu/menu.component.spec.ts +++ b/src/app/app-view/menu/menu.component.spec.ts @@ -6,16 +6,15 @@ import { DateSelectorComponent } from '../../commonComponents/date-selector/date import { MatIconModule } from '@angular/material/icon'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; -import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from '@angular/material-moment-adapter'; import { MatCardModule } from '@angular/material/card'; import { ReactiveFormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatDialogRef } from '@angular/material/dialog'; -import { MatBottomSheet, MatBottomSheetModule } from '@angular/material/bottom-sheet'; +import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; import { of } from 'rxjs'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter'; describe('MenuComponent', () => { let component: MenuComponent; @@ -29,10 +28,7 @@ describe('MenuComponent', () => { declarations: [ MenuComponent, DateSelectorComponent], providers: [ {provide: UpdatesService, useValue: updatesSpy}, - {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MAT_DATE_LOCALE, useValue: "pl-PL"}, - {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, - {provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: {useUtc: true}}, + provideLuxonDateAdapter() ], imports: [ MatIconModule, diff --git a/src/app/app-view/personal/clean/clean.component.spec.ts b/src/app/app-view/personal/clean/clean.component.spec.ts index 969d7ff..67374ab 100644 --- a/src/app/app-view/personal/clean/clean.component.spec.ts +++ b/src/app/app-view/personal/clean/clean.component.spec.ts @@ -16,8 +16,8 @@ import { DateTime } from 'luxon'; }) class DateSelectorStub { @Input() date: string = DateTime.now().toISODate(); - @Output() dateChange = new EventEmitter(); - @Input() filter: (date: moment.Moment | null) => boolean = () => true + @Output() dateChange = new EventEmitter(); + @Input() filter: (date: DateTime | null) => boolean = () => true } describe('CleanComponent', () => { diff --git a/src/app/commonComponents/date-selector/date-selector.component.spec.ts b/src/app/commonComponents/date-selector/date-selector.component.spec.ts index bd8e638..5e1bd37 100644 --- a/src/app/commonComponents/date-selector/date-selector.component.spec.ts +++ b/src/app/commonComponents/date-selector/date-selector.component.spec.ts @@ -4,11 +4,10 @@ import { DateSelectorComponent } from './date-selector.component'; import { MatIconModule } from '@angular/material/icon'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; -import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from '@angular/material-moment-adapter'; import { MatInputModule } from '@angular/material/input'; import { ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter'; describe('DateSelectorComponent', () => { let component: DateSelectorComponent; @@ -19,10 +18,7 @@ describe('DateSelectorComponent', () => { declarations: [DateSelectorComponent], imports: [MatIconModule, MatFormFieldModule, MatDatepickerModule, ReactiveFormsModule, MatInputModule, BrowserAnimationsModule], providers: [ - {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MAT_DATE_LOCALE, useValue: "pl-PL"}, - {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, - {provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: {useUtc: true}}, + provideLuxonDateAdapter() ] }); fixture = TestBed.createComponent(DateSelectorComponent);