feat(ui): Added loader inside ui-lib. (TV-859)

Squashed commit of the following:

commit 21101f1de202e87c27ae7832669e484d163e66b4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Oct 28 11:01:09 2021 +0200

    Updated imports

commit 0d8bee6ac8967f5ddb480eff429e91db812b0f16
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Oct 28 10:42:35 2021 +0200

    Now using loader from inside libs
This commit is contained in:
Erik Tiekstra
2021-10-28 11:38:45 +02:00
parent d3c61a4c56
commit b2ff020edf
53 changed files with 106 additions and 219 deletions

View File

@@ -84,4 +84,4 @@
</section>
</digi-typography>
</msfa-layout>
<msfa-loader *ngIf="submitIsLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitIsLoading$ | async" uiType="absolute"></ui-loader>

View File

@@ -5,7 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { EmployeeInviteComponent } from './employee-invite.component';
@NgModule({
@@ -18,7 +18,7 @@ import { EmployeeInviteComponent } from './employee-invite.component';
BackLinkModule,
ReactiveFormsModule,
DigiNgFormTextareaModule,
LoaderModule
UiLoaderModule,
],
})
export class EmployeeInviteModule {}

View File

@@ -1,5 +1,5 @@
<div class="employees-list">
<msfa-loader *ngIf="employeesLoading" type="absolute"></msfa-loader>
<ui-loader *ngIf="employeesLoading" uiType="absolute"></ui-loader>
<digi-table af-variation="secondary">
<span class="msfa__a11y-sr-only" aria-live="polite">
Totalt {{count}} träffar på personal med max 10 rader på varje sida

View File

@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { EmployeesListComponent } from './employees-list.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [EmployeesListComponent],
imports: [CommonModule, RouterModule, LoaderModule],
imports: [CommonModule, RouterModule, UiLoaderModule],
exports: [EmployeesListComponent],
})
export class EmployeesListModule {}

View File

@@ -103,13 +103,21 @@
<digi-button af-size="m" (afOnClick)="lockSelectedAvrop()">Nästa</digi-button>
</ng-container>
<ng-container *ngSwitchCase="2">
<digi-button [attr.af-aria-label]="'Tillbaka till välj deltagare att tilldela'" af-variation="secondary" af-size="m" (afOnClick)="unlockSelectedAvrop()"
<digi-button
[attr.af-aria-label]="'Tillbaka till välj deltagare att tilldela'"
af-variation="secondary"
af-size="m"
(afOnClick)="unlockSelectedAvrop()"
>Tillbaka
</digi-button>
<digi-button af-size="m" (afOnClick)="confirmHandledare()">Nästa</digi-button>
</ng-container>
<ng-container *ngSwitchCase="3">
<digi-button [attr.af-aria-label]="'Tillbaka till tilldela handledare'" af-variation="secondary" af-size="m" (afOnClick)="unconfirmHandledare()"
<digi-button
[attr.af-aria-label]="'Tillbaka till tilldela handledare'"
af-variation="secondary"
af-size="m"
(afOnClick)="unconfirmHandledare()"
>Tillbaka
</digi-button>
<digi-button af-size="m" (afOnClick)="save()">Bekräfta tilldelning</digi-button>
@@ -127,7 +135,7 @@
</msfa-layout>
<ng-template #loadingRef>
<msfa-loader></msfa-loader>
<ui-loader></ui-loader>
</ng-template>
<ng-template #skeletonRef>

View File

@@ -1,12 +1,12 @@
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { HandledarePickerFormModule } from '@msfa-shared/components/handledare-picker-form/handledare-picker-form.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UnauthorizedAlertModule } from '@msfa-shared/components/unauthorized-alert/unauthorized-alert.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { AvropComponent } from './avrop.component';
import { AvropFiltersModule } from './components/avrop-filters/avrop-filters.module';
import { AvropListModule } from './components/avrop-list/avrop-list.module';
@@ -22,7 +22,7 @@ import { AvropListModule } from './components/avrop-list/avrop-list.module';
AvropFiltersModule,
DigiNgProgressProgressbarModule,
UiSkeletonModule,
LoaderModule,
UiLoaderModule,
HandledarePickerFormModule,
UnauthorizedAlertModule,
],

