arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature(digi-migrering): Utfasning av digi-ng-form-select referenser till ui. (TV-864)

Browse Source 
Merge in TEA/mina-sidor-fa-web from next to develop

Squashed commit of the following:

commit b471feb119
Author: Nikola Holst Nikolic <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Nov 26 09:53:45 2021 +0100

    feature(digi-migrering): Utfasning av digi-ng-form-select referenser till ui. (TV-864)

    Merge in TEA/mina-sidor-fa-web from feature/TV-864-digi-ng-form-select to next

    Squashed commit of the following:

    commit 8fa5927514505947ac9be08f880397e2658cdc39
    Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
    Date:   Wed Nov 24 15:37:56 2021 +0100

        Prevent digi-core´s warning message in console. Already solved in feature "TV-874-upload file" but this ticket will be releaced before that so made the change here too.

    commit 7100ef767c746f34f354bfb8537f570b0ae9b007
    Merge: 625e77a4 e36f910b
    Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
    Date:   Wed Nov 24 15:25:32 2021 +0100

        Merge branch 'develop' into feature/TV-864-digi-ng-form-select

    commit 625e77a42f7fcf37219c4377f3f31db33228310d
    Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
    Date:   Wed Nov 24 14:54:58 2021 +0100

        Changed import references from digi-ng´s form-select to ui´s select-option
This commit is contained in:
Nikola Holst Nikolic
2021-11-26 10:22:41 +01:00
parent 3b72294ea2
commit bf95130907
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts
+2 -2
View File
@@ -1,4 +1,4 @@
import { FormSelectItem } from '@af/digi-ng/_form/form-select';
import { SelectOption } from '@ui/select/select-option.model';
import {
ChangeDetectionStrategy,
Component,
@@ -32,7 +32,7 @@ export class HandledarePickerFormComponent implements OnChanges {
formGroup: FormGroup = new FormGroup({
handledare: new FormControl(null, [RequiredValidator('Handledare är obligatorisk')]),
});
selectableHandledare: FormSelectItem[] = [];
selectableHandledare: SelectOption[] = [];
submitted = false;
lastSavedHandledare$: Observable<Handledare> = this.handledareService.lastSavedHandledare$;
submitHandledareLoading$: Observable<boolean> = this.handledareService.submitHandledareLoading$;
apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts
+2 -2
View File
@@ -1,4 +1,4 @@
import { FormSelectItem } from '@af/digi-ng/_form/form-select';
import { SelectOption } from '@ui/select/select-option.model';
import {
ChangeDetectionStrategy,
Component,
@@ -29,7 +29,7 @@ export class OrganizationPickerFormComponent implements OnChanges {
organizationPickerFormGroup: FormGroup = new FormGroup({
organization: new FormControl(null, [RequiredValidator('Organisation är obligatorisk')]),
});
selectableOrganizations: Array<FormSelectItem> = [];
selectableOrganizations: Array<SelectOption> = [];
ngOnChanges(changes: SimpleChanges): void {
if (changes.selectedOrganization) {