clean up DigiNg-Modules

-
This commit is contained in:
Daniel Appelgren
2021-12-17 14:28:21 +01:00
parent 3b30c27cfd
commit 2600f61f4f
13 changed files with 13 additions and 68 deletions

View File

@@ -1,14 +1,10 @@
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker';
import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { EmployeeFormComponent } from './employee-form.component'; import { EmployeeFormComponent } from './employee-form.component';
import { UiCheckboxModule } from '@ui/checkbox/checkbox.module';
describe('EmployeeFormComponent', () => { describe('EmployeeFormComponent', () => {
let component: EmployeeFormComponent; let component: EmployeeFormComponent;
@@ -19,16 +15,7 @@ describe('EmployeeFormComponent', () => {
void TestBed.configureTestingModule({ void TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [EmployeeFormComponent], declarations: [EmployeeFormComponent],
imports: [ imports: [RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, UiCheckboxModule],
RouterTestingModule,
HttpClientTestingModule,
ReactiveFormsModule,
DigiNgFormInputModule,
DigiNgFormRadiobuttonGroupModule,
DigiNgFormDatepickerModule,
DigiNgPopoverModule,
DigiNgFormCheckboxModule,
],
}).compileComponents(); }).compileComponents();
}) })
); );

View File

@@ -1,10 +1,4 @@
import { DigiNgButtonModule } from '@af/digi-ng/_button/button';
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { DigiNgLoaderSpinnerModule } from '@af/digi-ng/_loader/loader-spinner';
import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -34,12 +28,7 @@ import { EmployeeFormComponent } from './employee-form.component';
RouterModule.forChild([{ path: '', component: EmployeeFormComponent }]), RouterModule.forChild([{ path: '', component: EmployeeFormComponent }]),
ReactiveFormsModule, ReactiveFormsModule,
LocalDatePipeModule, LocalDatePipeModule,
DigiNgFormRadiobuttonGroupModule, UiCheckboxModule,
DigiNgFormDatepickerModule,
DigiNgPopoverModule,
DigiNgFormCheckboxModule,
DigiNgButtonModule,
DigiNgLoaderSpinnerModule,
UiSkeletonModule, UiSkeletonModule,
UiSelectModule, UiSelectModule,
LayoutModule, LayoutModule,

View File

@@ -1,4 +1,3 @@
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@@ -21,7 +20,6 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
LayoutModule, LayoutModule,
AvropListModule, AvropListModule,
AvropFiltersModule, AvropFiltersModule,
DigiNgProgressProgressbarModule,
UiSkeletonModule, UiSkeletonModule,
UiLoaderModule, UiLoaderModule,
HandledarePickerFormModule, HandledarePickerFormModule,

View File

@@ -1,4 +1,3 @@
import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -40,7 +39,6 @@ import { UiPopoverModule } from '@ui/popover/ui-popover.module';
HideTextModule, HideTextModule,
UiLoaderModule, UiLoaderModule,
HandledarePickerFormModule, HandledarePickerFormModule,
DigiNgPopoverModule,
UiPopoverModule, UiPopoverModule,
UiSkeletonModule, UiSkeletonModule,
UiIconModule, UiIconModule,

View File

@@ -1,5 +1,4 @@
import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker'; import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
@@ -22,7 +21,6 @@ describe('AvvikelseReportFormComponent', () => {
RouterTestingModule, RouterTestingModule,
HttpClientTestingModule, HttpClientTestingModule,
ReactiveFormsModule, ReactiveFormsModule,
DigiNgFormRadiobuttonGroupModule,
DigiNgFormDatepickerModule, DigiNgFormDatepickerModule,
ApmModule, ApmModule,
], ],

View File

