fix: removed all mentions of momentjs

This commit is contained in:
2025-06-11 11:12:05 +02:00
parent 76de91349d
commit 2601396961
6 changed files with 13 additions and 29 deletions

View File

@@ -18,8 +18,8 @@ import { DateTime } from 'luxon';
}) })
class DateSelectorStub { class DateSelectorStub {
@Input() date: string = DateTime.now().toISODate(); @Input() date: string = DateTime.now().toISODate();
@Output() dateChange = new EventEmitter<moment.Moment>(); @Output() dateChange = new EventEmitter<string>();
@Input() filter: (date: moment.Moment | null) => boolean = () => true @Input() filter: (date: DateTime | null) => boolean = () => true
} }
@Component({ @Component({

View File

@@ -5,13 +5,12 @@ import { RouterModule } from '@angular/router';
import { AdminCommService } from '../../admin-comm.service'; import { AdminCommService } from '../../admin-comm.service';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatDatepickerModule } from '@angular/material/datepicker'; 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 { MatIconModule } from '@angular/material/icon';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter';
describe('SummaryComponent', () => { describe('SummaryComponent', () => {
let component: SummaryComponent; let component: SummaryComponent;
@@ -29,10 +28,7 @@ describe('SummaryComponent', () => {
declarations: [SummaryComponent], declarations: [SummaryComponent],
providers: [ providers: [
{ provide: AdminCommService, useValue: acMock }, { provide: AdminCommService, useValue: acMock },
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE, MAT_DATE_FORMATS, MAT_MOMENT_DATE_ADAPTER_OPTIONS] }, provideLuxonDateAdapter()
{ 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 } },
], ],
imports: [ imports: [
RouterModule.forRoot([]), RouterModule.forRoot([]),

View File

@@ -4,8 +4,6 @@ import { MenuNewComponent } from './menu-new.component';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { MAT_DATE_RANGE_SELECTION_STRATEGY, MatDatepickerModule } from '@angular/material/datepicker'; 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 { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FDSelection } from 'src/app/fd.da'; import { FDSelection } from 'src/app/fd.da';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -13,6 +11,7 @@ import { AdminCommService } from '../admin-comm.service';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter';
describe('MenuNewComponent', () => { describe('MenuNewComponent', () => {
let component: MenuNewComponent; let component: MenuNewComponent;
@@ -26,10 +25,7 @@ describe('MenuNewComponent', () => {
declarations: [MenuNewComponent], declarations: [MenuNewComponent],
imports: [MatTableModule, MatInputModule, MatDatepickerModule, BrowserAnimationsModule, ReactiveFormsModule, MatDialogModule, MatIconModule], imports: [MatTableModule, MatInputModule, MatDatepickerModule, BrowserAnimationsModule, ReactiveFormsModule, MatDialogModule, MatIconModule],
providers: [ providers: [
{provide: DateAdapter, useClass: MomentDateAdapter}, provideLuxonDateAdapter(),
{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}},
{provide: MAT_DATE_RANGE_SELECTION_STRATEGY, useClass: FDSelection}, {provide: MAT_DATE_RANGE_SELECTION_STRATEGY, useClass: FDSelection},
{provide: AdminCommService, useValue: acMock} {provide: AdminCommService, useValue: acMock}
], ],

View File

@@ -6,16 +6,15 @@ import { DateSelectorComponent } from '../../commonComponents/date-selector/date
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatDatepickerModule } from '@angular/material/datepicker'; 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 { MatCardModule } from '@angular/material/card';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatDialogRef } from '@angular/material/dialog'; 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 { of } from 'rxjs';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter';
describe('MenuComponent', () => { describe('MenuComponent', () => {
let component: MenuComponent; let component: MenuComponent;
@@ -29,10 +28,7 @@ describe('MenuComponent', () => {
declarations: [ MenuComponent, DateSelectorComponent], declarations: [ MenuComponent, DateSelectorComponent],
providers: [ providers: [
{provide: UpdatesService, useValue: updatesSpy}, {provide: UpdatesService, useValue: updatesSpy},
{provide: DateAdapter, useClass: MomentDateAdapter}, provideLuxonDateAdapter()
{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}},
], ],
imports: [ imports: [
MatIconModule, MatIconModule,

View File

@@ -16,8 +16,8 @@ import { DateTime } from 'luxon';
}) })
class DateSelectorStub { class DateSelectorStub {
@Input() date: string = DateTime.now().toISODate(); @Input() date: string = DateTime.now().toISODate();
@Output() dateChange = new EventEmitter<moment.Moment>(); @Output() dateChange = new EventEmitter<string>();
@Input() filter: (date: moment.Moment | null) => boolean = () => true @Input() filter: (date: DateTime | null) => boolean = () => true
} }
describe('CleanComponent', () => { describe('CleanComponent', () => {

View File

@@ -4,11 +4,10 @@ import { DateSelectorComponent } from './date-selector.component';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatDatepickerModule } from '@angular/material/datepicker'; 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 { MatInputModule } from '@angular/material/input';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { provideLuxonDateAdapter } from '@angular/material-luxon-adapter';
describe('DateSelectorComponent', () => { describe('DateSelectorComponent', () => {
let component: DateSelectorComponent; let component: DateSelectorComponent;
@@ -19,10 +18,7 @@ describe('DateSelectorComponent', () => {
declarations: [DateSelectorComponent], declarations: [DateSelectorComponent],
imports: [MatIconModule, MatFormFieldModule, MatDatepickerModule, ReactiveFormsModule, MatInputModule, BrowserAnimationsModule], imports: [MatIconModule, MatFormFieldModule, MatDatepickerModule, ReactiveFormsModule, MatInputModule, BrowserAnimationsModule],
providers: [ providers: [
{provide: DateAdapter, useClass: MomentDateAdapter}, provideLuxonDateAdapter()
{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}},
] ]
}); });
fixture = TestBed.createComponent(DateSelectorComponent); fixture = TestBed.createComponent(DateSelectorComponent);