View File

@@ -49,5 +49,5 @@
</div>
</div>
<ng-template #loadingRef>
<msfa-loader></msfa-loader>
<ui-loader></ui-loader>
</ng-template>

View File

@@ -49,7 +49,7 @@ describe('AvropFiltersComponent', () => {
it('should show loading spinner when filters are loading', () => {
fixture.detectChanges();
const tags = fixture.debugElement.queryAll(By.css('msfa-loader'));
const tags = fixture.debugElement.queryAll(By.css('ui-loader'));
expect(tags.length).toBe(1);
});
});

View File

@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { MultiselectModule } from '@msfa-shared/components/multiselect/multiselect.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { AvropFiltersComponent } from './avrop-filters.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [AvropFiltersComponent],
imports: [CommonModule, MultiselectModule, LoaderModule],
imports: [CommonModule, MultiselectModule, UiLoaderModule],
exports: [AvropFiltersComponent],
})
export class AvropFiltersModule {}

View File

@@ -1,5 +1,5 @@
<div class="avrop-list">
<msfa-loader *ngIf="avropLoading" type="absolute"></msfa-loader>
<ui-loader *ngIf="avropLoading" uiType="absolute"></ui-loader>
<ul class="avrop-list__list">
<li *ngFor="let avrop of avropRows">
<msfa-avrop-row

View File

@@ -1,14 +1,14 @@
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { AvropRowModule } from '../avrop-row/avrop-row.module';
import { AvropListComponent } from './avrop-list.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [AvropListComponent],
imports: [CommonModule, AvropRowModule, LoaderModule, UiSkeletonModule],
imports: [CommonModule, AvropRowModule, UiLoaderModule, UiSkeletonModule],
exports: [AvropListComponent],
})
export class AvropListModule {}

View File

