From 3b30c27cfd85803caca7dcbea1bf21c10e04af57 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 15 Dec 2021 13:14:25 +0100 Subject: [PATCH 1/2] Replaced digi-ng-checkbox with ui-checkbox --- .../edit-employee-form.component.html | 19 +++++----- .../employee-form/employee-form.module.ts | 4 +++ .../periodisk-redovisning-form.component.html | 36 ++++++++----------- .../periodisk-redovisning-form.module.ts | 2 ++ .../multiselect-panel.component.html | 18 +++++----- libs/ui/src/multiselect/multiselect.module.ts | 5 +-- 6 files changed, 43 insertions(+), 41 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html index b619519..a0dc841 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html @@ -48,13 +48,13 @@ Du måste välja en eller flera tjänster för att kunna välja utförande verksamheter.

- + uiLabel="Välj alla utförande verksamheter och alla utförande adresser" + [uiInvalid]="editEmployeeFormGroup.errors?.utforandeVerksamheter && (selectAllUtforandeVerksamheterFormControl.touched || utforandeVerksamheterFormControl.touched)" + > + Välj roller
  • - +
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts index 54d2174..5e0b848 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts @@ -16,10 +16,12 @@ import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { RolesDialogModule } from '@msfa-shared/components/roles-dialog/roles-dialog.module'; import { TreeNodesSelectorModule } from '@msfa-shared/components/tree-nodes-selector/tree-nodes-selector.module'; import { LocalDatePipeModule } from '@msfa-shared/pipes/local-date/local-date.module'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; import { UiInputModule } from '@ui/input/input.module'; import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiSelectModule } from '@ui/select/select.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; +import { UiValidationMessageModule } from '@ui/validation-message/validation-message.module'; import { EmployeeDeleteModule } from '../../components/employee-delete/employee-delete.module'; import { EditEmployeeFormComponent } from './edit-employee-form/edit-employee-form.component'; import { EmployeeFormComponent } from './employee-form.component'; @@ -49,6 +51,8 @@ import { EmployeeFormComponent } from './employee-form.component'; RolesDialogModule, UiLinkButtonModule, UiInputModule, + UiCheckboxModule, + UiValidationMessageModule, PreventDoubleSubmitModule, ], }) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html index 911c363..84a3da0 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html @@ -97,15 +97,12 @@ >
- - + >
@@ -115,11 +112,11 @@ *ngFor="let activityFormGroup of activitiesFormArray.controls; let i=index" > - + [uiLabel]="activitiesFormArrayMetadata[i].name" + >
- - + - + >
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts index 7e4c921..8e46ddc 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts @@ -7,6 +7,7 @@ import { RouterModule } from '@angular/router'; import { PreventDoubleSubmitModule } from '@msfa-directives/prevent-double-submit.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { UiBackLinkModule } from '@ui/back-link/back-link.module'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; import { UiInputModule } from '@ui/input/input.module'; import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; @@ -38,6 +39,7 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se UiRadiobuttonGroupModule, UiLinkButtonModule, UiInputModule, + UiCheckboxModule, UiValidationMessageModule, PreventDoubleSubmitModule, ], diff --git a/libs/ui/src/multiselect/multiselect-panel/multiselect-panel.component.html b/libs/ui/src/multiselect/multiselect-panel/multiselect-panel.component.html index 23becb1..eb14900 100644 --- a/libs/ui/src/multiselect/multiselect-panel/multiselect-panel.component.html +++ b/libs/ui/src/multiselect/multiselect-panel/multiselect-panel.component.html @@ -14,12 +14,12 @@ class="multiselect-panel__checkboxes-item" *ngFor="let multiselectOption of availableOptions; let i = index" > - + (uiOnChange)="setOptionState(multiselectOption, $event)" + >
  • - + (uiOnChange)="setOptionState(multiselectOption, $event)" + >
    • diff --git a/libs/ui/src/multiselect/multiselect.module.ts b/libs/ui/src/multiselect/multiselect.module.ts index 7848130..85a78b8 100644 --- a/libs/ui/src/multiselect/multiselect.module.ts +++ b/libs/ui/src/multiselect/multiselect.module.ts @@ -3,13 +3,14 @@ import { A11yModule } from '@angular/cdk/a11y'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; import { MultiselectComponent } from '@ui/multiselect/multiselect.component'; -import { MultiselectPanelComponent } from './multiselect-panel/multiselect-panel.component'; import { UiOverlayModule } from '@ui/overlay/overlay.module'; +import { MultiselectPanelComponent } from './multiselect-panel/multiselect-panel.component'; @NgModule({ declarations: [MultiselectComponent, MultiselectPanelComponent], - imports: [CommonModule, A11yModule, DigiNgFormCheckboxModule, FormsModule, UiOverlayModule], + imports: [CommonModule, A11yModule, DigiNgFormCheckboxModule, FormsModule, UiOverlayModule, UiCheckboxModule], exports: [MultiselectComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) From 2600f61f4f8c937f8c533dbdf05a3611d398879e Mon Sep 17 00:00:00 2001 From: Daniel Appelgren Date: Fri, 17 Dec 2021 14:28:21 +0100 Subject: [PATCH 2/2] clean up DigiNg-Modules - --- .../employee-form.component.spec.ts | 17 ++--------------- .../pages/employee-form/employee-form.module.ts | 13 +------------ .../src/app/pages/avrop/avrop.module.ts | 2 -- .../deltagare-card/deltagare-card.module.ts | 2 -- .../avvikelse-report-form.component.spec.ts | 2 -- .../avvikelse-report-form.module.ts | 6 ------ .../gemensam-planering-form.component.spec.ts | 12 +++--------- .../gemensam-planering-form.module.ts | 6 ++---- .../informativ-rapport-form.component.spec.ts | 10 ++-------- ...periodisk-redovisning-form.component.spec.ts | 4 ++-- .../periodisk-redovisning-form.module.ts | 2 -- .../src/app/pages/logout/logout.module.ts | 3 +-- .../src/app/pages/start/start.module.ts | 2 -- 13 files changed, 13 insertions(+), 68 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.spec.ts index df120a6..1bf1768 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.spec.ts @@ -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 { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { EmployeeFormComponent } from './employee-form.component'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; describe('EmployeeFormComponent', () => { let component: EmployeeFormComponent; @@ -19,16 +15,7 @@ describe('EmployeeFormComponent', () => { void TestBed.configureTestingModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [EmployeeFormComponent], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - ReactiveFormsModule, - DigiNgFormInputModule, - DigiNgFormRadiobuttonGroupModule, - DigiNgFormDatepickerModule, - DigiNgPopoverModule, - DigiNgFormCheckboxModule, - ], + imports: [RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, UiCheckboxModule], }).compileComponents(); }) ); diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts index 5e0b848..1247201 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts @@ -1,10 +1,4 @@ -import { DigiNgButtonModule } from '@af/digi-ng/_button/button'; 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 { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -34,12 +28,7 @@ import { EmployeeFormComponent } from './employee-form.component'; RouterModule.forChild([{ path: '', component: EmployeeFormComponent }]), ReactiveFormsModule, LocalDatePipeModule, - DigiNgFormRadiobuttonGroupModule, - DigiNgFormDatepickerModule, - DigiNgPopoverModule, - DigiNgFormCheckboxModule, - DigiNgButtonModule, - DigiNgLoaderSpinnerModule, + UiCheckboxModule, UiSkeletonModule, UiSelectModule, LayoutModule, diff --git a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.module.ts b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.module.ts index a25db56..30bb3bf 100644 --- a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.module.ts @@ -1,4 +1,3 @@ -import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; @@ -21,7 +20,6 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; LayoutModule, AvropListModule, AvropFiltersModule, - DigiNgProgressProgressbarModule, UiSkeletonModule, UiLoaderModule, HandledarePickerFormModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts index 7719264..00ab051 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts @@ -1,4 +1,3 @@ -import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -40,7 +39,6 @@ import { UiPopoverModule } from '@ui/popover/ui-popover.module'; HideTextModule, UiLoaderModule, HandledarePickerFormModule, - DigiNgPopoverModule, UiPopoverModule, UiSkeletonModule, UiIconModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts index 6100aaa..d7216b7 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts @@ -1,5 +1,4 @@ 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 { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; @@ -22,7 +21,6 @@ describe('AvvikelseReportFormComponent', () => { RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, - DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, ApmModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts index 45d448c..a79c06f 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts @@ -1,8 +1,5 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; 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 { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -29,9 +26,7 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service'; RouterModule.forChild([{ path: '', component: AvvikelseReportFormComponent }]), LayoutModule, ReactiveFormsModule, - DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, - DigiNgProgressProgressbarModule, ReportLayoutModule, ConfirmDialogModule, UiBackLinkModule, @@ -39,7 +34,6 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service'; UiLoaderModule, UiSelectModule, ReportDescriptionListModule, - DigiNgFormInputModule, DigiNgDialogModule, UiTextareaModule, UiLinkButtonModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.spec.ts index 298c5f3..9e3c549 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.spec.ts @@ -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 { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; 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 { GemensamPlaneringFormService } from './gemensam-planering-form.service'; 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', () => { let component: GemensamPlaneringFormComponent; @@ -17,13 +17,7 @@ describe('GemensamPlaneringFormComponent', () => { await TestBed.configureTestingModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [GemensamPlaneringFormComponent, LayoutComponent], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - DigiNgFormRadiobuttonGroupModule, - DigiNgFormCheckboxModule, - ApmModule, - ], + imports: [RouterTestingModule, HttpClientTestingModule, ApmModule, UiCheckboxModule, UiRadiobuttonGroupModule], providers: [GemensamPlaneringFormService], }).compileComponents(); }); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts index 878dc31..b936375 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts @@ -1,6 +1,4 @@ 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 { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; 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 { GemensamPlaneringFormComponent } from './gemensam-planering-form.component'; import { GemensamPlaneringFormService } from './gemensam-planering-form.service'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -25,7 +24,6 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service' CommonModule, RouterModule.forChild([{ path: '', component: GemensamPlaneringFormComponent }]), LayoutModule, - DigiNgProgressProgressbarModule, UiRadiobuttonGroupModule, ReactiveFormsModule, ReportLayoutModule, @@ -33,7 +31,7 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service' UiLoaderModule, ReportDescriptionListModule, UiSkeletonModule, - DigiNgFormCheckboxModule, + UiCheckboxModule, DigiNgDialogModule, UiValidationMessageModule, UiLinkButtonModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.spec.ts index c8a8932..597ce83 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.spec.ts @@ -1,4 +1,3 @@ -import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; 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 { InformativRapportFormService } from './informativ-rapport-form.service'; import { ApmModule } from '@elastic/apm-rum-angular'; +import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module'; describe('InformativRapportFormComponent', () => { let component: InformativRapportFormComponent; @@ -17,13 +17,7 @@ describe('InformativRapportFormComponent', () => { await TestBed.configureTestingModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [InformativRapportFormComponent, LayoutComponent], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - ReactiveFormsModule, - ApmModule, - DigiNgFormRadiobuttonGroupModule, - ], + imports: [RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, ApmModule, UiRadiobuttonGroupModule], providers: [InformativRapportFormService], }).compileComponents(); }); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts index 0b37308..dafa3f3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts @@ -1,4 +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 { 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 { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.service'; import { ApmModule } from '@elastic/apm-rum-angular'; +import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; describe('PeriodiskRedovisningFormComponent', () => { let component: PeriodiskRedovisningFormComponent; @@ -22,7 +22,7 @@ describe('PeriodiskRedovisningFormComponent', () => { ApmModule, HttpClientTestingModule, DigiNgFormRadiobuttonGroupModule, - DigiNgFormCheckboxModule, + UiCheckboxModule, ], providers: [PeriodiskRedovisningFormService], }).compileComponents(); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts index 8e46ddc..a9d7afb 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts @@ -1,5 +1,4 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; -import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -35,7 +34,6 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se UiSelectModule, UiSkeletonModule, DigiNgDialogModule, - DigiNgFormCheckboxModule, UiRadiobuttonGroupModule, UiLinkButtonModule, UiInputModule, diff --git a/apps/mina-sidor-fa/src/app/pages/logout/logout.module.ts b/apps/mina-sidor-fa/src/app/pages/logout/logout.module.ts index c60791d..aab20dd 100644 --- a/apps/mina-sidor-fa/src/app/pages/logout/logout.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/logout/logout.module.ts @@ -1,4 +1,3 @@ -import { DigiNgButtonModule } from '@af/digi-ng/_button/button'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; @@ -7,6 +6,6 @@ import { LogoutComponent } from './logout.component'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [LogoutComponent], - imports: [CommonModule, RouterModule.forChild([{ path: '', component: LogoutComponent }]), DigiNgButtonModule], + imports: [CommonModule, RouterModule.forChild([{ path: '', component: LogoutComponent }])], }) export class LogoutModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/start/start.module.ts b/apps/mina-sidor-fa/src/app/pages/start/start.module.ts index 1cc0307..912e7fc 100644 --- a/apps/mina-sidor-fa/src/app/pages/start/start.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/start/start.module.ts @@ -1,4 +1,3 @@ -import { DigiNgCardModule } from '@af/digi-ng/_card/card'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; @@ -15,7 +14,6 @@ import { StartService } from './start.service'; CommonModule, RouterModule.forChild([{ path: '', component: StartComponent }]), LayoutModule, - DigiNgCardModule, UiLoaderModule, NewsModule, ],