refactor: move SelectOption interface to the model folder (#953)

BREAKING CHANGES: The `SelectOption` interface has been moved to the select-option.model.ts file of the core/model folder, the related import statements have been adapted.

docs/guides/migrations.md

@@ -17,6 +17,8 @@ With version 2.0 we introduce a renaming of the two standard PWA themes and chan
 With this change the according folders and references had to be renamed/moved and need to be adapted in customer projects as well.
 In projects where the recommended procedure for using a custom theme has been followed (see [Customization Guide - Start Customization](./customizations.md#start-customization)), minimal migration effort should be required.
 
+We moved the model `SelectOption` from the select.component.ts to the select-option.model.ts and adapted all necessary imports.
+
 ## 1.1 to 1.2
 
 The `dist` folder now only contains results of the build process (except for `healthcheck.js`).

projects/organization-management/src/app/components/user-profile-form/user-profile-form.component.ts

@@ -5,7 +5,7 @@ import { pick } from 'lodash-es';
 import { Observable } from 'rxjs';
 
 import { HttpError } from 'ish-core/models/http-error/http-error.model';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { FormsService } from 'ish-shared/forms/utils/forms.service';
 import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
 

src/app/core/models/select-option/select-option.model.ts

@@ -0,0 +1,4 @@
+export interface SelectOption {
+  value: string;
+  label: string;
+}

src/app/extensions/order-templates/facades/order-templates.facade.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { map, startWith, withLatestFrom } from 'rxjs/operators';
 
 import { HttpError } from 'ish-core/models/http-error/http-error.model';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 
 import { OrderTemplate, OrderTemplateHeader } from '../models/order-template/order-template.model';
 import {

src/app/extensions/order-templates/shared/select-order-template-form/select-order-template-form.component.ts

@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 
 import { OrderTemplatesFacade } from '../../facades/order-templates.facade';
 

src/app/extensions/order-templates/shared/select-order-template-modal/select-order-template-modal.component.ts

@@ -16,7 +16,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Observable, Subject, of } from 'rxjs';
 import { filter, map, take, takeUntil } from 'rxjs/operators';
 
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 import { OrderTemplatesFacade } from '../../facades/order-templates.facade';

src/app/extensions/wishlists/shared/select-wishlist-form/select-wishlist-form.component.ts

@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 
 import { WishlistsFacade } from '../../facades/wishlists.facade';
 

src/app/extensions/wishlists/shared/select-wishlist-modal/select-wishlist-modal.component.ts

@@ -15,8 +15,8 @@ import { FormlyFieldConfig } from '@ngx-formly/core';
 import { Observable, Subject, of } from 'rxjs';
 import { filter, map, take, takeUntil } from 'rxjs/operators';
 
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { whenTruthy } from 'ish-core/utils/operators';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 import { WishlistsFacade } from '../../facades/wishlists.facade';

src/app/pages/account-profile-user/account-profile-user/account-profile-user.component.ts

@@ -5,8 +5,8 @@ import { pick } from 'lodash-es';
 import { Observable } from 'rxjs';
 
 import { HttpError } from 'ish-core/models/http-error/http-error.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { User } from 'ish-core/models/user/user.model';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 import { FormsService } from 'ish-shared/forms/utils/forms.service';
 import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';

src/app/pages/checkout-payment/payment-concardis-creditcard/payment-concardis-creditcard.component.ts

@@ -3,8 +3,8 @@ import { FormControl, Validators } from '@angular/forms';
 import { range } from 'lodash-es';
 import { takeUntil } from 'rxjs/operators';
 
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { ScriptLoaderService } from 'ish-core/utils/script-loader/script-loader.service';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 import { PaymentConcardisComponent } from '../payment-concardis/payment-concardis.component';

src/app/pages/checkout-payment/payment-cybersource-creditcard/payment-cybersource-creditcard.component.ts

@@ -16,8 +16,8 @@ import { takeUntil } from 'rxjs/operators';
 
 import { Attribute } from 'ish-core/models/attribute/attribute.model';
 import { PaymentMethod } from 'ish-core/models/payment-method/payment-method.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { ScriptLoaderService } from 'ish-core/utils/script-loader/script-loader.service';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 // tslint:disable:no-any - allows access to cybersource js functionality

src/app/shared/components/basket/basket-cost-center-selection/basket-cost-center-selection.component.ts

@@ -6,8 +6,8 @@ import { distinctUntilChanged, map, shareReplay, switchMap, take, takeUntil } fr
 
 import { AccountFacade } from 'ish-core/facades/account.facade';
 import { CheckoutFacade } from 'ish-core/facades/checkout.facade';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { whenTruthy } from 'ish-core/utils/operators';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 /**

src/app/shared/components/product/product-list-toolbar/product-list-toolbar.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/c
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { SortableAttributesType } from 'ish-core/models/product-listing/product-listing.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { ViewType } from 'ish-core/models/viewtype/viewtype.types';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 
 @Component({
   selector: 'ish-product-list-toolbar',

src/app/shared/formly-address-forms/components/formly-address-form/formly-address-form.component.ts

@@ -6,8 +6,8 @@ import { map } from 'rxjs/operators';
 
 import { AppFacade } from 'ish-core/facades/app.facade';
 import { Address } from 'ish-core/models/address/address.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { AddressFormConfigurationProvider } from 'ish-shared/formly-address-forms/configurations/address-form-configuration.provider';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 
 @Component({
   selector: 'ish-formly-address-form',

src/app/shared/formly/types/select-field/select-field.component.ts

@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { FieldType } from '@ngx-formly/core';
 
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 
 /**
  * Type for a basic select field

src/app/shared/forms/components/select-address/select-address.component.ts

@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Address } from 'ish-core/models/address/address.model';
-import { SelectComponent, SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
+import { SelectComponent } from 'ish-shared/forms/components/select/select.component';
 
 // tslint:disable ish-deprecation
 

src/app/shared/forms/components/select-country/select-country.component.ts

@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Country } from 'ish-core/models/country/country.model';
-import { SelectComponent, SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
+import { SelectComponent } from 'ish-shared/forms/components/select/select.component';
 
 // tslint:disable ish-deprecation
 

src/app/shared/forms/components/select-region/select-region.component.ts

@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Region } from 'ish-core/models/region/region.model';
-import { SelectComponent, SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
+import { SelectComponent } from 'ish-shared/forms/components/select/select.component';
 
 // tslint:disable ish-deprecation
 

src/app/shared/forms/components/select-title/select-title.component.ts

@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
-import { SelectComponent, SelectOption } from 'ish-shared/forms/components/select/select.component';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
+import { SelectComponent } from 'ish-shared/forms/components/select/select.component';
 
 // tslint:disable ish-deprecation
 

src/app/shared/forms/components/select/select.component.spec.ts

@@ -3,10 +3,11 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
 import { TranslateModule } from '@ngx-translate/core';
 import { MockComponent, MockDirective } from 'ng-mocks';
 
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { FormControlFeedbackComponent } from 'ish-shared/forms/components/form-control-feedback/form-control-feedback.component';
 import { ShowFormFeedbackDirective } from 'ish-shared/forms/directives/show-form-feedback.directive';
 
-import { SelectComponent, SelectOption } from './select.component';
+import { SelectComponent } from './select.component';
 
 // tslint:disable ish-deprecation
 

src/app/shared/forms/components/select/select.component.ts

@@ -1,13 +1,9 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { FormElementComponent } from 'ish-shared/forms/components/form-element/form-element.component';
 
-export interface SelectOption {
-  value: string;
-  label: string;
-}
-
 // tslint:disable ish-deprecation
 
 /**

src/app/shared/forms/utils/forms.service.spec.ts

@@ -4,8 +4,8 @@ import { of } from 'rxjs';
 import { instance, mock } from 'ts-mockito';
 
 import { Address } from 'ish-core/models/address/address.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { CoreStoreModule } from 'ish-core/store/core/core-store.module';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 
 import { FormsService } from './forms.service';
 

src/app/shared/forms/utils/forms.service.ts

@@ -5,9 +5,9 @@ import { Observable, OperatorFunction } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { Address } from 'ish-core/models/address/address.model';
+import { SelectOption } from 'ish-core/models/select-option/select-option.model';
 import { getCurrentLocale } from 'ish-core/store/core/configuration';
 import { whenTruthy } from 'ish-core/utils/operators';
-import { SelectOption } from 'ish-shared/forms/components/select/select.component';
 
 /**
  * FormsService.getAddressOptions as a pipeable operator