@@ -95,5 +95,5 @@
<dd>Info saknas</dd>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -62,5 +62,5 @@
<p>Inga rapporter finns registrerad.</p>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -4,7 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { DeltagareCardService } from '../../deltagare-card.service';
import { DeltagareTabReportsComponent } from './deltagare-tab-reports.component';
@@ -19,7 +19,7 @@ describe('DeltagareTabReportsComponent', () => {
RouterTestingModule,
HttpClientTestingModule,
ReactiveFormsModule,
LoaderModule,
UiLoaderModule,
DigiNgFormSelectModule,
],
providers: [DeltagareCardService],

View File

@@ -87,5 +87,5 @@
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -2,7 +2,6 @@ import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { DigiNgLayoutExpansionPanelModule } from '@af/digi-ng/_layout/layout-expansion-panel';
import { DigiNgLinkButtonModule } from '@af/digi-ng/_link/link-button';
import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -11,7 +10,8 @@ import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.modu
import { HandledarePickerFormModule } from '@msfa-shared/components/handledare-picker-form/handledare-picker-form.module';
import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { DeltagareTabExperiencesComponent } from './components/deltagare-tab-experiences/deltagare-tab-experiences.component';
import { DeltagareTabPersonalInformationComponent } from './components/deltagare-tab-personal-information/deltagare-tab-personal-information.component';
import { ReportsListModule } from './components/deltagare-tab-reports/components/reports-list/reports-list.module';
@@ -37,7 +37,7 @@ import { DeltagareCardService } from './deltagare-card.service';
LayoutModule,
BackLinkModule,
HideTextModule,
LoaderModule,
UiLoaderModule,
HandledarePickerFormModule,
DigiNgLayoutExpansionPanelModule,
DigiNgPopoverModule,

View File

@@ -105,7 +105,7 @@
afAriaLabel="Förhandsgranska och skicka in Avvikelserapport (avvikelse)"
id="confirmAvvikelserapport"
>
<msfa-loader *ngIf="submitIsLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitIsLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<dt>Orsak till avvikelse:</dt>
<dd>{{(chosenReason$ | async)?.name }}</dd>
@@ -133,11 +133,8 @@
</msfa-report-layout>
</msfa-layout>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Avvikelserapport (avvikelse)"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Avvikelserapport (avvikelse)"></ui-skeleton>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -5,7 +5,6 @@ import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobu
import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { DigiNgFormTextareaModule } from '@af/digi-ng/_form/form-textarea';
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -13,7 +12,8 @@ import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { AvvikelseReportFormComponent } from './avvikelse-report-form.component';
@@ -36,7 +36,7 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service';
BackLinkModule,
UiSkeletonModule,
DigiNgFormSelectModule,
LoaderModule,
UiLoaderModule,
ReportDescriptionListModule,
DigiNgFormInputModule,
DigiNgDialogModule,

View File

@@ -270,7 +270,7 @@
afAriaLabel="Förhandsgranska och skicka in Avvikelserapport (frånvaro)"
id="confirm-franvaro-report"
>
<msfa-loader *ngIf="submitLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<ng-container *ngIf="reasons$ | async as reasons">
<dt>Orsak till frånvaro</dt>
@@ -316,12 +316,9 @@
</msfa-layout>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Avvikelserapport (frånvaro)"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Avvikelserapport (frånvaro)"></ui-skeleton>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -5,14 +5,14 @@ import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobu
import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { DigiNgFormTextareaModule } from '@af/digi-ng/_form/form-textarea';
import { DigiNgFormValidationMessageModule } from '@af/digi-ng/_form/form-validation-message';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { FranvaroReportFormComponent } from './franvaro-report-form.component';
@@ -27,7 +27,7 @@ import { FranvaroReportFormService } from './franvaro-report-form.service';
ReactiveFormsModule,
LayoutModule,
ReportLayoutModule,
LoaderModule,
UiLoaderModule,
BackLinkModule,
ReportDescriptionListModule,
DigiNgFormSelectModule,

View File

@@ -99,7 +99,7 @@
afAriaLabel="Förhandsgranska och skicka in Gemensam planering"
id="confirm-gemensam-planering-form"
>
<msfa-loader *ngIf="submitLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<dt>Deltar arbetssökande på distans?</dt>
<dd>{{gpFormGroup.value.distance ? 'Ja' : 'Nej'}}</dd>
@@ -136,12 +136,9 @@
</msfa-layout>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Gemensam planering"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Gemensam planering"></ui-skeleton>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -2,14 +2,14 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component';
@@ -27,7 +27,7 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service'
ReactiveFormsModule,
ReportLayoutModule,
BackLinkModule,
LoaderModule,
UiLoaderModule,
ReportDescriptionListModule,
UiSkeletonModule,
DigiNgFormCheckboxModule,

View File

@@ -96,7 +96,7 @@
afAriaLabel="Förhandsgranska och skicka in Informativ rapport"
id="confirm-informativ-rapport"
>
<msfa-loader *ngIf="submitLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<ng-container *ngIf="submitData$ | async; let submitData; else loadingRef">
<dt>Vad gäller ärendet</dt>
@@ -152,12 +152,9 @@
</msfa-layout>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Informativ rapport"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Informativ rapport"></ui-skeleton>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -189,7 +189,7 @@
afAriaLabel="Förhandsgranska och skicka in Periodisk redovisning"
id="confirm-periodisk-redovisning-form"
>
<msfa-loader *ngIf="submitIsLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitIsLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<ng-container *ngIf="submitData$ | async; let submitData; else loadingRef">
<dt>Har ni under perioden tillhandahållit språkstöd till deltagaren:</dt>
@@ -280,12 +280,9 @@
</ng-template>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Periodisk redovisning"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Periodisk redovisning"></ui-skeleton>
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -2,14 +2,14 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { PeriodiskRedovisningFormComponent } from './periodisk-redovisning-form.component';
@@ -26,7 +26,7 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se
ReportLayoutModule,
ReportDescriptionListModule,
BackLinkModule,
LoaderModule,
UiLoaderModule,
UiSkeletonModule,
DigiNgDialogModule,
DigiNgFormSelectModule,

View File

@@ -122,7 +122,7 @@
afAriaLabel="Förhandsgranska och skicka in Signal om arbete eller studier"
id="confirm-signal"
>
<msfa-loader *ngIf="submitLoading$ | async" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitLoading$ | async" uiType="absolute"></ui-loader>
<msfa-report-description-list [avrop]="avrop">
<dt>Typ av sysselsättning</dt>
<dd>{{typeFormControl.value}}</dd>
@@ -152,8 +152,5 @@
</msfa-layout>
<ng-template #skeletonRef>
<ui-skeleton
[uiCount]="3"
uiText="Laddar data för att kunna skapa Signal om arbete eller studier"
></ui-skeleton>
<ui-skeleton [uiCount]="3" uiText="Laddar data för att kunna skapa Signal om arbete eller studier"></ui-skeleton>
</ng-template>

View File

@@ -27,5 +27,5 @@
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -1,10 +1,10 @@
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { AvvikelseReportViewComponent } from './avvikelse-report-view.component';
import { AvvikelseReportViewService } from './avvikelse-report-view.service';
@@ -18,7 +18,7 @@ import { AvvikelseReportViewService } from './avvikelse-report-view.service';
LayoutModule,
ReportLayoutModule,
BackLinkModule,
LoaderModule,
UiLoaderModule,
UiSkeletonModule,
],
providers: [AvvikelseReportViewService],