@@ -1,8 +1,5 @@
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker'; import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker';
import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -29,9 +26,7 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service';
RouterModule.forChild([{ path: '', component: AvvikelseReportFormComponent }]), RouterModule.forChild([{ path: '', component: AvvikelseReportFormComponent }]),
LayoutModule, LayoutModule,
ReactiveFormsModule, ReactiveFormsModule,
DigiNgFormRadiobuttonGroupModule,
DigiNgFormDatepickerModule, DigiNgFormDatepickerModule,
DigiNgProgressProgressbarModule,
ReportLayoutModule, ReportLayoutModule,
ConfirmDialogModule, ConfirmDialogModule,
UiBackLinkModule, UiBackLinkModule,
@@ -39,7 +34,6 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service';
UiLoaderModule, UiLoaderModule,
UiSelectModule, UiSelectModule,
ReportDescriptionListModule, ReportDescriptionListModule,
DigiNgFormInputModule,
DigiNgDialogModule, DigiNgDialogModule,
UiTextareaModule, UiTextareaModule,
UiLinkButtonModule, UiLinkButtonModule,

View File

@@ -1,5 +1,3 @@
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
@@ -8,6 +6,8 @@ import { LayoutComponent } from '@msfa-shared/components/layout/layout.component
import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component'; import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component';
import { GemensamPlaneringFormService } from './gemensam-planering-form.service'; import { GemensamPlaneringFormService } from './gemensam-planering-form.service';
import { ApmModule } from '@elastic/apm-rum-angular'; import { ApmModule } from '@elastic/apm-rum-angular';
import { UiCheckboxModule } from '@ui/checkbox/checkbox.module';
import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module';
describe('GemensamPlaneringFormComponent', () => { describe('GemensamPlaneringFormComponent', () => {
let component: GemensamPlaneringFormComponent; let component: GemensamPlaneringFormComponent;
@@ -17,13 +17,7 @@ describe('GemensamPlaneringFormComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [GemensamPlaneringFormComponent, LayoutComponent], declarations: [GemensamPlaneringFormComponent, LayoutComponent],
imports: [ imports: [RouterTestingModule, HttpClientTestingModule, ApmModule, UiCheckboxModule, UiRadiobuttonGroupModule],
RouterTestingModule,
HttpClientTestingModule,
DigiNgFormRadiobuttonGroupModule,
DigiNgFormCheckboxModule,
ApmModule,
],
providers: [GemensamPlaneringFormService], providers: [GemensamPlaneringFormService],
}).compileComponents(); }).compileComponents();
}); });

View File

@@ -1,6 +1,4 @@
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -17,6 +15,7 @@ import { ReportDescriptionListModule } from '../../../components/report-descript
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component'; import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component';
import { GemensamPlaneringFormService } from './gemensam-planering-form.service'; import { GemensamPlaneringFormService } from './gemensam-planering-form.service';
import { UiCheckboxModule } from '@ui/checkbox/checkbox.module';
@NgModule({ @NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -25,7 +24,6 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service'
CommonModule, CommonModule,
RouterModule.forChild([{ path: '', component: GemensamPlaneringFormComponent }]), RouterModule.forChild([{ path: '', component: GemensamPlaneringFormComponent }]),
LayoutModule, LayoutModule,
DigiNgProgressProgressbarModule,
UiRadiobuttonGroupModule, UiRadiobuttonGroupModule,
ReactiveFormsModule, ReactiveFormsModule,
ReportLayoutModule, ReportLayoutModule,
@@ -33,7 +31,7 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service'
UiLoaderModule, UiLoaderModule,
ReportDescriptionListModule, ReportDescriptionListModule,
UiSkeletonModule, UiSkeletonModule,
DigiNgFormCheckboxModule, UiCheckboxModule,
DigiNgDialogModule, DigiNgDialogModule,
UiValidationMessageModule, UiValidationMessageModule,
UiLinkButtonModule, UiLinkButtonModule,

View File

@@ -1,4 +1,3 @@
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
@@ -8,6 +7,7 @@ import { LayoutComponent } from '@msfa-shared/components/layout/layout.component
import { InformativRapportFormComponent } from './informativ-rapport-form.component'; import { InformativRapportFormComponent } from './informativ-rapport-form.component';
import { InformativRapportFormService } from './informativ-rapport-form.service'; import { InformativRapportFormService } from './informativ-rapport-form.service';
import { ApmModule } from '@elastic/apm-rum-angular'; import { ApmModule } from '@elastic/apm-rum-angular';
import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module';
describe('InformativRapportFormComponent', () => { describe('InformativRapportFormComponent', () => {
let component: InformativRapportFormComponent; let component: InformativRapportFormComponent;
@@ -17,13 +17,7 @@ describe('InformativRapportFormComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [InformativRapportFormComponent, LayoutComponent], declarations: [InformativRapportFormComponent, LayoutComponent],
imports: [ imports: [RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, ApmModule, UiRadiobuttonGroupModule],
RouterTestingModule,
HttpClientTestingModule,
ReactiveFormsModule,
ApmModule,
DigiNgFormRadiobuttonGroupModule,
],
providers: [InformativRapportFormService], providers: [InformativRapportFormService],
}).compileComponents(); }).compileComponents();
}); });