View File

@@ -43,5 +43,5 @@
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -1,10 +1,10 @@
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { FranvaroReportViewComponent } from './franvaro-report-view.component';
import { FranvaroReportViewService } from './franvaro-report-view.service';
@@ -18,7 +18,7 @@ import { FranvaroReportViewService } from './franvaro-report-view.service';
LayoutModule,
ReportLayoutModule,
BackLinkModule,
LoaderModule,
UiLoaderModule,
UiSkeletonModule,
],
providers: [FranvaroReportViewService],

View File

@@ -33,5 +33,5 @@
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -1,10 +1,10 @@
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { GemensamPlaneringViewComponent } from './gemensam-planering-view.component';
import { GemensamPlaneringViewService } from './gemensam-planering-view.service';
@@ -18,8 +18,8 @@ import { GemensamPlaneringViewService } from './gemensam-planering-view.service'
LayoutModule,
ReportLayoutModule,
BackLinkModule,
LoaderModule,
UiSkeletonModule
UiLoaderModule,
UiSkeletonModule,
],
providers: [GemensamPlaneringViewService],
exports: [GemensamPlaneringViewComponent],

View File

@@ -38,5 +38,5 @@
</ng-template>
<ng-template #loadingRef>
<msfa-loader type="padded"></msfa-loader>
<ui-loader uiType="padded"></ui-loader>
</ng-template>

View File

@@ -1,11 +1,11 @@
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
import { PeriodiskRedovisningViewComponent } from './periodisk-redovisning-view.component';
import { PeriodiskRedovisningViewService } from './periodisk-redovisning-view.service';
@@ -19,7 +19,7 @@ import { PeriodiskRedovisningViewService } from './periodisk-redovisning-view.se
LayoutModule,
ReportLayoutModule,
BackLinkModule,
LoaderModule,
UiLoaderModule,
HideTextModule,
UiSkeletonModule,
],

View File

@@ -1,5 +1,5 @@
<div class="deltagare-list">
<msfa-loader *ngIf="deltagareLoading" type="absolute"></msfa-loader>
<ui-loader *ngIf="deltagareLoading" uiType="absolute"></ui-loader>
<digi-table af-variation="secondary">
<span class="msfa__a11y-sr-only" aria-live="polite">
Totalt {{count}} träffar på deltagare med max 10 rader på varje sida

View File

@@ -3,14 +3,14 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { IconModule } from '@msfa-shared/components/icon/icon.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { DeltagareListHandelserDialogComponent } from '../deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component';
import { DeltagareListTableComponent } from './deltagare-list-table.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [DeltagareListTableComponent, DeltagareListHandelserDialogComponent],
imports: [CommonModule, RouterModule, IconModule, LoaderModule, DigiNgDialogModule],
imports: [CommonModule, RouterModule, IconModule, UiLoaderModule, DigiNgDialogModule],
exports: [DeltagareListTableComponent],
})
export class DeltagareListTableModule {}

View File

@@ -16,5 +16,5 @@
</msfa-layout>
<ng-template #loadingRef>
<msfa-loader type="full-blank-screen"></msfa-loader>
<ui-loader uiType="full-blank-screen"></ui-loader>
</ng-template>

View File

@@ -1,14 +1,14 @@
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { OrganizationPickerFormModule } from '@msfa-shared/components/organization-picker-form/organization-picker-form.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { OrganizationPickerRoutingModule } from './organization-picker-routing.module';
import { OrganizationPickerComponent } from './organization-picker.component';
@NgModule({
declarations: [OrganizationPickerComponent],
imports: [CommonModule, LayoutModule, OrganizationPickerRoutingModule, OrganizationPickerFormModule, LoaderModule],
imports: [CommonModule, LayoutModule, OrganizationPickerRoutingModule, OrganizationPickerFormModule, UiLoaderModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
export class OrganizationPickerModule {}

View File

@@ -39,5 +39,5 @@
</msfa-layout>
<ng-template #loadingRef>
<msfa-loader type="full-screen"></msfa-loader>
<ui-loader uiType="full-screen"></ui-loader>
</ng-template>

View File

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { StartComponent } from './start.component';
@NgModule({
@@ -14,7 +14,7 @@ import { StartComponent } from './start.component';
RouterModule.forChild([{ path: '', component: StartComponent }]),
LayoutModule,
DigiNgCardModule,
LoaderModule,
UiLoaderModule,
],
})
export class StartModule {}

View File

@@ -31,5 +31,5 @@
Vald handledare har uppdaterats
</digi-form-validation-message>
</div>
<msfa-loader *ngIf="submitHandledareLoading$ | async" size="s" type="absolute"></msfa-loader>
<ui-loader *ngIf="submitHandledareLoading$ | async" uiSize="s" uiType="absolute"></ui-loader>
</form>

View File

@@ -2,13 +2,13 @@ import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { LoaderModule } from '../loader/loader.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { HandledarePickerFormComponent } from './handledare-picker-form.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [HandledarePickerFormComponent],
imports: [CommonModule, ReactiveFormsModule, LoaderModule, DigiNgFormSelectModule],
imports: [CommonModule, ReactiveFormsModule, UiLoaderModule, DigiNgFormSelectModule],
exports: [HandledarePickerFormComponent],
})
export class HandledarePickerFormModule {}

View File

@@ -19,4 +19,4 @@
<msfa-footer class="msfa__footer"></msfa-footer>
</div>
<msfa-loader *ngIf="(userLoading$ | async) || (rolesLoading$ | async)" type="full-screen"></msfa-loader>
<ui-loader *ngIf="(userLoading$ | async) || (rolesLoading$ | async)" uiType="full-screen"></ui-loader>

View File