View File

@@ -1,4 +1,3 @@
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group'; import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@@ -8,6 +7,7 @@ import { LayoutComponent } from '@msfa-shared/components/layout/layout.component
import { PeriodiskRedovisningFormComponent } from './periodisk-redovisning-form.component'; import { PeriodiskRedovisningFormComponent } from './periodisk-redovisning-form.component';
import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.service'; import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.service';
import { ApmModule } from '@elastic/apm-rum-angular'; import { ApmModule } from '@elastic/apm-rum-angular';
import { UiCheckboxModule } from '@ui/checkbox/checkbox.module';
describe('PeriodiskRedovisningFormComponent', () => { describe('PeriodiskRedovisningFormComponent', () => {
let component: PeriodiskRedovisningFormComponent; let component: PeriodiskRedovisningFormComponent;
@@ -22,7 +22,7 @@ describe('PeriodiskRedovisningFormComponent', () => {
ApmModule, ApmModule,
HttpClientTestingModule, HttpClientTestingModule,
DigiNgFormRadiobuttonGroupModule, DigiNgFormRadiobuttonGroupModule,
DigiNgFormCheckboxModule, UiCheckboxModule,
], ],
providers: [PeriodiskRedovisningFormService], providers: [PeriodiskRedovisningFormService],
}).compileComponents(); }).compileComponents();

View File

@@ -1,5 +1,4 @@
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
@@ -35,7 +34,6 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se
UiSelectModule, UiSelectModule,
UiSkeletonModule, UiSkeletonModule,
DigiNgDialogModule, DigiNgDialogModule,
DigiNgFormCheckboxModule,
UiRadiobuttonGroupModule, UiRadiobuttonGroupModule,
UiLinkButtonModule, UiLinkButtonModule,
UiInputModule, UiInputModule,

View File

@@ -1,4 +1,3 @@
import { DigiNgButtonModule } from '@af/digi-ng/_button/button';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@@ -7,6 +6,6 @@ import { LogoutComponent } from './logout.component';
@NgModule({ @NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [LogoutComponent], declarations: [LogoutComponent],
imports: [CommonModule, RouterModule.forChild([{ path: '', component: LogoutComponent }]), DigiNgButtonModule], imports: [CommonModule, RouterModule.forChild([{ path: '', component: LogoutComponent }])],
}) })
export class LogoutModule {} export class LogoutModule {}

View File

@@ -1,4 +1,3 @@
import { DigiNgCardModule } from '@af/digi-ng/_card/card';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@@ -15,7 +14,6 @@ import { StartService } from './start.service';
CommonModule, CommonModule,
RouterModule.forChild([{ path: '', component: StartComponent }]), RouterModule.forChild([{ path: '', component: StartComponent }]),
LayoutModule, LayoutModule,
DigiNgCardModule,
UiLoaderModule, UiLoaderModule,
NewsModule, NewsModule,
], ],