@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
import { HttpClient } from '@angular/common/http';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { MarkdownModule } from 'ngx-markdown';
import { LoaderModule } from '../loader/loader.module';
import { FooterModule } from './components/footer/footer.module';
import { NavigationModule } from './components/navigation/navigation.module';
import { SidebarModule } from './components/sidebar/sidebar.module';
@@ -23,7 +23,7 @@ import { LayoutComponent } from './layout.component';
FooterModule,
MarkdownModule.forRoot({ loader: HttpClient }),
DigiNgNavigationBreadcrumbsModule,
LoaderModule,
UiLoaderModule,
],
exports: [LayoutComponent],
})

View File

@@ -1,3 +0,0 @@
<div [ngClass]="loaderClass">
<digi-icon-spinner [ngClass]="spinnerClass"></digi-icon-spinner>
</div>

View File

@@ -1,40 +0,0 @@
@import 'mixins/backdrop';
@import 'variables/gutters';
@import 'variables/z-index';
@keyframes spinning {
to {
transform: rotate(360deg);
}
}
.loader {
display: flex;
align-items: center;
justify-content: center;
&--padded {
padding: $digi--layout--gutter--l;
}
&--absolute {
@include msfa__backdrop($msfa__z-index-backdrop, false);
}
&--full-screen {
@include msfa__backdrop($msfa__z-index-backdrop);
}
&--full-blank-screen {
@include msfa__backdrop($msfa__z-index-backdrop, true, true);
}
&__spinner {
display: inline-flex;
animation: spinning 1s linear infinite;
&--s {
width: 2.5rem;
}
}
}

View File

@@ -1,26 +0,0 @@
/* tslint:disable:no-unused-variable */
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { LoaderComponent } from './loader.component';
describe('LoaderComponent', () => {
let component: LoaderComponent;
let fixture: ComponentFixture<LoaderComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [LoaderComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(LoaderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,25 +0,0 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { LoaderType } from '@msfa-enums/loader-type.enum';
@Component({
selector: 'msfa-loader',
templateUrl: './loader.component.html',
styleUrls: ['./loader.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class LoaderComponent {
private readonly _defaultClass = 'loader';
@Input() type: LoaderType;
@Input() size: 's' | 'm' = 'm';
get loaderClass(): string {
if (this.type) {
return `${this._defaultClass} ${this._defaultClass}--${this.type as string}`;
}
return this._defaultClass;
}
get spinnerClass(): string {
return `${this._defaultClass}__spinner ${this._defaultClass}__spinner--${this.size}`;
}
}

View File

@@ -1,11 +0,0 @@
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LoaderComponent } from './loader.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [LoaderComponent],
imports: [CommonModule],
exports: [LoaderComponent],
})
export class LoaderModule {}

View File

@@ -1,6 +0,0 @@
export enum LoaderType {
FULL_SCREEN = 'fullscreen',
FULL_BLANK_SCREEN = 'full-blank-screen',
ABSOLUTE = 'absolute',
PADDED = 'padded',
}

View File

@@ -1,4 +1,4 @@
<div [ngClass]="loaderClass">
asdf
<digi-icon-spinner [ngClass]="spinnerClass"></digi-icon-spinner>
<span class="ui-loader__text" *ngIf="uiShowLoadingText">{{uiLoadingText}}</span>
</div>

View File

@@ -10,6 +10,8 @@
.ui-loader {
display: flex;
flex-direction: column;
gap: $digi--layout--gutter--s;
align-items: center;
justify-content: center;
@@ -37,4 +39,8 @@
width: 2.5rem;
}
}
&__text {
font-size: var(--digi--typography--font-size--s);
}
}

View File

@@ -11,6 +11,8 @@ export class LoaderComponent {
private readonly _defaultClass = 'ui-loader';
@Input() uiType: UiLoaderType = UiLoaderType.PADDED;
@Input() uiSize: 's' | 'm' = 'm';
@Input() uiShowLoadingText = false;
@Input() uiLoadingText = 'Laddar innehåll';
get loaderClass(): string {
if (this.uiType) {