diff --git a/apps/isa-app/src/app/app-swagger.module.ts b/apps/isa-app/src/app/app-swagger.module.ts index 653583138..28d097aa1 100644 --- a/apps/isa-app/src/app/app-swagger.module.ts +++ b/apps/isa-app/src/app/app-swagger.module.ts @@ -1,16 +1,16 @@ import { HttpInterceptorFn, provideHttpClient, withInterceptors } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { Config } from '@core/config'; -import { AvConfiguration } from '@swagger/availability'; -import { CatConfiguration } from '@swagger/cat'; -import { CheckoutConfiguration } from '@swagger/checkout'; -import { CrmConfiguration } from '@swagger/crm'; -import { EisConfiguration } from '@swagger/eis'; -import { IsaConfiguration } from '@swagger/isa'; -import { OmsConfiguration } from '@swagger/oms'; -import { PrintConfiguration } from '@swagger/print'; -import { RemiConfiguration } from '@swagger/remi'; -import { WwsConfiguration } from '@swagger/wws'; +import { AvConfiguration } from '@generated/swagger/availability-api'; +import { CatConfiguration } from '@generated/swagger/cat-search-api'; +import { CheckoutConfiguration } from '@generated/swagger/checkout-api'; +import { CrmConfiguration } from '@generated/swagger/crm-api'; +import { EisConfiguration } from '@generated/swagger/eis-api'; +import { IsaConfiguration } from '@generated/swagger/isa-api'; +import { OmsConfiguration } from '@generated/swagger/oms-api'; +import { PrintConfiguration } from '@generated/swagger/print-api'; +import { RemiConfiguration } from '@generated/swagger/inventory-api'; +import { WwsConfiguration } from '@generated/swagger/wws-api'; export function createConfigurationFactory(name: string) { return function (config: Config): { rootUrl: string } { diff --git a/apps/isa-app/src/app/app.component.spec.ts b/apps/isa-app/src/app/app.component.spec.ts index 02a41d408..ce54fbc2d 100644 --- a/apps/isa-app/src/app/app.component.spec.ts +++ b/apps/isa-app/src/app/app.component.spec.ts @@ -8,7 +8,7 @@ import { Renderer2 } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SwUpdate } from '@angular/service-worker'; import { NotificationsHub } from '@hub/notifications'; -import { UserStateService } from '@swagger/isa'; +import { UserStateService } from '@generated/swagger/isa-api'; import { UiModalService } from '@ui/modal'; import { AuthService } from '@core/auth'; diff --git a/apps/isa-app/src/app/app.component.ts b/apps/isa-app/src/app/app.component.ts index 8e4bde40a..11b031774 100644 --- a/apps/isa-app/src/app/app.component.ts +++ b/apps/isa-app/src/app/app.component.ts @@ -7,7 +7,7 @@ import { Config } from '@core/config'; import { NotificationsHub } from '@hub/notifications'; import packageInfo from 'packageJson'; import { asapScheduler, interval, Subscription } from 'rxjs'; -import { UserStateService } from '@swagger/isa'; +import { UserStateService } from '@generated/swagger/isa-api'; import { IsaLogProvider } from './providers'; import { EnvironmentService } from '@core/environment'; import { AuthService, LoginStrategy } from '@core/auth'; diff --git a/apps/isa-app/src/app/commands/create-customer.command.ts b/apps/isa-app/src/app/commands/create-customer.command.ts index db450eebf..5a1018cbd 100644 --- a/apps/isa-app/src/app/commands/create-customer.command.ts +++ b/apps/isa-app/src/app/commands/create-customer.command.ts @@ -3,11 +3,14 @@ import { Router } from '@angular/router'; import { ApplicationService } from '@core/application'; import { ActionHandler } from '@core/command'; import { Result } from '@domain/defs'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; @Injectable() export class CreateCustomerCommand extends ActionHandler> { - constructor(private _router: Router, private _application: ApplicationService) { + constructor( + private _router: Router, + private _application: ApplicationService, + ) { super('CREATE_CUSTOMER'); } diff --git a/apps/isa-app/src/app/commands/create-kubi-customer.command.ts b/apps/isa-app/src/app/commands/create-kubi-customer.command.ts index 5e4e7ba61..9296117f3 100644 --- a/apps/isa-app/src/app/commands/create-kubi-customer.command.ts +++ b/apps/isa-app/src/app/commands/create-kubi-customer.command.ts @@ -4,7 +4,7 @@ import { ApplicationService } from '@core/application'; import { ActionHandler } from '@core/command'; import { Result } from '@domain/defs'; import { encodeFormData, mapCustomerInfoDtoToCustomerCreateFormData } from '@page/customer'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; @Injectable() export class CreateKubiCustomerCommand extends ActionHandler> { diff --git a/apps/isa-app/src/app/commands/print-kubi-agb.command.ts b/apps/isa-app/src/app/commands/print-kubi-agb.command.ts index a9f666885..4fd75210f 100644 --- a/apps/isa-app/src/app/commands/print-kubi-agb.command.ts +++ b/apps/isa-app/src/app/commands/print-kubi-agb.command.ts @@ -3,12 +3,15 @@ import { ActionHandler } from '@core/command'; import { Result } from '@domain/defs'; import { DomainPrinterService } from '@domain/printer'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { UiModalService } from '@ui/modal'; @Injectable() export class PrintKubiCustomerCommand extends ActionHandler> { - constructor(private _uiModal: UiModalService, private _printerService: DomainPrinterService) { + constructor( + private _uiModal: UiModalService, + private _printerService: DomainPrinterService, + ) { super('PRINT_KUBI_AGB'); } diff --git a/apps/isa-app/src/app/guards/is-authenticated.guard.ts b/apps/isa-app/src/app/guards/is-authenticated.guard.ts index 7435b4215..1334c628f 100644 --- a/apps/isa-app/src/app/guards/is-authenticated.guard.ts +++ b/apps/isa-app/src/app/guards/is-authenticated.guard.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; import { AuthService } from '@core/auth'; import { ScanAdapterService } from '@adapter/scan'; -import { AuthService as IsaAuthService } from '@swagger/isa'; +import { AuthService as IsaAuthService } from '@generated/swagger/isa-api'; import { UiConfirmModalComponent, UiErrorModalComponent, UiModalResult, UiModalService } from '@ui/modal'; import { EnvironmentService } from '@core/environment'; import { injectNetworkStatus$ } from '../services/network-status.service'; diff --git a/apps/isa-app/src/app/preview/preview.component.ts b/apps/isa-app/src/app/preview/preview.component.ts index a48e749cc..6437fe2fc 100644 --- a/apps/isa-app/src/app/preview/preview.component.ts +++ b/apps/isa-app/src/app/preview/preview.component.ts @@ -2,7 +2,7 @@ import { Platform, PlatformModule } from '@angular/cdk/platform'; import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { BehaviorSubject } from 'rxjs'; @Component({ diff --git a/apps/isa-app/src/app/providers/isa.log-provider.ts b/apps/isa-app/src/app/providers/isa.log-provider.ts index b0d756a7f..cbe728730 100644 --- a/apps/isa-app/src/app/providers/isa.log-provider.ts +++ b/apps/isa-app/src/app/providers/isa.log-provider.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { LogLevel, LogProvider } from '@core/logger'; -import { UserStateService } from '@swagger/isa'; +import { UserStateService } from '@generated/swagger/isa-api'; import { environment } from '../../environments/environment'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/app/store/root-state.service.ts b/apps/isa-app/src/app/store/root-state.service.ts index 9623ebd5d..619ba3d81 100644 --- a/apps/isa-app/src/app/store/root-state.service.ts +++ b/apps/isa-app/src/app/store/root-state.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Logger, LogLevel } from '@core/logger'; import { Store } from '@ngrx/store'; -import { UserStateService } from '@swagger/isa'; +import { UserStateService } from '@generated/swagger/isa-api'; import { debounceTime, switchMap, takeUntil } from 'rxjs/operators'; import { RootState } from './root.state'; import packageInfo from 'packageJson'; diff --git a/apps/isa-app/src/core/application/application.service.ts b/apps/isa-app/src/core/application/application.service.ts index e77e46450..367309717 100644 --- a/apps/isa-app/src/core/application/application.service.ts +++ b/apps/isa-app/src/core/application/application.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { isBoolean, isNumber } from '@utils/common'; import { BehaviorSubject, Observable } from 'rxjs'; import { first, map, switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/core/auth/login.strategy.ts b/apps/isa-app/src/core/auth/login.strategy.ts index c5ea09044..389c0eb36 100644 --- a/apps/isa-app/src/core/auth/login.strategy.ts +++ b/apps/isa-app/src/core/auth/login.strategy.ts @@ -5,7 +5,7 @@ import { EnvironmentService } from '@core/environment'; import { UiConfirmModalComponent, UiModalResult, UiModalService } from '@ui/modal'; import { injectNetworkStatus$ } from '../../app/services'; import { AuthService } from './auth.service'; -import { AuthService as IsaAuthService } from '@swagger/isa'; +import { AuthService as IsaAuthService } from '@generated/swagger/isa-api'; import { firstValueFrom, lastValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/domain/availability/availability.service.ts b/apps/isa-app/src/domain/availability/availability.service.ts index dec3dee75..d06e6f8c8 100644 --- a/apps/isa-app/src/domain/availability/availability.service.ts +++ b/apps/isa-app/src/domain/availability/availability.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { AvailabilityDTO, BranchDTO, @@ -7,20 +7,20 @@ import { StoreCheckoutBranchService, StoreCheckoutSupplierService, SupplierDTO, -} from '@swagger/checkout'; +} from '@generated/swagger/checkout-api'; import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs'; import { AvailabilityRequestDTO, AvailabilityService, AvailabilityDTO as SwaggerAvailabilityDTO, AvailabilityType, -} from '@swagger/availability'; -import { AvailabilityDTO as CatAvailabilityDTO } from '@swagger/cat'; +} from '@generated/swagger/availability-api'; +import { AvailabilityDTO as CatAvailabilityDTO } from '@generated/swagger/cat-search-api'; import { map, shareReplay, switchMap, withLatestFrom, mergeMap, timeout, first } from 'rxjs/operators'; import { isArray, memorize } from '@utils/common'; -import { LogisticianDTO, LogisticianService } from '@swagger/oms'; -import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@swagger/remi'; -import { PriceDTO } from '@swagger/availability'; +import { LogisticianDTO, LogisticianService } from '@generated/swagger/oms-api'; +import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@generated/swagger/inventory-api'; +import { PriceDTO } from '@generated/swagger/availability-api'; import { AvailabilityByBranchDTO, ItemData, Ssc } from './defs'; import { Availability } from './defs/availability'; import { isEmpty } from 'lodash'; diff --git a/apps/isa-app/src/domain/availability/defs/availability-by-branch-dto.ts b/apps/isa-app/src/domain/availability/defs/availability-by-branch-dto.ts index e34a1761a..ce9307e5b 100644 --- a/apps/isa-app/src/domain/availability/defs/availability-by-branch-dto.ts +++ b/apps/isa-app/src/domain/availability/defs/availability-by-branch-dto.ts @@ -1,4 +1,4 @@ -import { AvailabilityDTO } from '@swagger/checkout'; +import { AvailabilityDTO } from '@generated/swagger/checkout-api'; export interface AvailabilityByBranchDTO extends AvailabilityDTO { availableQuantity?: number; diff --git a/apps/isa-app/src/domain/availability/defs/item-data.ts b/apps/isa-app/src/domain/availability/defs/item-data.ts index 249318c24..3eda3056c 100644 --- a/apps/isa-app/src/domain/availability/defs/item-data.ts +++ b/apps/isa-app/src/domain/availability/defs/item-data.ts @@ -1,4 +1,4 @@ -import { PriceDTO } from '@swagger/availability'; +import { PriceDTO } from '@generated/swagger/availability-api'; export interface ItemData { ean: string; diff --git a/apps/isa-app/src/domain/availability/in-stock.service.ts b/apps/isa-app/src/domain/availability/in-stock.service.ts index fecb1990f..14bbbed5d 100644 --- a/apps/isa-app/src/domain/availability/in-stock.service.ts +++ b/apps/isa-app/src/domain/availability/in-stock.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { StockInfoDTO } from '@swagger/remi'; +import { StockInfoDTO } from '@generated/swagger/inventory-api'; import { groupBy, isEqual, uniqWith } from 'lodash'; import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'; import { buffer, debounceTime, distinctUntilChanged } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/cart/cart.service.ts b/apps/isa-app/src/domain/cart/cart.service.ts index ffed1943c..cfe9aba0c 100644 --- a/apps/isa-app/src/domain/cart/cart.service.ts +++ b/apps/isa-app/src/domain/cart/cart.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OLAAvailabilityDTO } from '@swagger/checkout'; +import { OLAAvailabilityDTO } from '@generated/swagger/checkout-api'; import { Observable } from 'rxjs'; import { CartItem } from './defs/cart-item.model'; diff --git a/apps/isa-app/src/domain/cart/defs/cart-item.model.ts b/apps/isa-app/src/domain/cart/defs/cart-item.model.ts index 505a2bcf3..a95372cdf 100644 --- a/apps/isa-app/src/domain/cart/defs/cart-item.model.ts +++ b/apps/isa-app/src/domain/cart/defs/cart-item.model.ts @@ -1,5 +1,5 @@ -import { AvailabilityDTO, BranchDTO, ItemDTO, Price, ProductDTO } from '@swagger/checkout'; -import { BranchInfoDTO } from '@swagger/isa'; +import { AvailabilityDTO, BranchDTO, ItemDTO, Price, ProductDTO } from '@generated/swagger/checkout-api'; +import { BranchInfoDTO } from '@generated/swagger/isa-api'; export interface CartItem { // cartId: number; diff --git a/apps/isa-app/src/domain/catalog/catalog.service.ts b/apps/isa-app/src/domain/catalog/catalog.service.ts index fd9a675ca..79d37831e 100644 --- a/apps/isa-app/src/domain/catalog/catalog.service.ts +++ b/apps/isa-app/src/domain/catalog/catalog.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ApplicationService } from '@core/application'; -import { AutocompleteTokenDTO, PromotionService, QueryTokenDTO, SearchService } from '@swagger/cat'; +import { AutocompleteTokenDTO, PromotionService, QueryTokenDTO, SearchService } from '@generated/swagger/cat-search-api'; import { memorize } from '@utils/common'; import { map, share, shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/checkout/checkout.service.ts b/apps/isa-app/src/domain/checkout/checkout.service.ts index c0806676c..b7c1a5220 100644 --- a/apps/isa-app/src/domain/checkout/checkout.service.ts +++ b/apps/isa-app/src/domain/checkout/checkout.service.ts @@ -30,14 +30,14 @@ import { KulturPassService, ProductDTO, KulturPassResult, -} from '@swagger/checkout'; +} from '@generated/swagger/checkout-api'; import { DisplayOrderDTO, DisplayOrderItemDTO, OrderCheckoutService, ReorderValues, ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { isNullOrUndefined, memorize } from '@utils/common'; import { combineLatest, Observable, of, concat, isObservable, throwError, interval as rxjsInterval } from 'rxjs'; import { @@ -60,7 +60,7 @@ import * as DomainCheckoutActions from './store/domain-checkout.actions'; import { DomainAvailabilityService, ItemData } from '@domain/availability'; import { HttpErrorResponse } from '@angular/common/http'; import { ApplicationService } from '@core/application'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { Config } from '@core/config'; import parseDuration from 'parse-duration'; diff --git a/apps/isa-app/src/domain/checkout/store/defs/checkout.entity.ts b/apps/isa-app/src/domain/checkout/store/defs/checkout.entity.ts index 657c32177..0c75d3fae 100644 --- a/apps/isa-app/src/domain/checkout/store/defs/checkout.entity.ts +++ b/apps/isa-app/src/domain/checkout/store/defs/checkout.entity.ts @@ -6,9 +6,9 @@ import { PayerDTO, ShippingAddressDTO, ShoppingCartDTO, -} from '@swagger/checkout'; -import { CustomerDTO } from '@swagger/crm'; -import { DisplayOrderDTO } from '@swagger/oms'; +} from '@generated/swagger/checkout-api'; +import { CustomerDTO } from '@generated/swagger/crm-api'; +import { DisplayOrderDTO } from '@generated/swagger/oms-api'; export interface CheckoutEntity { processId: number; diff --git a/apps/isa-app/src/domain/checkout/store/domain-checkout.actions.ts b/apps/isa-app/src/domain/checkout/store/domain-checkout.actions.ts index 2a329d577..3c16cb13a 100644 --- a/apps/isa-app/src/domain/checkout/store/domain-checkout.actions.ts +++ b/apps/isa-app/src/domain/checkout/store/domain-checkout.actions.ts @@ -8,9 +8,9 @@ import { BuyerDTO, PayerDTO, AvailabilityDTO, -} from '@swagger/checkout'; -import { CustomerDTO } from '@swagger/crm'; -import { DisplayOrderDTO, DisplayOrderItemDTO } from '@swagger/oms'; +} from '@generated/swagger/checkout-api'; +import { CustomerDTO } from '@generated/swagger/crm-api'; +import { DisplayOrderDTO, DisplayOrderItemDTO } from '@generated/swagger/oms-api'; const prefix = '[DOMAIN-CHECKOUT]'; diff --git a/apps/isa-app/src/domain/checkout/store/domain-checkout.selectors.ts b/apps/isa-app/src/domain/checkout/store/domain-checkout.selectors.ts index 422134038..94aefbc6f 100644 --- a/apps/isa-app/src/domain/checkout/store/domain-checkout.selectors.ts +++ b/apps/isa-app/src/domain/checkout/store/domain-checkout.selectors.ts @@ -1,6 +1,6 @@ import { Dictionary } from '@ngrx/entity'; import { createSelector } from '@ngrx/store'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { CheckoutEntity } from './defs/checkout.entity'; import { storeCheckoutAdapter, storeFeatureSelector } from './domain-checkout.state'; diff --git a/apps/isa-app/src/domain/checkout/store/domain-checkout.state.ts b/apps/isa-app/src/domain/checkout/store/domain-checkout.state.ts index 16c4cf9f8..faab99465 100644 --- a/apps/isa-app/src/domain/checkout/store/domain-checkout.state.ts +++ b/apps/isa-app/src/domain/checkout/store/domain-checkout.state.ts @@ -1,7 +1,7 @@ import { createFeatureSelector } from '@ngrx/store'; import { createEntityAdapter, EntityState } from '@ngrx/entity'; import { CheckoutEntity } from './defs/checkout.entity'; -import { DisplayOrderDTO } from '@swagger/oms'; +import { DisplayOrderDTO } from '@generated/swagger/oms-api'; export interface DomainCheckoutState extends EntityState { orders: DisplayOrderDTO[]; diff --git a/apps/isa-app/src/domain/crm/crm-customer.service.spec.ts b/apps/isa-app/src/domain/crm/crm-customer.service.spec.ts index a0b52fd33..ab05b0016 100644 --- a/apps/isa-app/src/domain/crm/crm-customer.service.spec.ts +++ b/apps/isa-app/src/domain/crm/crm-customer.service.spec.ts @@ -1,7 +1,7 @@ // import { TestBed } from '@angular/core/testing'; // import { CrmCustomerService } from '@domain/crm'; // import { Result } from '@domain/defs'; -// import { AutocompleteDTO, CustomerInfoDTO, CustomerService, InputDTO, InputOptionsDTO, PayerService } from '@swagger/crm'; +// import { AutocompleteDTO, CustomerInfoDTO, CustomerService, InputDTO, InputOptionsDTO, PayerService } from '@generated/swagger/crm-api'; // import { of } from 'rxjs'; // import { take } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/crm/crm-customer.service.ts b/apps/isa-app/src/domain/crm/crm-customer.service.ts index 3d051468a..f5a8e8105 100644 --- a/apps/isa-app/src/domain/crm/crm-customer.service.ts +++ b/apps/isa-app/src/domain/crm/crm-customer.service.ts @@ -22,7 +22,7 @@ import { ResponseArgsOfIEnumerableOfBonusCardInfoDTO, ShippingAddressDTO, ShippingAddressService, -} from '@swagger/crm'; +} from '@generated/swagger/crm-api'; import { isArray, memorize } from '@utils/common'; import { PagedResult, Result } from '@domain/defs'; import { Observable, of, ReplaySubject } from 'rxjs'; diff --git a/apps/isa-app/src/domain/crm/helpers/address.helper.ts b/apps/isa-app/src/domain/crm/helpers/address.helper.ts index 4caa535c2..3fbfa051e 100644 --- a/apps/isa-app/src/domain/crm/helpers/address.helper.ts +++ b/apps/isa-app/src/domain/crm/helpers/address.helper.ts @@ -1,4 +1,4 @@ -import { AddressDTO } from '@swagger/crm'; +import { AddressDTO } from '@generated/swagger/crm-api'; function hasRequiredProperties(address: AddressDTO) { return !!address?.street && !!address?.city && !!address?.zipCode && !!address?.country; diff --git a/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.spec.ts b/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.spec.ts index dc3f65c02..0fe4cb436 100644 --- a/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.spec.ts +++ b/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.spec.ts @@ -1,4 +1,4 @@ -import { AssignedPayerDTO, EntityDTOContainerOfPayerDTO } from '@swagger/crm'; +import { AssignedPayerDTO, EntityDTOContainerOfPayerDTO } from '@generated/swagger/crm-api'; import { AssignedPayerHelper } from './assigned-payer.helper'; describe('AssignedPayerHelper', () => { diff --git a/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.ts b/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.ts index 967902fa0..1f61dee86 100644 --- a/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.ts +++ b/apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.ts @@ -1,4 +1,4 @@ -import { AssignedPayerDTO } from '@swagger/crm'; +import { AssignedPayerDTO } from '@generated/swagger/crm-api'; function getDefaultAssignedPayer(payers: AssignedPayerDTO[]): AssignedPayerDTO { if (Array.isArray(payers)) { diff --git a/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.spec.ts b/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.spec.ts index 113b1294e..c3a820537 100644 --- a/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.spec.ts +++ b/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.spec.ts @@ -1,4 +1,4 @@ -import { ShippingAddressDTO } from '@swagger/crm'; +import { ShippingAddressDTO } from '@generated/swagger/crm-api'; import { ShippingAddressHelper } from './shipping-address.helper'; describe('ShippingAddressHelper', () => { diff --git a/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.ts b/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.ts index 5fc1b68fc..dca0568a1 100644 --- a/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.ts +++ b/apps/isa-app/src/domain/crm/helpers/shipping-address.helper.ts @@ -1,4 +1,4 @@ -import { ShippingAddressDTO } from '@swagger/crm'; +import { ShippingAddressDTO } from '@generated/swagger/crm-api'; function getDefaultShippingAddress(shippingAddresses: ShippingAddressDTO[]): ShippingAddressDTO { if (Array.isArray(shippingAddresses)) { diff --git a/apps/isa-app/src/domain/defs/result.ts b/apps/isa-app/src/domain/defs/result.ts index 4d56a67a1..363f18e01 100644 --- a/apps/isa-app/src/domain/defs/result.ts +++ b/apps/isa-app/src/domain/defs/result.ts @@ -1,4 +1,4 @@ -import { DialogOfString } from '@swagger/crm'; +import { DialogOfString } from '@generated/swagger/crm-api'; export interface Result { /** Ergebnis */ diff --git a/apps/isa-app/src/domain/isa/dashboard.service.ts b/apps/isa-app/src/domain/isa/dashboard.service.ts index aa138330a..ee8c886e6 100644 --- a/apps/isa-app/src/domain/isa/dashboard.service.ts +++ b/apps/isa-app/src/domain/isa/dashboard.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { InfoService } from '@swagger/isa'; +import { InfoService } from '@generated/swagger/isa-api'; @Injectable() export class DomainDashboardService { diff --git a/apps/isa-app/src/domain/isa/defs/info-feed.ts b/apps/isa-app/src/domain/isa/defs/info-feed.ts index d01077eed..2cc8977e9 100644 --- a/apps/isa-app/src/domain/isa/defs/info-feed.ts +++ b/apps/isa-app/src/domain/isa/defs/info-feed.ts @@ -1,4 +1,4 @@ -import { FeedDTO } from '@swagger/isa'; +import { FeedDTO } from '@generated/swagger/isa-api'; import { InfoFeedItem } from './info-feed-item'; export interface InfoFeed extends FeedDTO { diff --git a/apps/isa-app/src/domain/isa/defs/kpi-feed.ts b/apps/isa-app/src/domain/isa/defs/kpi-feed.ts index eea943a34..6513fb982 100644 --- a/apps/isa-app/src/domain/isa/defs/kpi-feed.ts +++ b/apps/isa-app/src/domain/isa/defs/kpi-feed.ts @@ -1,4 +1,4 @@ -import { FeedDTO } from '@swagger/isa'; +import { FeedDTO } from '@generated/swagger/isa-api'; import { KpiFeedItem } from './kpi-feed-item'; export interface KpiFeed extends FeedDTO { diff --git a/apps/isa-app/src/domain/isa/defs/products-feed.ts b/apps/isa-app/src/domain/isa/defs/products-feed.ts index 59badf861..e8c5c1c5e 100644 --- a/apps/isa-app/src/domain/isa/defs/products-feed.ts +++ b/apps/isa-app/src/domain/isa/defs/products-feed.ts @@ -1,5 +1,5 @@ -import { ItemDTO } from '@swagger/cat'; -import { FeedDTO } from '@swagger/isa'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { FeedDTO } from '@generated/swagger/isa-api'; export interface ProductsFeed extends FeedDTO { type: 'products'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/accepted.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/accepted.action-handler.ts index 2e40c81f9..324133355 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/accepted.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/accepted.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { DomainOmsService } from '../oms.service'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/arrived.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/arrived.action-handler.ts index 244fc4008..032330669 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/arrived.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/arrived.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/assembled.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/assembled.action-handler.ts index 8fee8e6e0..070199d92 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/assembled.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/assembled.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/available-for-download.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/available-for-download.action-handler.ts index 9facc8cdc..938b4a123 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/available-for-download.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/available-for-download.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/back-to-stock.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/back-to-stock.action-handler.ts index 12467ee62..70f2f0463 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/back-to-stock.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/back-to-stock.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-buyer.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-buyer.action-handler.ts index 5ba577c4f..0bb911162 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-buyer.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-buyer.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-retailer.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-retailer.action-handler.ts index 54ef27fe4..ceaee9b1e 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-retailer.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-retailer.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-supplier.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-supplier.action-handler.ts index d0906ffab..6f1e6abdd 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/canceled-by-supplier.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/canceled-by-supplier.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/change-order-item-status-base.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/change-order-item-status-base.action-handler.ts index 96ee4ddda..b0a5520ae 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/change-order-item-status-base.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/change-order-item-status-base.action-handler.ts @@ -1,6 +1,6 @@ import { ActionHandler } from '@core/command'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { OrderItemsContext } from './order-items.context'; export abstract class ChangeOrderItemStatusBaseActionHandler extends ActionHandler { diff --git a/apps/isa-app/src/domain/oms/action-handlers/collect-on-deliverynote.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/collect-on-deliverynote.action-handler.ts index d03fa0a95..56332a296 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/collect-on-deliverynote.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/collect-on-deliverynote.action-handler.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActionHandler } from '@core/command'; import { Dictionary } from '@ngrx/entity'; -import { OrderService } from '@swagger/oms'; +import { OrderService } from '@generated/swagger/oms-api'; import { OrderItemsContext } from './order-items.context'; @Injectable() diff --git a/apps/isa-app/src/domain/oms/action-handlers/collect-with-smallamountinvoice.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/collect-with-smallamountinvoice.action-handler.ts index 4bf139d1a..43441b7b9 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/collect-with-smallamountinvoice.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/collect-with-smallamountinvoice.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ActionHandler } from '@core/command'; -import { OrderService } from '@swagger/oms'; +import { OrderService } from '@generated/swagger/oms-api'; import { OrderItemsContext } from './order-items.context'; @Injectable() diff --git a/apps/isa-app/src/domain/oms/action-handlers/create-returnitem.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/create-returnitem.action-handler.ts index 78d9ba34f..cc8231c69 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/create-returnitem.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/create-returnitem.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/delivered.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/delivered.action-handler.ts index b4d5024c0..aadc20dbe 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/delivered.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/delivered.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/determine-supplier.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/determine-supplier.action-handler.ts index 0b410f841..0e353be5e 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/determine-supplier.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/determine-supplier.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/dispatched.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/dispatched.action-handler.ts index 264c68efe..a3059389d 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/dispatched.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/dispatched.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/downloaded.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/downloaded.action-handler.ts index 70efe96c9..5b3d0341c 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/downloaded.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/downloaded.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/fetched.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/fetched.action-handler.ts index 8e7ac9816..581be231e 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/fetched.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/fetched.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/in-process.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/in-process.action-handler.ts index 2922316bc..4be6f11bc 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/in-process.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/in-process.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/not-available.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/not-available.action-handler.ts index 0a1704706..a7e1a64e4 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/not-available.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/not-available.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/not-fetched.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/not-fetched.action-handler.ts index 4da5c3d88..275c23de4 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/not-fetched.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/not-fetched.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/order-at-supplier.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/order-at-supplier.action-handler.ts index 14b0d98c6..27b535bee 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/order-at-supplier.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/order-at-supplier.action-handler.ts @@ -2,7 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; import { ActionHandler, CommandService } from '@core/command'; import { ReorderModalComponent, ReorderResult } from '@modal/reorder'; -import { AvailabilityDTO2, OrderItemListItemDTO } from '@swagger/oms'; +import { AvailabilityDTO2, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiModalService } from '@ui/modal'; import { isResponseArgs } from '@utils/object'; import { first } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/order-items.context.ts b/apps/isa-app/src/domain/oms/action-handlers/order-items.context.ts index 5a03e55c4..bf06df458 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/order-items.context.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/order-items.context.ts @@ -1,4 +1,4 @@ -import { OrderItemListItemDTO, ReceiptDTO, OrderDTO } from '@swagger/oms'; +import { OrderItemListItemDTO, ReceiptDTO, OrderDTO } from '@generated/swagger/oms-api'; export interface OrderItemsContext { items: OrderItemListItemDTO[]; diff --git a/apps/isa-app/src/domain/oms/action-handlers/ordering.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/ordering.action-handler.ts index 4f146fd1f..8f405247e 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/ordering.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/ordering.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/overdue.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/overdue.action-handler.ts index 00a62fa86..d17db2937 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/overdue.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/overdue.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/packed.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/packed.action-handler.ts index aeac496ac..21f87abd8 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/packed.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/packed.action-handler.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { DomainOmsService } from '../oms.service'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/parked.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/parked.action-handler.ts index f1b8af0ed..b8cc3ec8d 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/parked.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/parked.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/placed.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/placed.action-handler.ts index 9fd46ccaf..f285d6c5a 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/placed.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/placed.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/preperation-for-shipping.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/preperation-for-shipping.action-handler.ts index dedda22f1..6c0d75e65 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/preperation-for-shipping.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/preperation-for-shipping.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/print-pricediffqrcodelabel.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/print-pricediffqrcodelabel.action-handler.ts index a2e269bd5..ea9bc95ee 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/print-pricediffqrcodelabel.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/print-pricediffqrcodelabel.action-handler.ts @@ -3,7 +3,7 @@ import { ActionHandler } from '@core/command'; import { OrderItemsContext } from './order-items.context'; import { DomainPrinterService } from '@domain/printer'; import { ConfirmModalData, UiConfirmModalComponent, UiErrorModalComponent, UiModalService } from '@ui/modal'; -import { PriceQRCodeDTO } from '@swagger/print'; +import { PriceQRCodeDTO } from '@generated/swagger/print-api'; import { PrintModalComponent } from '@modal/printer'; @Injectable() diff --git a/apps/isa-app/src/domain/oms/action-handlers/print-shipping-note.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/print-shipping-note.action-handler.ts index 2026e69b1..4a0aada27 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/print-shipping-note.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/print-shipping-note.action-handler.ts @@ -5,7 +5,7 @@ import { DomainPrinterService, Printer } from '@domain/printer'; import { UiModalService } from '@ui/modal'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; import { groupBy } from '@ui/common'; -import { ReceiptDTO } from '@swagger/oms'; +import { ReceiptDTO } from '@generated/swagger/oms-api'; import { EnvironmentService } from '@core/environment'; @Injectable() diff --git a/apps/isa-app/src/domain/oms/action-handlers/print-smallamountinvoice.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/print-smallamountinvoice.action-handler.ts index c57b214e9..d9df6d825 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/print-smallamountinvoice.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/print-smallamountinvoice.action-handler.ts @@ -1,14 +1,14 @@ import { inject, Injectable } from '@angular/core'; import { ActionHandler } from '@core/command'; import { OrderItemsContext } from './order-items.context'; -import { OMSPrintService } from '@swagger/print'; +import { OMSPrintService } from '@generated/swagger/print-api'; import { UiModalService } from '@ui/modal'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; import { Group, groupBy } from '@ui/common'; import { DomainPrinterService, Printer } from '@domain/printer'; import { firstValueFrom } from 'rxjs'; import { EnvironmentService } from '@core/environment'; -import { ReceiptDTO, ResponseArgs } from '@swagger/oms'; +import { ReceiptDTO, ResponseArgs } from '@generated/swagger/oms-api'; @Injectable() export class PrintSmallamountinvoiceActionHandler extends ActionHandler { diff --git a/apps/isa-app/src/domain/oms/action-handlers/re-order.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/re-order.action-handler.ts index 7227d3ec9..137abcdba 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/re-order.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/re-order.action-handler.ts @@ -4,7 +4,7 @@ import { OrderItemsContext } from './order-items.context'; import { UiModalService } from '@ui/modal'; import { ReorderModalComponent, ReorderResult } from '@modal/reorder'; import { DomainCheckoutService } from '@domain/checkout'; -import { AvailabilityDTO2, OrderItemListItemDTO } from '@swagger/oms'; +import { AvailabilityDTO2, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { ToasterService } from '@shared/shell'; @Injectable() diff --git a/apps/isa-app/src/domain/oms/action-handlers/re-ordered.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/re-ordered.action-handler.ts index 47efe9846..b0a00a93c 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/re-ordered.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/re-ordered.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/redirected-internally.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/redirected-internally.action-handler.ts index b6e48579e..2547d1545 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/redirected-internally.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/redirected-internally.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/requested.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/requested.action-handler.ts index e117ca665..fe9754164 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/requested.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/requested.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/reserved.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/reserved.action-handler.ts index 1dd6e19cb..aa08920f4 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/reserved.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/reserved.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/returned-by-buyer.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/returned-by-buyer.action-handler.ts index 1d7140cb7..8ed2b4cc5 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/returned-by-buyer.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/returned-by-buyer.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/shipping-note.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/shipping-note.action-handler.ts index 4e9e0cef4..685b5bea6 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/shipping-note.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/shipping-note.action-handler.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/shop-with-kulturpass.action-handler.ts b/apps/isa-app/src/domain/oms/action-handlers/shop-with-kulturpass.action-handler.ts index 92b23711f..5970beb4a 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/shop-with-kulturpass.action-handler.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/shop-with-kulturpass.action-handler.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { OrderItemsContext } from './order-items.context'; import { ActionHandler, CommandService } from '@core/command'; import { KulturpassOrderModalService } from '@modal/kulturpass-order'; -import { DisplayOrderItemSubsetDTO, OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms'; +import { DisplayOrderItemSubsetDTO, OrderItemListItemDTO, ReceiptDTO } from '@generated/swagger/oms-api'; import { DomainReceiptService } from '../receipt.service'; import { DomainGoodsService } from '../goods.service'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/oms/action-handlers/supplier-temporarily-out-of-stock.action-handler copy.ts b/apps/isa-app/src/domain/oms/action-handlers/supplier-temporarily-out-of-stock.action-handler copy.ts index b7c95d536..e2bb1fd50 100644 --- a/apps/isa-app/src/domain/oms/action-handlers/supplier-temporarily-out-of-stock.action-handler copy.ts +++ b/apps/isa-app/src/domain/oms/action-handlers/supplier-temporarily-out-of-stock.action-handler copy.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DomainOmsService } from '../oms.service'; -import { OrderItemListItemDTO, StatusValues } from '@swagger/oms'; +import { OrderItemListItemDTO, StatusValues } from '@generated/swagger/oms-api'; import { ChangeOrderItemStatusBaseActionHandler } from './change-order-item-status-base.action-handler'; import { OrderItemsContext } from './order-items.context'; diff --git a/apps/isa-app/src/domain/oms/customer-order.service.ts b/apps/isa-app/src/domain/oms/customer-order.service.ts index 7359055ab..d4c880797 100644 --- a/apps/isa-app/src/domain/oms/customer-order.service.ts +++ b/apps/isa-app/src/domain/oms/customer-order.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { AutocompleteTokenDTO, OrderService, QueryTokenDTO } from '@swagger/oms'; +import { AutocompleteTokenDTO, OrderService, QueryTokenDTO } from '@generated/swagger/oms-api'; import { memorize } from '@utils/common'; import { map, shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/oms/goods.service.spec.ts b/apps/isa-app/src/domain/oms/goods.service.spec.ts index 3d5c8bf60..43ef5b002 100644 --- a/apps/isa-app/src/domain/oms/goods.service.spec.ts +++ b/apps/isa-app/src/domain/oms/goods.service.spec.ts @@ -1,5 +1,5 @@ // import { createServiceFactory, SpectatorService } from '@ngneat/spectator'; -// import { AbholfachService, AutocompleteTokenDTO, QueryTokenDTO } from '@swagger/oms'; +// import { AbholfachService, AutocompleteTokenDTO, QueryTokenDTO } from '@generated/swagger/oms-api'; // import { DateAdapter } from '@ui/common'; // import { cold, hot } from 'jasmine-marbles'; // import { DomainGoodsService } from './goods.service'; diff --git a/apps/isa-app/src/domain/oms/goods.service.ts b/apps/isa-app/src/domain/oms/goods.service.ts index a8891ee6c..46496ed6d 100644 --- a/apps/isa-app/src/domain/oms/goods.service.ts +++ b/apps/isa-app/src/domain/oms/goods.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { AbholfachService, AutocompleteTokenDTO, QueryTokenDTO } from '@swagger/oms'; +import { AbholfachService, AutocompleteTokenDTO, QueryTokenDTO } from '@generated/swagger/oms-api'; import { DateAdapter } from '@ui/common'; import { memorize } from '@utils/common'; import { shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/oms/oms.service.ts b/apps/isa-app/src/domain/oms/oms.service.ts index 0916e77d9..9dd442b76 100644 --- a/apps/isa-app/src/domain/oms/oms.service.ts +++ b/apps/isa-app/src/domain/oms/oms.service.ts @@ -17,7 +17,7 @@ import { ValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO, ValueTupleOfOrderItemSubsetDTOAndOrderItemSubsetDTO, VATService, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { memorize } from '@utils/common'; import { Observable } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/oms/receipt.service.ts b/apps/isa-app/src/domain/oms/receipt.service.ts index d94fef488..28295f268 100644 --- a/apps/isa-app/src/domain/oms/receipt.service.ts +++ b/apps/isa-app/src/domain/oms/receipt.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ReceiptOrderItemSubsetReferenceValues, ReceiptService } from '@swagger/oms'; +import { ReceiptOrderItemSubsetReferenceValues, ReceiptService } from '@generated/swagger/oms-api'; import { memorize } from '@utils/common'; import { shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/package-inspection/events.ts b/apps/isa-app/src/domain/package-inspection/events.ts index 1609767d4..0f2b981ca 100644 --- a/apps/isa-app/src/domain/package-inspection/events.ts +++ b/apps/isa-app/src/domain/package-inspection/events.ts @@ -1,4 +1,4 @@ -import { PackageArrivalStatusDTO } from '@swagger/wws'; +import { PackageArrivalStatusDTO } from '@generated/swagger/wws-api'; export abstract class PackageInspectionEvent { constructor(public readonly type: string) {} diff --git a/apps/isa-app/src/domain/package-inspection/package-inspection.service.ts b/apps/isa-app/src/domain/package-inspection/package-inspection.service.ts index 6b9cbc29c..fa2e29420 100644 --- a/apps/isa-app/src/domain/package-inspection/package-inspection.service.ts +++ b/apps/isa-app/src/domain/package-inspection/package-inspection.service.ts @@ -10,7 +10,7 @@ import { ResponseArgsOfPackageDetailResponseDTO, ResponseArgsOfQuerySettingsDTO, WareneingangService, -} from '@swagger/wws'; +} from '@generated/swagger/wws-api'; import { Observable, Subject } from 'rxjs'; import { map, tap } from 'rxjs/operators'; import { PackageInspectionEvent, PackageStatusChangedEvent } from './events'; diff --git a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-in.service.ts b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-in.service.ts index bc5729b39..467d31fe9 100644 --- a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-in.service.ts +++ b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-in.service.ts @@ -1,5 +1,10 @@ import { Injectable, inject } from '@angular/core'; -import { AbholfachService, AutocompleteTokenDTO, ListResponseArgsOfDBHOrderItemListItemDTO, QueryTokenDTO } from '@swagger/oms'; +import { + AbholfachService, + AutocompleteTokenDTO, + ListResponseArgsOfDBHOrderItemListItemDTO, + QueryTokenDTO, +} from '@generated/swagger/oms-api'; import { PickupShelfIOService } from './pickup-shelf-io.service'; import { Observable, throwError } from 'rxjs'; import { Filter } from '@shared/components/filter'; diff --git a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-io.service.ts b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-io.service.ts index eaa169473..e926a4ae0 100644 --- a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-io.service.ts +++ b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-io.service.ts @@ -6,7 +6,7 @@ import { QueryTokenDTO, ResponseArgsOfIEnumerableOfAutocompleteDTO, ResponseArgsOfQuerySettingsDTO, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { Observable } from 'rxjs'; @Injectable() diff --git a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-out.service.ts b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-out.service.ts index e8dcdf662..e37f48324 100644 --- a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-out.service.ts +++ b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf-out.service.ts @@ -1,5 +1,10 @@ import { Injectable, inject } from '@angular/core'; -import { AbholfachService, AutocompleteTokenDTO, ListResponseArgsOfDBHOrderItemListItemDTO, QueryTokenDTO } from '@swagger/oms'; +import { + AbholfachService, + AutocompleteTokenDTO, + ListResponseArgsOfDBHOrderItemListItemDTO, + QueryTokenDTO, +} from '@generated/swagger/oms-api'; import { PickupShelfIOService } from './pickup-shelf-io.service'; import { Observable, throwError } from 'rxjs'; import { Filter } from '@shared/components/filter'; diff --git a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf.service.ts b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf.service.ts index 85587fa47..b8ef251fe 100644 --- a/apps/isa-app/src/domain/pickup-shelf/pickup-shelf.service.ts +++ b/apps/isa-app/src/domain/pickup-shelf/pickup-shelf.service.ts @@ -1,5 +1,5 @@ import { Injectable, inject } from '@angular/core'; -import { DBHOrderItemListItemDTO, OrderItemDTO, OrderItemSubsetDTO, OrderService } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, OrderItemDTO, OrderItemSubsetDTO, OrderService } from '@generated/swagger/oms-api'; @Injectable({ providedIn: 'root' }) export class PickupShelfService { diff --git a/apps/isa-app/src/domain/printer/printer.service.ts b/apps/isa-app/src/domain/printer/printer.service.ts index 317d87012..1bdf3ff38 100644 --- a/apps/isa-app/src/domain/printer/printer.service.ts +++ b/apps/isa-app/src/domain/printer/printer.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ArticleDTO, DisplayInfoDTO, EISPublicDocumentService } from '@swagger/eis'; +import { ArticleDTO, DisplayInfoDTO, EISPublicDocumentService } from '@generated/swagger/eis-api'; import { CatalogPrintService, CheckoutPrintService, @@ -11,13 +11,13 @@ import { PrintService, ResponseArgs, LoyaltyCardPrintService, -} from '@swagger/print'; +} from '@generated/swagger/print-api'; import { DocumentPayloadOfIEnumerableOfProductListItemDTO, ProductListItemDTO, ProductListService, ResponseArgsOfString, -} from '@swagger/wws'; +} from '@generated/swagger/wws-api'; import { Observable, of } from 'rxjs'; import { catchError, filter, map, switchMap, timeout } from 'rxjs/operators'; import { Printer } from './defs/printer.model'; diff --git a/apps/isa-app/src/domain/product-list/product-list.service.ts b/apps/isa-app/src/domain/product-list/product-list.service.ts index b9299731f..450e931d7 100644 --- a/apps/isa-app/src/domain/product-list/product-list.service.ts +++ b/apps/isa-app/src/domain/product-list/product-list.service.ts @@ -8,7 +8,7 @@ import { QueryTokenDTO, ResponseArgsOfProductListItemDTO, ResponseArgsOfQuerySettingsDTO, -} from '@swagger/wws'; +} from '@generated/swagger/wws-api'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/remission/defs/remission-list-item.ts b/apps/isa-app/src/domain/remission/defs/remission-list-item.ts index a4c1670b6..9e899090b 100644 --- a/apps/isa-app/src/domain/remission/defs/remission-list-item.ts +++ b/apps/isa-app/src/domain/remission/defs/remission-list-item.ts @@ -1,4 +1,4 @@ -import { PriceDTO, ReturnItemDTO, ReturnSuggestionDTO } from '@swagger/remi'; +import { PriceDTO, ReturnItemDTO, ReturnSuggestionDTO } from '@generated/swagger/inventory-api'; export interface RemissionListItem { dtoType: 'return' | 'suggestion'; diff --git a/apps/isa-app/src/domain/remission/mappings/remission-list-item.mapping.ts b/apps/isa-app/src/domain/remission/mappings/remission-list-item.mapping.ts index 013d0d915..c66c7cab2 100644 --- a/apps/isa-app/src/domain/remission/mappings/remission-list-item.mapping.ts +++ b/apps/isa-app/src/domain/remission/mappings/remission-list-item.mapping.ts @@ -1,4 +1,4 @@ -import { ReturnItemDTO, ReturnSuggestionDTO } from '@swagger/remi'; +import { ReturnItemDTO, ReturnSuggestionDTO } from '@generated/swagger/inventory-api'; import { RemissionListItem } from '../defs'; export function mapFromReturnSuggestionDTO(dto: ReturnSuggestionDTO): RemissionListItem { diff --git a/apps/isa-app/src/domain/remission/mappings/return-item-dto.mapping.ts b/apps/isa-app/src/domain/remission/mappings/return-item-dto.mapping.ts index aca721803..ceb719b29 100644 --- a/apps/isa-app/src/domain/remission/mappings/return-item-dto.mapping.ts +++ b/apps/isa-app/src/domain/remission/mappings/return-item-dto.mapping.ts @@ -1,5 +1,5 @@ -import { ItemDTO } from '@swagger/cat'; -import { PriceDTO, ReturnItemDTO, StockDTO } from '@swagger/remi'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { PriceDTO, ReturnItemDTO, StockDTO } from '@generated/swagger/inventory-api'; function mapAssortment(itemDto: ItemDTO): string { // input: diff --git a/apps/isa-app/src/domain/remission/remission.service.spec.ts b/apps/isa-app/src/domain/remission/remission.service.spec.ts index 7c8c74ea2..5db764327 100644 --- a/apps/isa-app/src/domain/remission/remission.service.spec.ts +++ b/apps/isa-app/src/domain/remission/remission.service.spec.ts @@ -1,7 +1,7 @@ import { Logger } from '@core/logger'; import { createServiceFactory, SpectatorService } from '@ngneat/spectator'; -import { SearchService } from '@swagger/cat'; -import { PackageService, RemiService, ReturnService, StockService, SupplierService } from '@swagger/remi'; +import { SearchService } from '@generated/swagger/cat-search-api'; +import { PackageService, RemiService, ReturnService, StockService, SupplierService } from '@generated/swagger/inventory-api'; import { DomainRemissionService } from './remission.service'; import { DateAdapter } from '@ui/common'; diff --git a/apps/isa-app/src/domain/remission/remission.service.ts b/apps/isa-app/src/domain/remission/remission.service.ts index cd16b934a..6a04b1054 100644 --- a/apps/isa-app/src/domain/remission/remission.service.ts +++ b/apps/isa-app/src/domain/remission/remission.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ItemDTO, ListResponseArgsOfItemDTO, SearchService } from '@swagger/cat'; +import { ItemDTO, ListResponseArgsOfItemDTO, SearchService } from '@generated/swagger/cat-search-api'; import { RemiService, StockService, @@ -13,7 +13,7 @@ import { ReturnDTO, ReturnQueryTokenDTO, BatchResponseArgsOfReturnItemDTOAndReturnItemDTO, -} from '@swagger/remi'; +} from '@generated/swagger/inventory-api'; import { memorize } from '@utils/common'; import { Observable, of, throwError } from 'rxjs'; import { catchError, map, shareReplay, switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/domain/task-calendar/task-calendar.service.ts b/apps/isa-app/src/domain/task-calendar/task-calendar.service.ts index 7ac35562d..c016c96d2 100644 --- a/apps/isa-app/src/domain/task-calendar/task-calendar.service.ts +++ b/apps/isa-app/src/domain/task-calendar/task-calendar.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { DisplayInfoDTO, EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@swagger/eis'; +import { DisplayInfoDTO, EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@generated/swagger/eis-api'; import { DateAdapter } from '@ui/common'; import { memorize } from '@utils/common'; import { map, shareReplay, switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/hub/notifications/defs/message-board-item.dto.ts b/apps/isa-app/src/hub/notifications/defs/message-board-item.dto.ts index 2fa628cce..7edf26cda 100644 --- a/apps/isa-app/src/hub/notifications/defs/message-board-item.dto.ts +++ b/apps/isa-app/src/hub/notifications/defs/message-board-item.dto.ts @@ -1,4 +1,4 @@ -import { QueryTokenDTO } from '@swagger/cat'; +import { QueryTokenDTO } from '@generated/swagger/cat-search-api'; export interface MessageBoardItemDTO { uId?: string; diff --git a/apps/isa-app/src/modal/address-selection/address-selection-modal.component.ts b/apps/isa-app/src/modal/address-selection/address-selection-modal.component.ts index 79e11a241..246d0efac 100644 --- a/apps/isa-app/src/modal/address-selection/address-selection-modal.component.ts +++ b/apps/isa-app/src/modal/address-selection/address-selection-modal.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { AddressDTO } from '@swagger/crm'; +import { AddressDTO } from '@generated/swagger/crm-api'; import { UiModalRef } from '@ui/modal'; @Component({ diff --git a/apps/isa-app/src/modal/address-selection/address-selection-modal.service.ts b/apps/isa-app/src/modal/address-selection/address-selection-modal.service.ts index 1ecc37b53..37ca6f662 100644 --- a/apps/isa-app/src/modal/address-selection/address-selection-modal.service.ts +++ b/apps/isa-app/src/modal/address-selection/address-selection-modal.service.ts @@ -1,6 +1,6 @@ import { inject, Injectable } from '@angular/core'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO } from '@swagger/crm'; +import { AddressDTO } from '@generated/swagger/crm-api'; import { UiModalService } from '@ui/modal'; import { map } from 'rxjs/operators'; import { AddressSelectionModalComponent } from './address-selection-modal.component'; diff --git a/apps/isa-app/src/modal/availabilities/availabilities.component.ts b/apps/isa-app/src/modal/availabilities/availabilities.component.ts index 8b123dd29..1ba1aa142 100644 --- a/apps/isa-app/src/modal/availabilities/availabilities.component.ts +++ b/apps/isa-app/src/modal/availabilities/availabilities.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { DomainAvailabilityService } from '@domain/availability'; -import { ItemDTO } from '@swagger/cat'; -import { BranchDTO } from '@swagger/checkout'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { UiModalRef } from '@ui/modal'; import { combineLatest } from 'rxjs'; import { filter, map, shareReplay, switchMap, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/modal/history/history-data.ts b/apps/isa-app/src/modal/history/history-data.ts index 1fcc50a4a..e313ab2b0 100644 --- a/apps/isa-app/src/modal/history/history-data.ts +++ b/apps/isa-app/src/modal/history/history-data.ts @@ -1,5 +1,5 @@ -import { HistoryDTO as CrmHistoryDTO } from '@swagger/crm'; -import { HistoryDTO as OmsHistoryDTO } from '@swagger/oms'; +import { HistoryDTO as CrmHistoryDTO } from '@generated/swagger/crm-api'; +import { HistoryDTO as OmsHistoryDTO } from '@generated/swagger/oms-api'; export interface HistoryData { customerNumber: string; diff --git a/apps/isa-app/src/modal/history/history.component.spec.ts b/apps/isa-app/src/modal/history/history.component.spec.ts index e8e3495e2..3ffa0f1cf 100644 --- a/apps/isa-app/src/modal/history/history.component.spec.ts +++ b/apps/isa-app/src/modal/history/history.component.spec.ts @@ -1,6 +1,6 @@ import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator'; import { SharedHistoryListComponent, SharedHistoryListModule } from '@shared/components/history'; -import { HistoryDTO } from '@swagger/crm'; +import { HistoryDTO } from '@generated/swagger/crm-api'; import { UiModalRef } from '@ui/modal'; import { HistoryData } from './history-data'; import { HistoryModalComponent } from './history.component'; diff --git a/apps/isa-app/src/modal/images/images.component.ts b/apps/isa-app/src/modal/images/images.component.ts index daf39d071..48b2aa1de 100644 --- a/apps/isa-app/src/modal/images/images.component.ts +++ b/apps/isa-app/src/modal/images/images.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { ImageDTO } from '@swagger/cat'; +import { ImageDTO } from '@generated/swagger/cat-search-api'; import { UiModalRef } from '@ui/modal'; @Component({ diff --git a/apps/isa-app/src/modal/kulturpass-order/catalog-product-number.ts b/apps/isa-app/src/modal/kulturpass-order/catalog-product-number.ts index 678fc6699..82d4773f1 100644 --- a/apps/isa-app/src/modal/kulturpass-order/catalog-product-number.ts +++ b/apps/isa-app/src/modal/kulturpass-order/catalog-product-number.ts @@ -1,5 +1,5 @@ -import { ItemDTO } from '@swagger/cat'; -import { ShoppingCartItemDTO } from '@swagger/checkout'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; export function getCatalogProductNumber(item: ItemDTO); export function getCatalogProductNumber(item: ShoppingCartItemDTO); diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.component.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.component.ts index 06e92d820..f97191257 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.component.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.component.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { Component, ChangeDetectionStrategy, Output, Input, EventEmitter } from '@angular/core'; import { ProductImageModule } from '@cdn/product-image'; import { provideComponentStore } from '@ngrx/component-store'; -import { ShoppingCartItemDTO } from '@swagger/checkout'; +import { ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { UiQuantityDropdownModule } from '@ui/quantity-dropdown'; import { KulturpassOrderItemStore } from './kulturpass-order-item.store'; diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.store.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.store.ts index ea9d69cbf..c2eb04c98 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.store.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-item/kulturpass-order-item.store.ts @@ -1,5 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; -import { ShoppingCartItemDTO, AvailabilityDTO } from '@swagger/checkout'; +import { ShoppingCartItemDTO, AvailabilityDTO } from '@generated/swagger/checkout-api'; import { DomainAvailabilityService } from '@domain/availability'; import { Injectable } from '@angular/core'; import { KulturpassOrderModalStore } from '../kulturpass-order-modal.store'; diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.component.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.component.ts index 4df589871..dab1b1aa9 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.component.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.component.ts @@ -4,14 +4,14 @@ import { provideComponentStore } from '@ngrx/component-store'; import { KulturpassOrderModalStore } from './kulturpass-order-modal.store'; import { UiModalRef } from '@ui/modal'; import { KulturpassOrderModalData } from './kulturpass-order-modal.data'; -import { AddToShoppingCartDTO, ShoppingCartItemDTO } from '@swagger/checkout'; +import { AddToShoppingCartDTO, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { map } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; import { BranchNamePipe } from '@shared/pipes/branch'; import { combineLatest } from 'rxjs'; import { KulturpassOrderItemComponent } from './kulturpass-order-item/kulturpass-order-item.component'; import { LoaderComponent } from '@shared/components/loader'; -import { DisplayOrderDTO, KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { DisplayOrderDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; import { getCatalogProductNumber } from './catalog-product-number'; @Component({ selector: 'shared-kulturpass-order-modal', diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.data.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.data.ts index e39000dfe..f0e499978 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.data.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.data.ts @@ -1,4 +1,4 @@ -import { OrderItemListItemDTO, OrderDTO } from '@swagger/oms'; +import { OrderItemListItemDTO, OrderDTO } from '@generated/swagger/oms-api'; export interface KulturpassOrderModalData { /** diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.service.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.service.ts index 6d5a2e859..92007cccd 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.service.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.service.ts @@ -2,7 +2,7 @@ import { UiModalRef, UiModalService } from '@ui/modal'; import { KulturpassOrderModalData } from './kulturpass-order-modal.data'; import { KulturpassOrderModalComponent } from './kulturpass-order-modal.component'; import { inject, Injectable } from '@angular/core'; -import { DisplayOrderDTO } from '@swagger/oms'; +import { DisplayOrderDTO } from '@generated/swagger/oms-api'; @Injectable({ providedIn: 'root' }) export class KulturpassOrderModalService { diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.store.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.store.ts index c82fb3e93..33b1fa962 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.store.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-modal.store.ts @@ -10,7 +10,7 @@ import { KulturPassResult, ShoppingCartDTO, ShoppingCartItemDTO, -} from '@swagger/checkout'; +} from '@generated/swagger/checkout-api'; import { DomainCheckoutService } from '@domain/checkout'; import { catchError, mergeMap, switchMap, tap, withLatestFrom } from 'rxjs/operators'; import { @@ -21,12 +21,12 @@ import { OrderItemListItemDTO, ResponseArgsOfIEnumerableOfBranchDTO, ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { Observable, of, zip } from 'rxjs'; import { AuthService } from '@core/auth'; import { UiMessageModalComponent, UiModalService } from '@ui/modal'; import { getCatalogProductNumber } from './catalog-product-number'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { DomainAvailabilityService } from '@domain/availability'; export interface KulturpassOrderModalState { diff --git a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-searchbox/kulturpass-order-searchbox.store.ts b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-searchbox/kulturpass-order-searchbox.store.ts index a62c0fcc1..0241fa9bb 100644 --- a/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-searchbox/kulturpass-order-searchbox.store.ts +++ b/apps/isa-app/src/modal/kulturpass-order/kulturpass-order-searchbox/kulturpass-order-searchbox.store.ts @@ -2,12 +2,12 @@ import { inject, Injectable } from '@angular/core'; import { ComponentStore, OnStoreInit } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ItemDTO, ResponseArgsOfItemDTO } from '@swagger/cat'; +import { ItemDTO, ResponseArgsOfItemDTO } from '@generated/swagger/cat-search-api'; import { switchMap, withLatestFrom } from 'rxjs/operators'; import { Subject, asapScheduler } from 'rxjs'; import { DomainAvailabilityService } from '@domain/availability'; import { DomainCatalogService } from '@domain/catalog'; -import { AddToShoppingCartDTO, BranchDTO } from '@swagger/checkout'; +import { AddToShoppingCartDTO, BranchDTO } from '@generated/swagger/checkout-api'; import { tap } from 'rxjs/operators'; import { UiModalService } from '@ui/modal'; import { KulturpassOrderModalStore } from '../kulturpass-order-modal.store'; diff --git a/apps/isa-app/src/modal/purchase-options/constants.ts b/apps/isa-app/src/modal/purchase-options/constants.ts index 0d6811227..50b158a60 100644 --- a/apps/isa-app/src/modal/purchase-options/constants.ts +++ b/apps/isa-app/src/modal/purchase-options/constants.ts @@ -1,4 +1,4 @@ -import { ItemType, PriceDTO, PriceValueDTO, VATValueDTO } from '@swagger/checkout'; +import { ItemType, PriceDTO, PriceValueDTO, VATValueDTO } from '@generated/swagger/checkout-api'; import { OrderType, PurchaseOption } from './store'; export const PURCHASE_OPTIONS: PurchaseOption[] = ['in-store', 'pickup', 'delivery', 'dig-delivery', 'b2b-delivery', 'download']; diff --git a/apps/isa-app/src/modal/purchase-options/purchase-options-list-item/purchase-options-list-item.component.ts b/apps/isa-app/src/modal/purchase-options/purchase-options-list-item/purchase-options-list-item.component.ts index 587c1d09b..65246f33c 100644 --- a/apps/isa-app/src/modal/purchase-options/purchase-options-list-item/purchase-options-list-item.component.ts +++ b/apps/isa-app/src/modal/purchase-options/purchase-options-list-item/purchase-options-list-item.component.ts @@ -15,7 +15,7 @@ import { GIFT_CARD_MAX_PRICE, PRICE_PATTERN } from '../constants'; import { Item, PurchaseOptionsStore, isItemDTO, isShoppingCartItemDTO } from '../store'; import { OrderDeadlinePipeModule } from '@shared/pipes/order-deadline'; import { UiSelectModule } from '@ui/select'; -import { KeyValueDTOOfStringAndString } from '@swagger/cat'; +import { KeyValueDTOOfStringAndString } from '@generated/swagger/cat-search-api'; import { ScaleContentComponent } from '@shared/components/scale-content'; import moment from 'moment'; diff --git a/apps/isa-app/src/modal/purchase-options/purchase-options-modal.component.ts b/apps/isa-app/src/modal/purchase-options/purchase-options-modal.component.ts index 795035fbf..3af9d5457 100644 --- a/apps/isa-app/src/modal/purchase-options/purchase-options-modal.component.ts +++ b/apps/isa-app/src/modal/purchase-options/purchase-options-modal.component.ts @@ -14,7 +14,7 @@ import { } from './purchase-options-tile'; import { isGiftCard, Item, PurchaseOption, PurchaseOptionsStore } from './store'; import { delay, map, shareReplay, skip, switchMap, takeUntil, tap } from 'rxjs/operators'; -import { KeyValueDTOOfStringAndString } from '@swagger/cat'; +import { KeyValueDTOOfStringAndString } from '@generated/swagger/cat-search-api'; import { provideComponentStore } from '@ngrx/component-store'; @Component({ diff --git a/apps/isa-app/src/modal/purchase-options/purchase-options-modal.data.ts b/apps/isa-app/src/modal/purchase-options/purchase-options-modal.data.ts index 77adb8937..d2b25aa31 100644 --- a/apps/isa-app/src/modal/purchase-options/purchase-options-modal.data.ts +++ b/apps/isa-app/src/modal/purchase-options/purchase-options-modal.data.ts @@ -1,5 +1,5 @@ -import { ItemDTO } from '@swagger/cat'; -import { ShoppingCartItemDTO, BranchDTO } from '@swagger/checkout'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { ShoppingCartItemDTO, BranchDTO } from '@generated/swagger/checkout-api'; import { ActionType, PurchaseOption } from './store'; export interface PurchaseOptionsModalData { diff --git a/apps/isa-app/src/modal/purchase-options/purchase-options-tile/in-store-purchase-options-tile.component.ts b/apps/isa-app/src/modal/purchase-options/purchase-options-tile/in-store-purchase-options-tile.component.ts index 49a5a1ee4..f740c68d4 100644 --- a/apps/isa-app/src/modal/purchase-options/purchase-options-tile/in-store-purchase-options-tile.component.ts +++ b/apps/isa-app/src/modal/purchase-options/purchase-options-tile/in-store-purchase-options-tile.component.ts @@ -3,7 +3,7 @@ import { Component, ChangeDetectionStrategy, ChangeDetectorRef, ElementRef } fro import { FormsModule } from '@angular/forms'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; import { BranchNamePipe } from '@shared/pipes/branch'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { PurchaseOptionsStore } from '../store'; import { BasePurchaseOptionDirective } from './base-purchase-option.directive'; import { AuthService } from '@core/auth'; diff --git a/apps/isa-app/src/modal/purchase-options/purchase-options-tile/pickup-purchase-options-tile.component.ts b/apps/isa-app/src/modal/purchase-options/purchase-options-tile/pickup-purchase-options-tile.component.ts index 8fc73cea6..c19fb0bb0 100644 --- a/apps/isa-app/src/modal/purchase-options/purchase-options-tile/pickup-purchase-options-tile.component.ts +++ b/apps/isa-app/src/modal/purchase-options/purchase-options-tile/pickup-purchase-options-tile.component.ts @@ -3,7 +3,7 @@ import { Component, ChangeDetectionStrategy, ChangeDetectorRef, ElementRef } fro import { FormsModule } from '@angular/forms'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; import { BranchNamePipe } from '@shared/pipes/branch'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { PurchaseOptionsStore } from '../store'; import { BasePurchaseOptionDirective } from './base-purchase-option.directive'; import { AuthService } from '@core/auth'; diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.helpers.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.helpers.ts index 65be81581..ad8e4a6f8 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.helpers.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.helpers.ts @@ -1,6 +1,6 @@ -import { PriceDTO } from '@swagger/availability'; -import { ItemDTO } from '@swagger/cat'; -import { AvailabilityDTO, OLAAvailabilityDTO, ShoppingCartItemDTO } from '@swagger/checkout'; +import { PriceDTO } from '@generated/swagger/availability-api'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { AvailabilityDTO, OLAAvailabilityDTO, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { GIFT_CARD_TYPE } from '../constants'; import { ActionType, Item, ItemData, ItemPayloadWithSourceId, OrderType, PurchaseOption } from './purchase-options.types'; diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.selectors.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.selectors.ts index 5aa51277d..b4b7a4bdd 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.selectors.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.selectors.ts @@ -1,4 +1,4 @@ -import { PriceDTO, PriceValueDTO } from '@swagger/checkout'; +import { PriceDTO, PriceValueDTO } from '@generated/swagger/checkout-api'; import { DEFAULT_PRICE_DTO, DEFAULT_PRICE_VALUE, GIFT_CARD_MAX_PRICE, GIFT_CARD_TYPE, PURCHASE_OPTIONS } from '../constants'; import { isArchive, isGiftCard, isItemDTO } from './purchase-options.helpers'; import { PurchaseOptionsState } from './purchase-options.state'; diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.service.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.service.ts index ec877c81b..42ccf3da3 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.service.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.service.ts @@ -9,7 +9,7 @@ import { ItemsResult, ShoppingCartDTO, UpdateShoppingCartItemDTO, -} from '@swagger/checkout'; +} from '@generated/swagger/checkout-api'; import { Observable } from 'rxjs'; import { map, shareReplay, take } from 'rxjs/operators'; import { Branch, ItemData } from './purchase-options.types'; diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.state.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.state.ts index 19c09c7fe..b773ade3e 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.state.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.state.ts @@ -1,4 +1,4 @@ -import { PriceDTO } from '@swagger/checkout'; +import { PriceDTO } from '@generated/swagger/checkout-api'; import { ActionType, Availability, Branch, CanAdd, FetchingAvailability, Item, PurchaseOption } from './purchase-options.types'; export interface PurchaseOptionsState { diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.store.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.store.ts index 81e54de99..fc8c22919 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.store.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.store.ts @@ -27,11 +27,11 @@ import { import { Observable } from 'rxjs'; import { first, switchMap } from 'rxjs/operators'; import { DEFAULT_PRICE_DTO, DEFAULT_PRICE_VALUE, DEFAULT_VAT_VALUE } from '../constants'; -import { AddToShoppingCartDTO, EntityDTOContainerOfDestinationDTO, UpdateShoppingCartItemDTO } from '@swagger/checkout'; +import { AddToShoppingCartDTO, EntityDTOContainerOfDestinationDTO, UpdateShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { uniqueId } from 'lodash'; -import { VATDTO } from '@swagger/oms'; +import { VATDTO } from '@generated/swagger/oms-api'; import { DomainCatalogService } from '@domain/catalog'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; @Injectable() export class PurchaseOptionsStore extends ComponentStore { diff --git a/apps/isa-app/src/modal/purchase-options/store/purchase-options.types.ts b/apps/isa-app/src/modal/purchase-options/store/purchase-options.types.ts index 22c0acd58..d77d16010 100644 --- a/apps/isa-app/src/modal/purchase-options/store/purchase-options.types.ts +++ b/apps/isa-app/src/modal/purchase-options/store/purchase-options.types.ts @@ -1,6 +1,6 @@ import { ItemData as AvailabilityItemData } from '@domain/availability'; -import { ItemDTO } from '@swagger/cat'; -import { AvailabilityDTO, BranchDTO, ItemPayload, ShoppingCartItemDTO } from '@swagger/checkout'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { AvailabilityDTO, BranchDTO, ItemPayload, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; export type ActionType = 'add' | 'update'; diff --git a/apps/isa-app/src/modal/reorder/reorder.component.spec.ts b/apps/isa-app/src/modal/reorder/reorder.component.spec.ts index 815a6e747..f573fc857 100644 --- a/apps/isa-app/src/modal/reorder/reorder.component.spec.ts +++ b/apps/isa-app/src/modal/reorder/reorder.component.spec.ts @@ -5,7 +5,7 @@ // import { DomainOmsService } from '@domain/oms'; // import { ReorderModalComponent } from '@modal/reorder'; // import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator'; -// import { AvailabilityDTO2, AvailabilityType } from '@swagger/oms'; +// import { AvailabilityDTO2, AvailabilityType } from '@generated/swagger/oms-api'; // import { UiCommonModule } from '@ui/common'; // import { UiIconModule } from '@ui/icon'; // import { UiModalRef } from '@ui/modal'; diff --git a/apps/isa-app/src/modal/reorder/reorder.component.ts b/apps/isa-app/src/modal/reorder/reorder.component.ts index 51428afed..35a0817a9 100644 --- a/apps/isa-app/src/modal/reorder/reorder.component.ts +++ b/apps/isa-app/src/modal/reorder/reorder.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { DomainAvailabilityService } from '@domain/availability'; import { DomainOmsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; -import { AvailabilityDTO2, OrderItemListItemDTO } from '@swagger/oms'; +import { AvailabilityDTO2, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiModalRef } from '@ui/modal'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { catchError, map, shareReplay, switchMap, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/modal/reorder/reorder.result.ts b/apps/isa-app/src/modal/reorder/reorder.result.ts index 28734b1d8..72a62ce40 100644 --- a/apps/isa-app/src/modal/reorder/reorder.result.ts +++ b/apps/isa-app/src/modal/reorder/reorder.result.ts @@ -1,4 +1,4 @@ -import { AvailabilityDTO2, OrderItemListItemDTO } from '@swagger/oms'; +import { AvailabilityDTO2, OrderItemListItemDTO } from '@generated/swagger/oms-api'; export interface ReorderResult { item: OrderItemListItemDTO; diff --git a/apps/isa-app/src/modal/reviews/reviews.component.ts b/apps/isa-app/src/modal/reviews/reviews.component.ts index 00aa07ed4..728e7b93f 100644 --- a/apps/isa-app/src/modal/reviews/reviews.component.ts +++ b/apps/isa-app/src/modal/reviews/reviews.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { ReviewDTO } from '@swagger/cat'; +import { ReviewDTO } from '@generated/swagger/cat-search-api'; import { UiModalRef } from '@ui/modal'; @Component({ diff --git a/apps/isa-app/src/modal/send-order-confirmation/send-order-confirmation-modal.component.ts b/apps/isa-app/src/modal/send-order-confirmation/send-order-confirmation-modal.component.ts index 61aa31206..85d304088 100644 --- a/apps/isa-app/src/modal/send-order-confirmation/send-order-confirmation-modal.component.ts +++ b/apps/isa-app/src/modal/send-order-confirmation/send-order-confirmation-modal.component.ts @@ -4,7 +4,7 @@ import { SendOrderConfirmationModalData, SendOrderConfirmationModalResult } from import { FormControldModule } from '@shared/components/form-control'; import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; import { IconComponent } from '@shared/components/icon'; -import { NotificationChannel, OrderService } from '@swagger/oms'; +import { NotificationChannel, OrderService } from '@generated/swagger/oms-api'; import { ToasterService } from '@shared/shell'; import { validateEmail } from 'apps/isa-app/src/page/customer/validators/email-validator'; diff --git a/apps/isa-app/src/modal/send-order-confirmation/types.ts b/apps/isa-app/src/modal/send-order-confirmation/types.ts index cbc441491..b8c640ab8 100644 --- a/apps/isa-app/src/modal/send-order-confirmation/types.ts +++ b/apps/isa-app/src/modal/send-order-confirmation/types.ts @@ -1,4 +1,4 @@ -import { DisplayOrderDTO, OrderItemSubsetTaskDTO } from '@swagger/oms'; +import { DisplayOrderDTO, OrderItemSubsetTaskDTO } from '@generated/swagger/oms-api'; export type SendOrderConfirmationModalData = DisplayOrderDTO[]; diff --git a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.component.ts b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.component.ts index e7d1d6d2c..7943aa58e 100644 --- a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.component.ts +++ b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { DomainPackageInspectionService } from '@domain/package-inspection'; -import { PackageArrivalStatusDTO, PackageDTO2 } from '@swagger/wws'; +import { PackageArrivalStatusDTO, PackageDTO2 } from '@generated/swagger/wws-api'; import { UiModalRef } from '@ui/modal'; import { WrongDestinationModalData } from './wrong-destination-modal.data'; import { PackageListModule } from '@shared/components/package-list'; diff --git a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.data.ts b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.data.ts index bf5f11f66..44adccbd3 100644 --- a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.data.ts +++ b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.data.ts @@ -1,4 +1,4 @@ -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; export interface WrongDestinationModalData { packages: PackageDTO2[]; diff --git a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.service.ts b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.service.ts index 02ced8f4a..f2163c966 100644 --- a/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.service.ts +++ b/apps/isa-app/src/modal/wrong-destination/wrong-destination-modal.service.ts @@ -1,6 +1,6 @@ import { inject, Injectable } from '@angular/core'; import { DomainPackageInspectionService } from '@domain/package-inspection'; -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; import { UiModalRef, UiModalService } from '@ui/modal'; import { Observable } from 'rxjs'; import { WrongDestinationModalComponent } from './wrong-destination-modal.component'; diff --git a/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-item.component.ts b/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-item.component.ts index 3deebfc7a..f2033bf9d 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-item.component.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-item.component.ts @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ApplicationService } from '@core/application'; import { EnvironmentService } from '@core/environment'; import { DomainAvailabilityService, DomainInStockService } from '@domain/availability'; -import { ProductListItemDTO } from '@swagger/wws'; +import { ProductListItemDTO } from '@generated/swagger/wws-api'; import { DateAdapter } from '@ui/common'; import { debounceTime, filter, map, shareReplay, switchMap } from 'rxjs/operators'; import { PriceUpdateComponentStore } from '../price-update.component.store'; diff --git a/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-list.component.ts b/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-list.component.ts index a5f44bb32..321be643b 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-list.component.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update-list/price-update-list.component.ts @@ -1,6 +1,6 @@ import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { ChangeDetectionStrategy, Component, Input, OnChanges, ViewChild } from '@angular/core'; -import { ProductListItemDTO } from '@swagger/wws'; +import { ProductListItemDTO } from '@generated/swagger/wws-api'; import { map } from 'rxjs/operators'; import { PriceUpdateComponentStore } from '../price-update.component.store'; import { trigger, transition, style, animate } from '@angular/animations'; diff --git a/apps/isa-app/src/page/assortment/price-update/price-update.component.spec.ts b/apps/isa-app/src/page/assortment/price-update/price-update.component.spec.ts index 8f6d6a2a3..55e5568e7 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update.component.spec.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update.component.spec.ts @@ -3,7 +3,7 @@ // import { Config } from '@core/config'; // import { DomainProductListService } from '@domain/product-list'; // import { createComponentFactory, Spectator } from '@ngneat/spectator'; -// import { ProductListItemDTO } from '@swagger/wws'; +// import { ProductListItemDTO } from '@generated/swagger/wws-api'; // import { UISvgIconComponent } from '@ui/icon'; // import { UiModalService } from '@ui/modal'; // import { MockComponent } from 'ng-mocks'; diff --git a/apps/isa-app/src/page/assortment/price-update/price-update.component.state.ts b/apps/isa-app/src/page/assortment/price-update/price-update.component.state.ts index 880f1830f..831fe5717 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update.component.state.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update.component.state.ts @@ -1,4 +1,4 @@ -import { ProductListItemDTO } from '@swagger/wws'; +import { ProductListItemDTO } from '@generated/swagger/wws-api'; import { UiFilter } from '@ui/filter'; export interface PriceUpdateComponentState { diff --git a/apps/isa-app/src/page/assortment/price-update/price-update.component.store.ts b/apps/isa-app/src/page/assortment/price-update/price-update.component.store.ts index c20830295..6dd59f4b8 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update.component.store.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update.component.store.ts @@ -8,7 +8,7 @@ import { ListResponseArgsOfProductListItemDTO, ProductListItemDTO, QuerySettingsDTO, -} from '@swagger/wws'; +} from '@generated/swagger/wws-api'; import { UiFilter } from '@ui/filter'; import { UiModalService } from '@ui/modal'; import { isNil } from 'lodash'; diff --git a/apps/isa-app/src/page/assortment/price-update/price-update.component.ts b/apps/isa-app/src/page/assortment/price-update/price-update.component.ts index 5edc6f70c..79d285089 100644 --- a/apps/isa-app/src/page/assortment/price-update/price-update.component.ts +++ b/apps/isa-app/src/page/assortment/price-update/price-update.component.ts @@ -8,7 +8,7 @@ import { combineLatest, Subject, Subscription } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb'; -import { ListResponseArgsOfProductListItemDTO } from '@swagger/wws'; +import { ListResponseArgsOfProductListItemDTO } from '@generated/swagger/wws-api'; import { provideCancelSearchSubject } from '@shared/services/cancel-subject'; @Component({ diff --git a/apps/isa-app/src/page/catalog/article-details/article-details-text/article-details-text.component.ts b/apps/isa-app/src/page/catalog/article-details/article-details-text/article-details-text.component.ts index db8bf0409..082545a1d 100644 --- a/apps/isa-app/src/page/catalog/article-details/article-details-text/article-details-text.component.ts +++ b/apps/isa-app/src/page/catalog/article-details/article-details-text/article-details-text.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { TextDTO } from '@swagger/cat'; +import { TextDTO } from '@generated/swagger/cat-search-api'; import { ArticleDetailsTextLinkComponent } from './article-details-text-link.component'; import { NgFor, NgSwitch, NgSwitchCase, NgSwitchDefault } from '@angular/common'; import { LineTypePipe } from './line-type.pipe'; diff --git a/apps/isa-app/src/page/catalog/article-details/article-details.component.ts b/apps/isa-app/src/page/catalog/article-details/article-details.component.ts index 1750d990d..4e5cbe91a 100644 --- a/apps/isa-app/src/page/catalog/article-details/article-details.component.ts +++ b/apps/isa-app/src/page/catalog/article-details/article-details.component.ts @@ -2,9 +2,9 @@ import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, ElementRef, View import { ActivatedRoute, Router } from '@angular/router'; import { ApplicationService } from '@core/application'; import { DomainPrinterService } from '@domain/printer'; -import { ItemDTO as PrinterItemDTO } from '@swagger/print'; +import { ItemDTO as PrinterItemDTO } from '@generated/swagger/print-api'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { UiModalService } from '@ui/modal'; import { ModalReviewsComponent } from '@modal/reviews'; import { BehaviorSubject, combineLatest, Subscription } from 'rxjs'; @@ -15,7 +15,7 @@ import { ProductImageService } from '@cdn/product-image'; import { ModalAvailabilitiesComponent } from '@modal/availabilities'; import { slideYAnimation } from './slide.animation'; import { BreadcrumbService } from '@core/breadcrumb'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { DateAdapter } from '@ui/common'; import { DatePipe } from '@angular/common'; import { PurchaseOptionsModalService } from '@modal/purchase-options'; diff --git a/apps/isa-app/src/page/catalog/article-details/article-details.store.ts b/apps/isa-app/src/page/catalog/article-details/article-details.store.ts index d89e0190f..652e5974e 100644 --- a/apps/isa-app/src/page/catalog/article-details/article-details.store.ts +++ b/apps/isa-app/src/page/catalog/article-details/article-details.store.ts @@ -7,8 +7,8 @@ import { DomainCatalogService } from '@domain/catalog'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ItemDTO, ResponseArgsOfItemDTO } from '@swagger/cat'; -import { AvailabilityDTO, BranchDTO } from '@swagger/checkout'; +import { ItemDTO, ResponseArgsOfItemDTO } from '@generated/swagger/cat-search-api'; +import { AvailabilityDTO, BranchDTO } from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { combineLatest, Observable, of } from 'rxjs'; import { catchError, filter, first, map, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/catalog/article-search/article-search.mappings.ts b/apps/isa-app/src/page/catalog/article-search/article-search.mappings.ts index 93410606c..0ec4f0f21 100644 --- a/apps/isa-app/src/page/catalog/article-search/article-search.mappings.ts +++ b/apps/isa-app/src/page/catalog/article-search/article-search.mappings.ts @@ -1,4 +1,4 @@ -import { InputDTO, OptionDTO, InputType } from '@swagger/cat'; +import { InputDTO, OptionDTO, InputType } from '@generated/swagger/cat-search-api'; import { SelectFilter, SelectFilterOption, FilterType, Filter, FilterOption, RangeFilter } from '@ui/filter'; import { RangeFilterOption } from 'apps/ui/filter/src/lib/models/range-filter-option'; import { isRangeFilterOption, isSelectFilterOption } from 'apps/ui/filter/src/lib/type-guards'; diff --git a/apps/isa-app/src/page/catalog/article-search/article-search.store.ts b/apps/isa-app/src/page/catalog/article-search/article-search.store.ts index 105e2bb56..0f86ae068 100644 --- a/apps/isa-app/src/page/catalog/article-search/article-search.store.ts +++ b/apps/isa-app/src/page/catalog/article-search/article-search.store.ts @@ -4,8 +4,8 @@ import { Observable, Subject } from 'rxjs'; import { switchMap, takeUntil, tap, withLatestFrom } from 'rxjs/operators'; import { ComponentStore } from '@ngrx/component-store'; -import { ItemDTO, QueryTokenDTO, UISettingsDTO } from '@swagger/cat'; -import { BranchDTO } from '@swagger/checkout'; +import { ItemDTO, QueryTokenDTO, UISettingsDTO } from '@generated/swagger/cat-search-api'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { Filter } from '@shared/components/filter'; import { injectCancelSearchSubject } from '@shared/services/cancel-subject'; import { tapResponse } from '@ngrx/operators'; diff --git a/apps/isa-app/src/page/catalog/article-search/search-results/order-by-filter/stick-infos.pipe.ts b/apps/isa-app/src/page/catalog/article-search/search-results/order-by-filter/stick-infos.pipe.ts index 1af129167..d8cd4e62e 100644 --- a/apps/isa-app/src/page/catalog/article-search/search-results/order-by-filter/stick-infos.pipe.ts +++ b/apps/isa-app/src/page/catalog/article-search/search-results/order-by-filter/stick-infos.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { StockInfoDTO } from '@swagger/cat'; +import { StockInfoDTO } from '@generated/swagger/cat-search-api'; @Pipe({ name: 'stockInfos', diff --git a/apps/isa-app/src/page/catalog/article-search/search-results/search-result-item.component.ts b/apps/isa-app/src/page/catalog/article-search/search-results/search-result-item.component.ts index 0fcf34476..837c7f43f 100644 --- a/apps/isa-app/src/page/catalog/article-search/search-results/search-result-item.component.ts +++ b/apps/isa-app/src/page/catalog/article-search/search-results/search-result-item.component.ts @@ -4,7 +4,7 @@ import { ApplicationService } from '@core/application'; import { EnvironmentService } from '@core/environment'; import { DomainAvailabilityService, DomainInStockService } from '@domain/availability'; import { ComponentStore } from '@ngrx/component-store'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { DateAdapter } from '@ui/common'; import { isEqual } from 'lodash'; import { combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/page/catalog/article-search/search-results/search-results.component.ts b/apps/isa-app/src/page/catalog/article-search/search-results/search-results.component.ts index e6c32ae96..56c902572 100644 --- a/apps/isa-app/src/page/catalog/article-search/search-results/search-results.component.ts +++ b/apps/isa-app/src/page/catalog/article-search/search-results/search-results.component.ts @@ -16,8 +16,8 @@ import { ApplicationService } from '@core/application'; import { BreadcrumbService } from '@core/breadcrumb'; import { EnvironmentService } from '@core/environment'; import { DomainCheckoutService } from '@domain/checkout'; -import { ItemDTO } from '@swagger/cat'; -import { AddToShoppingCartDTO } from '@swagger/checkout'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; +import { AddToShoppingCartDTO } from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { CacheService } from '@core/cache'; import { isEqual } from 'lodash'; diff --git a/apps/isa-app/src/page/catalog/article-search/search-results/selected/search-result-selected.pipe.ts b/apps/isa-app/src/page/catalog/article-search/search-results/selected/search-result-selected.pipe.ts index 9ae930f2e..b2cfe422c 100644 --- a/apps/isa-app/src/page/catalog/article-search/search-results/selected/search-result-selected.pipe.ts +++ b/apps/isa-app/src/page/catalog/article-search/search-results/selected/search-result-selected.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; @Pipe({ name: 'searchResultSelected', diff --git a/apps/isa-app/src/page/catalog/page-catalog.component.ts b/apps/isa-app/src/page/catalog/page-catalog.component.ts index a7d515456..b61485be1 100644 --- a/apps/isa-app/src/page/catalog/page-catalog.component.ts +++ b/apps/isa-app/src/page/catalog/page-catalog.component.ts @@ -4,7 +4,7 @@ import { AuthService } from '@core/auth'; import { EnvironmentService } from '@core/environment'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; import { BreadcrumbComponent } from '@shared/components/breadcrumb'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { UiOverlayTriggerDirective } from '@ui/common'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { combineLatest, fromEvent, Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/catalog/shared/pipes/vat.pipe.ts b/apps/isa-app/src/page/catalog/shared/pipes/vat.pipe.ts index 0c3443109..daeb13418 100644 --- a/apps/isa-app/src/page/catalog/shared/pipes/vat.pipe.ts +++ b/apps/isa-app/src/page/catalog/shared/pipes/vat.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { VATType } from '@swagger/cat'; +import { VATType } from '@generated/swagger/cat-search-api'; @Pipe({ name: 'vat', diff --git a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy-data.ts b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy-data.ts index 0ba46eafe..2071fbfe2 100644 --- a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy-data.ts +++ b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy-data.ts @@ -1,4 +1,4 @@ -import { ShoppingCartItemDTO } from '@swagger/checkout'; +import { ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; export interface CheckoutDummyData extends ShoppingCartItemDTO { changeDataFromCart?: boolean; diff --git a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.component.ts b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.component.ts index 15b31f74e..0528d28c8 100644 --- a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.component.ts +++ b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ApplicationService } from '@core/application'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { DateAdapter } from '@ui/common'; import { UiErrorModalComponent, UiModalRef, UiModalService } from '@ui/modal'; import { Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.store.ts b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.store.ts index 1195517a4..87552917e 100644 --- a/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.store.ts +++ b/apps/isa-app/src/page/checkout/checkout-dummy/checkout-dummy.store.ts @@ -8,7 +8,7 @@ import { DomainOmsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ItemDTO } from '@swagger/cat'; +import { ItemDTO } from '@generated/swagger/cat-search-api'; import { AddToShoppingCartDTO, AvailabilityDTO, @@ -18,7 +18,7 @@ import { ProductDTO, PromotionDTO, ShoppingCartItemDTO, -} from '@swagger/checkout'; +} from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { Observable } from 'rxjs'; import { first, map, switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/checkout/checkout-review/checkout-review.component.ts b/apps/isa-app/src/page/checkout/checkout-review/checkout-review.component.ts index 4b5ce7af6..e12e6f680 100644 --- a/apps/isa-app/src/page/checkout/checkout-review/checkout-review.component.ts +++ b/apps/isa-app/src/page/checkout/checkout-review/checkout-review.component.ts @@ -14,7 +14,7 @@ import { Router } from '@angular/router'; import { ApplicationService } from '@core/application'; import { DomainAvailabilityService } from '@domain/availability'; import { DomainCheckoutService } from '@domain/checkout'; -import { AvailabilityDTO, BranchDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout'; +import { AvailabilityDTO, BranchDTO, DestinationDTO, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { UiMessageModalComponent, UiModalService } from '@ui/modal'; import { PrintModalData, PrintModalComponent } from '@modal/printer'; import { delay, first, map, switchMap, takeUntil, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/checkout/checkout-review/checkout-review.store.ts b/apps/isa-app/src/page/checkout/checkout-review/checkout-review.store.ts index bf870d605..bf1c3aca2 100644 --- a/apps/isa-app/src/page/checkout/checkout-review/checkout-review.store.ts +++ b/apps/isa-app/src/page/checkout/checkout-review/checkout-review.store.ts @@ -5,7 +5,7 @@ import { DomainCheckoutService } from '@domain/checkout'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { NotificationChannel, PayerDTO, ShoppingCartDTO, ShoppingCartItemDTO } from '@swagger/checkout'; +import { NotificationChannel, PayerDTO, ShoppingCartDTO, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { BehaviorSubject, Subject } from 'rxjs'; import { first, map, switchMap, takeUntil, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/checkout/checkout-review/details/checkout-review-details.component.ts b/apps/isa-app/src/page/checkout/checkout-review/details/checkout-review-details.component.ts index 801763420..3f5b7910a 100644 --- a/apps/isa-app/src/page/checkout/checkout-review/details/checkout-review-details.component.ts +++ b/apps/isa-app/src/page/checkout/checkout-review/details/checkout-review-details.component.ts @@ -7,7 +7,7 @@ import { first, map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators import { ApplicationService } from '@core/application'; import { DomainCheckoutService } from '@domain/checkout'; import { Router } from '@angular/router'; -import { BuyerDTO, NotificationChannel } from '@swagger/checkout'; +import { BuyerDTO, NotificationChannel } from '@generated/swagger/checkout-api'; import { CustomerSearchNavigation } from '@shared/services/navigation'; @Component({ diff --git a/apps/isa-app/src/page/checkout/checkout-review/shopping-cart-item/shopping-cart-item.component.ts b/apps/isa-app/src/page/checkout/checkout-review/shopping-cart-item/shopping-cart-item.component.ts index 433865a3e..9247bd657 100644 --- a/apps/isa-app/src/page/checkout/checkout-review/shopping-cart-item/shopping-cart-item.component.ts +++ b/apps/isa-app/src/page/checkout/checkout-review/shopping-cart-item/shopping-cart-item.component.ts @@ -5,7 +5,7 @@ import { DomainAvailabilityService } from '@domain/availability'; import { DomainCheckoutService } from '@domain/checkout'; import { ComponentStore } from '@ngrx/component-store'; import { ProductCatalogNavigationService } from '@shared/services/navigation'; -import { ItemType, ShoppingCartItemDTO } from '@swagger/checkout'; +import { ItemType, ShoppingCartItemDTO } from '@generated/swagger/checkout-api'; import { cloneDeep } from 'lodash'; import moment from 'moment'; import { combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/page/checkout/checkout-summary/checkout-summary.component.ts b/apps/isa-app/src/page/checkout/checkout-summary/checkout-summary.component.ts index 27944bd94..f687b7d8f 100644 --- a/apps/isa-app/src/page/checkout/checkout-summary/checkout-summary.component.ts +++ b/apps/isa-app/src/page/checkout/checkout-summary/checkout-summary.component.ts @@ -7,7 +7,7 @@ import { CrmCustomerService } from '@domain/crm'; import { ActivatedRoute, Router } from '@angular/router'; import { DomainOmsService } from '@domain/oms'; import { DomainCatalogService } from '@domain/catalog'; -import { DisplayOrderDTO, DisplayOrderItemDTO, DisplayOrderItemSubsetDTO } from '@swagger/oms'; +import { DisplayOrderDTO, DisplayOrderItemDTO, DisplayOrderItemSubsetDTO } from '@generated/swagger/oms-api'; import { BreadcrumbService } from '@core/breadcrumb'; import { ApplicationService } from '@core/application'; import { DomainPrinterService } from '@domain/printer'; diff --git a/apps/isa-app/src/page/checkout/pipes/branch-address.pipe.ts b/apps/isa-app/src/page/checkout/pipes/branch-address.pipe.ts index bb3676bbf..524c694e0 100644 --- a/apps/isa-app/src/page/checkout/pipes/branch-address.pipe.ts +++ b/apps/isa-app/src/page/checkout/pipes/branch-address.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; @Pipe({ name: 'branchAddress', diff --git a/apps/isa-app/src/page/checkout/pipes/buyer-name.pipe.ts b/apps/isa-app/src/page/checkout/pipes/buyer-name.pipe.ts index bc42a88e4..8cedcc477 100644 --- a/apps/isa-app/src/page/checkout/pipes/buyer-name.pipe.ts +++ b/apps/isa-app/src/page/checkout/pipes/buyer-name.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { BuyerDTO } from '@swagger/checkout'; +import { BuyerDTO } from '@generated/swagger/checkout-api'; @Pipe({ name: 'buyerName', diff --git a/apps/isa-app/src/page/checkout/pipes/payer-address.pipe.ts b/apps/isa-app/src/page/checkout/pipes/payer-address.pipe.ts index 6f7efcfeb..7d640a9df 100644 --- a/apps/isa-app/src/page/checkout/pipes/payer-address.pipe.ts +++ b/apps/isa-app/src/page/checkout/pipes/payer-address.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { PayerDTO } from '@swagger/checkout'; +import { PayerDTO } from '@generated/swagger/checkout-api'; @Pipe({ name: 'payerAddress', diff --git a/apps/isa-app/src/page/checkout/pipes/shipping-address.pipe.ts b/apps/isa-app/src/page/checkout/pipes/shipping-address.pipe.ts index ecb01f02d..8d0ea6d06 100644 --- a/apps/isa-app/src/page/checkout/pipes/shipping-address.pipe.ts +++ b/apps/isa-app/src/page/checkout/pipes/shipping-address.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ShippingAddressDTO } from '@swagger/checkout'; +import { ShippingAddressDTO } from '@generated/swagger/checkout-api'; @Pipe({ name: 'shippingAddress', diff --git a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-header/customer-order-details-header.component.ts b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-header/customer-order-details-header.component.ts index dc6243d86..b9e385c1b 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-header/customer-order-details-header.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-header/customer-order-details-header.component.ts @@ -10,8 +10,8 @@ import { } from '@angular/core'; import { CrmCustomerService } from '@domain/crm'; import { DomainOmsService } from '@domain/oms'; -import { NotificationChannel } from '@swagger/checkout'; -import { KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@swagger/oms'; +import { NotificationChannel } from '@generated/swagger/checkout-api'; +import { KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { DateAdapter } from '@ui/common'; import { cloneDeep } from 'lodash'; import { BehaviorSubject, combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts index a13e03cd4..fdb623b4d 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts @@ -15,7 +15,7 @@ import { DomainOmsService, DomainReceiptService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { OrderDTO, OrderItemListItemDTO, ReceiptDTO, ReceiptType } from '@swagger/oms'; +import { OrderDTO, OrderItemListItemDTO, ReceiptDTO, ReceiptType } from '@generated/swagger/oms-api'; import { isEqual } from 'lodash'; import { combineLatest, NEVER, Subject, Observable } from 'rxjs'; import { catchError, filter, first, map, switchMap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.component.ts b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.component.ts index 694419779..dbde0fbb9 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.component.ts @@ -14,7 +14,7 @@ import { EnvironmentService } from '@core/environment'; import { OrderItemsContext } from '@domain/oms'; import { provideComponentStore } from '@ngrx/component-store'; import { CustomerOrdersNavigationService } from '@shared/services/navigation'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO, OrderItemProcessingStatusValue, ReceiptDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO, OrderItemProcessingStatusValue, ReceiptDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiMessageModalComponent, UiModalService } from '@ui/modal'; import { BehaviorSubject, Subscription, combineLatest } from 'rxjs'; import { first, map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.store.ts b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.store.ts index 5e9480f5c..e285df303 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.store.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.store.ts @@ -3,7 +3,7 @@ import { DomainCustomerOrderService, DomainOmsService, OrderItemsContext } from import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { OrderDTO, OrderItemListItemDTO, OrderItemProcessingStatusValue, ReceiptDTO } from '@swagger/oms'; +import { OrderDTO, OrderItemListItemDTO, OrderItemProcessingStatusValue, ReceiptDTO } from '@generated/swagger/oms-api'; import { log } from '@utils/common'; import { isEqual } from 'lodash'; import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-edit/customer-order-edit.component.ts b/apps/isa-app/src/page/customer-order/customer-order-edit/customer-order-edit.component.ts index 8c22f2146..77c6c4b97 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-edit/customer-order-edit.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-edit/customer-order-edit.component.ts @@ -4,7 +4,7 @@ import { BreadcrumbService } from '@core/breadcrumb'; import { EnvironmentService } from '@core/environment'; import { DomainCustomerOrderService, DomainGoodsService, DomainOmsService } from '@domain/oms'; import { CustomerOrdersNavigationService } from '@shared/services/navigation'; -import { DBHOrderItemListItemDTO, OrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiMessageModalComponent, UiModalService } from '@ui/modal'; import { combineLatest, Observable } from 'rxjs'; import { map, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search-filter/order-branch-id-input/order-branch-id-input.component.ts b/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search-filter/order-branch-id-input/order-branch-id-input.component.ts index a965f52ea..3d27fd613 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search-filter/order-branch-id-input/order-branch-id-input.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search-filter/order-branch-id-input/order-branch-id-input.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, OnInit, OnDestroy } from '@angular/ import { FormControl, ReactiveFormsModule } from '@angular/forms'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; import { AbstractUiFilterInputDirective } from '@shared/components/filter'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { Subscription } from 'rxjs'; @Component({ diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search.store.ts b/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search.store.ts index b8f823069..983855015 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search.store.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/customer-order-search.store.ts @@ -5,7 +5,7 @@ import { DomainCustomerOrderService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; import { Filter } from '@shared/components/filter'; -import { BranchDTO, ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QuerySettingsDTO } from '@swagger/oms'; +import { BranchDTO, ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QuerySettingsDTO } from '@generated/swagger/oms-api'; import { isResponseArgs } from '@utils/object'; import { injectCancelSearchSubject } from '@shared/services/cancel-subject'; import { Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/providers/customer-order-search-main-autocomplete.provider.ts b/apps/isa-app/src/page/customer-order/customer-order-search/providers/customer-order-search-main-autocomplete.provider.ts index 8052000dd..c3c16b5d9 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/providers/customer-order-search-main-autocomplete.provider.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/providers/customer-order-search-main-autocomplete.provider.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ApplicationService } from '@core/application'; import { DomainCustomerOrderService } from '@domain/oms'; -import { BranchDTO } from '@swagger/checkout'; -import { AutocompleteTokenDTO } from '@swagger/oms'; +import { BranchDTO } from '@generated/swagger/checkout-api'; +import { AutocompleteTokenDTO } from '@generated/swagger/oms-api'; import { UiFilterAutocomplete, UiFilterAutocompleteProvider, UiInput } from '@ui/filter'; import { cloneDeep } from 'lodash'; import { Observable, of } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectable.pipe.ts b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectable.pipe.ts index 1ba305068..4123420f7 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectable.pipe.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectable.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsOutItemSelectable', diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectede.pipe.ts b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectede.pipe.ts index 3cc93c02c..cb3c7df17 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectede.pipe.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item-selectede.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsOutItemSelected', diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item.component.ts b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item.component.ts index e2f3c15ef..bca00dfb5 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-item.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, ElementRef } from '@angular/ import { ApplicationService } from '@core/application'; import { EnvironmentService } from '@core/environment'; import { ComponentStore } from '@ngrx/component-store'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { isEqual } from 'lodash'; import { CustomerOrderSearchStore } from '../customer-order-search.store'; import { CustomerOrdersNavigationService } from '@shared/services/navigation'; diff --git a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-search-results.component.ts b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-search-results.component.ts index 301a5e671..6ce6df7b1 100644 --- a/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-search-results.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order-search/search-results/customer-order-search-results.component.ts @@ -12,7 +12,7 @@ import { DestroyRef, } from '@angular/core'; import { debounceTime, filter, first, map, shareReplay, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { ActivatedRoute, NavigationStart, Router } from '@angular/router'; import { CustomerOrderSearchStore } from '../customer-order-search.store'; import { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer-order/customer-order.component.ts b/apps/isa-app/src/page/customer-order/customer-order.component.ts index 3c7bd46bb..f2aee8945 100644 --- a/apps/isa-app/src/page/customer-order/customer-order.component.ts +++ b/apps/isa-app/src/page/customer-order/customer-order.component.ts @@ -6,7 +6,7 @@ import { EnvironmentService } from '@core/environment'; import { provideComponentStore } from '@ngrx/component-store'; import { BranchSelectorComponent } from '@shared/components/branch-selector'; import { BreadcrumbComponent } from '@shared/components/breadcrumb'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { Observable, Subject, fromEvent } from 'rxjs'; import { first, map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer-order/pipes/customer-order-processing-status.pipe.ts b/apps/isa-app/src/page/customer-order/pipes/customer-order-processing-status.pipe.ts index 0462e233f..f69c5c4e8 100644 --- a/apps/isa-app/src/page/customer-order/pipes/customer-order-processing-status.pipe.ts +++ b/apps/isa-app/src/page/customer-order/pipes/customer-order-processing-status.pipe.ts @@ -1,5 +1,5 @@ import { Injectable, Pipe, PipeTransform } from '@angular/core'; -import { OrderItemProcessingStatusValue } from '@swagger/oms'; +import { OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; export const ProcessingStatusNameMap = new Map([ [1, { value: 'neu (angelegt)', disabled: true }], diff --git a/apps/isa-app/src/page/customer-order/pipes/notifications-channel.pipe.ts b/apps/isa-app/src/page/customer-order/pipes/notifications-channel.pipe.ts index 7d5e2ab40..dd305ad02 100644 --- a/apps/isa-app/src/page/customer-order/pipes/notifications-channel.pipe.ts +++ b/apps/isa-app/src/page/customer-order/pipes/notifications-channel.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { NotificationChannel } from '@swagger/oms'; +import { NotificationChannel } from '@generated/swagger/oms-api'; @Pipe({ name: 'notificationsChannel', diff --git a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item-full/customer-result-list-item-full.component.ts b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item-full/customer-result-list-item-full.component.ts index c3ba9f499..c2706c7be 100644 --- a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item-full/customer-result-list-item-full.component.ts +++ b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item-full/customer-result-list-item-full.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { CustomerLabelColor, CustomerLabelTextColor } from '../../../constants'; @Component({ diff --git a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item/customer-result-list-item.component.ts b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item/customer-result-list-item.component.ts index 2a31eaf09..fc4406b65 100644 --- a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item/customer-result-list-item.component.ts +++ b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list-item/customer-result-list-item.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { CustomerLabelColor, CustomerLabelTextColor } from '../../../constants'; @Component({ diff --git a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list.component.ts b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list.component.ts index 48143f932..44a8aee8d 100644 --- a/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list.component.ts +++ b/apps/isa-app/src/page/customer/components/customer-result-list/customer-result-list.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output, ViewChild, inject } from '@angular/core'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { BooleanInput, NumberInput, coerceBooleanProperty, coerceNumberProperty } from '@angular/cdk/coercion'; import { CustomerCreateNavigation, CustomerSearchNavigation } from '@shared/services/navigation'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; diff --git a/apps/isa-app/src/page/customer/components/customer-type-selector/customer-type-selector.component.ts b/apps/isa-app/src/page/customer/components/customer-type-selector/customer-type-selector.component.ts index 2ddc18011..03a921b1c 100644 --- a/apps/isa-app/src/page/customer/components/customer-type-selector/customer-type-selector.component.ts +++ b/apps/isa-app/src/page/customer/components/customer-type-selector/customer-type-selector.component.ts @@ -17,7 +17,7 @@ import { DomainCheckoutService } from '@domain/checkout'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { OptionDTO } from '@swagger/checkout'; +import { OptionDTO } from '@generated/swagger/checkout-api'; import { UiCheckboxComponent } from '@ui/checkbox'; import { first, isBoolean, isString } from 'lodash'; import { combineLatest, Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer/components/form-blocks/address/address-form-block.component.ts b/apps/isa-app/src/page/customer/components/form-blocks/address/address-form-block.component.ts index 49507635e..f9167f858 100644 --- a/apps/isa-app/src/page/customer/components/form-blocks/address/address-form-block.component.ts +++ b/apps/isa-app/src/page/customer/components/form-blocks/address/address-form-block.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input, OnInit, ChangeDetectorRef } from '@angular/core'; import { UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { CrmCustomerService } from '@domain/crm'; -import { CountryDTO } from '@swagger/crm'; +import { CountryDTO } from '@generated/swagger/crm-api'; import { camelCase } from 'lodash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer/components/form-blocks/interests/interests-form-block.component.ts b/apps/isa-app/src/page/customer/components/form-blocks/interests/interests-form-block.component.ts index 09e30675b..ef643a1dc 100644 --- a/apps/isa-app/src/page/customer/components/form-blocks/interests/interests-form-block.component.ts +++ b/apps/isa-app/src/page/customer/components/form-blocks/interests/interests-form-block.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { FormBlock } from '../form-block'; import { InterestsFormBlockData } from './interests-form-block-data'; -import { LoyaltyCardService } from '@swagger/crm'; +import { LoyaltyCardService } from '@generated/swagger/crm-api'; import { shareReplay } from 'rxjs/operators'; import { isEqual } from 'lodash'; import { memorize } from '@utils/common'; diff --git a/apps/isa-app/src/page/customer/components/form-blocks/name/name-form-block-data.ts b/apps/isa-app/src/page/customer/components/form-blocks/name/name-form-block-data.ts index cb9d91fb5..041517853 100644 --- a/apps/isa-app/src/page/customer/components/form-blocks/name/name-form-block-data.ts +++ b/apps/isa-app/src/page/customer/components/form-blocks/name/name-form-block-data.ts @@ -1,4 +1,4 @@ -import { Gender } from '@swagger/crm'; +import { Gender } from '@generated/swagger/crm-api'; export interface NameFormBlockData { gender?: Gender; diff --git a/apps/isa-app/src/page/customer/components/kundenkarte/kundenkarte.component.ts b/apps/isa-app/src/page/customer/components/kundenkarte/kundenkarte.component.ts index 9d2509e69..49f9b4c50 100644 --- a/apps/isa-app/src/page/customer/components/kundenkarte/kundenkarte.component.ts +++ b/apps/isa-app/src/page/customer/components/kundenkarte/kundenkarte.component.ts @@ -2,7 +2,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations' import { DecimalPipe, NgIf } from '@angular/common'; import { Component, Input, OnInit } from '@angular/core'; import { IconComponent } from '@shared/components/icon'; -import { BonusCardInfoDTO } from '@swagger/crm'; +import { BonusCardInfoDTO } from '@generated/swagger/crm-api'; @Component({ selector: 'page-customer-kundenkarte', diff --git a/apps/isa-app/src/page/customer/create-customer/abstract-create-customer.ts b/apps/isa-app/src/page/customer/create-customer/abstract-create-customer.ts index 9f263dbc6..f8ef76d14 100644 --- a/apps/isa-app/src/page/customer/create-customer/abstract-create-customer.ts +++ b/apps/isa-app/src/page/customer/create-customer/abstract-create-customer.ts @@ -4,7 +4,7 @@ import { AbstractControl, AsyncValidatorFn, UntypedFormControl, UntypedFormGroup import { ActivatedRoute, Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO, CustomerDTO, PayerDTO, ShippingAddressDTO } from '@swagger/crm'; +import { AddressDTO, CustomerDTO, PayerDTO, ShippingAddressDTO } from '@generated/swagger/crm-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiValidators } from '@ui/validators'; import { isNull } from 'lodash'; diff --git a/apps/isa-app/src/page/customer/create-customer/create-b2b-customer/create-b2b-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/create-b2b-customer/create-b2b-customer.component.ts index f3b6d6b05..bcc283679 100644 --- a/apps/isa-app/src/page/customer/create-customer/create-b2b-customer/create-b2b-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/create-b2b-customer/create-b2b-customer.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { ValidatorFn, Validators } from '@angular/forms'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { AddressFormBlockData } from '../../components/form-blocks'; import { NameFormBlockData } from '../../components/form-blocks/name/name-form-block-data'; import { OrganisationFormBlockData } from '../../components/form-blocks/organisation/organisation-form-block-data'; diff --git a/apps/isa-app/src/page/customer/create-customer/create-guest-customer/create-guest-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/create-guest-customer/create-guest-customer.component.ts index a9f03e727..345531633 100644 --- a/apps/isa-app/src/page/customer/create-customer/create-guest-customer/create-guest-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/create-guest-customer/create-guest-customer.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, ViewChild } from '@angular/core'; import { ValidatorFn, Validators } from '@angular/forms'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { DeviatingAddressFormBlockComponent } from '../../components/form-blocks'; import { AddressFormBlockComponent, AddressFormBlockData } from '../../components/form-blocks/address'; import { NameFormBlockData } from '../../components/form-blocks/name/name-form-block-data'; diff --git a/apps/isa-app/src/page/customer/create-customer/create-p4m-customer/create-p4m-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/create-p4m-customer/create-p4m-customer.component.ts index 6a1355596..bbb2f9cca 100644 --- a/apps/isa-app/src/page/customer/create-customer/create-p4m-customer/create-p4m-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/create-p4m-customer/create-p4m-customer.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, ViewChild, OnInit } from '@angular/core'; import { AsyncValidatorFn, ValidatorFn, Validators } from '@angular/forms'; import { Result } from '@domain/defs'; -import { CustomerDTO, CustomerInfoDTO, KeyValueDTOOfStringAndString } from '@swagger/crm'; +import { CustomerDTO, CustomerInfoDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/crm-api'; import { UiErrorModalComponent, UiModalResult } from '@ui/modal'; import { NEVER, Observable, of } from 'rxjs'; import { catchError, distinctUntilChanged, first, map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer/create-customer/create-store-customer/create-store-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/create-store-customer/create-store-customer.component.ts index 8048b1dbd..2493659c7 100644 --- a/apps/isa-app/src/page/customer/create-customer/create-store-customer/create-store-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/create-store-customer/create-store-customer.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { ValidatorFn, Validators } from '@angular/forms'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { map } from 'rxjs/operators'; import { AddressFormBlockData } from '../../components/form-blocks'; import { NameFormBlockData } from '../../components/form-blocks/name/name-form-block-data'; diff --git a/apps/isa-app/src/page/customer/create-customer/create-webshop-customer/create-webshop-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/create-webshop-customer/create-webshop-customer.component.ts index 73e0acff4..867a9af5e 100644 --- a/apps/isa-app/src/page/customer/create-customer/create-webshop-customer/create-webshop-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/create-webshop-customer/create-webshop-customer.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, ViewChild } from '@angular/core'; import { ValidatorFn, Validators } from '@angular/forms'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { map } from 'rxjs/operators'; import { AddressFormBlockComponent, AddressFormBlockData, DeviatingAddressFormBlockComponent } from '../../components/form-blocks'; import { NameFormBlockData } from '../../components/form-blocks/name/name-form-block-data'; diff --git a/apps/isa-app/src/page/customer/create-customer/customer-create-form-data.ts b/apps/isa-app/src/page/customer/create-customer/customer-create-form-data.ts index bfac46d88..1d792b8a0 100644 --- a/apps/isa-app/src/page/customer/create-customer/customer-create-form-data.ts +++ b/apps/isa-app/src/page/customer/create-customer/customer-create-form-data.ts @@ -1,4 +1,4 @@ -import { CustomerDTO, CustomerInfoDTO } from '@swagger/crm'; +import { CustomerDTO, CustomerInfoDTO } from '@generated/swagger/crm-api'; import { AddressFormBlockData, DeviatingAddressFormBlockData, PhoneNumbersFormBlockData } from '../components/form-blocks'; import { InterestsFormBlockData } from '../components/form-blocks/interests/interests-form-block-data'; import { NameFormBlockData } from '../components/form-blocks/name/name-form-block-data'; diff --git a/apps/isa-app/src/page/customer/create-customer/defs/customer-query-params.ts b/apps/isa-app/src/page/customer/create-customer/defs/customer-query-params.ts index 102f722c9..1bf0802e0 100644 --- a/apps/isa-app/src/page/customer/create-customer/defs/customer-query-params.ts +++ b/apps/isa-app/src/page/customer/create-customer/defs/customer-query-params.ts @@ -1,4 +1,4 @@ -import { CustomerDTO, Gender } from '@swagger/crm'; +import { CustomerDTO, Gender } from '@generated/swagger/crm-api'; export interface CreateCustomerQueryParams { p4mNumber?: string; diff --git a/apps/isa-app/src/page/customer/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts b/apps/isa-app/src/page/customer/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts index 031473b4a..ff88983a2 100644 --- a/apps/isa-app/src/page/customer/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts +++ b/apps/isa-app/src/page/customer/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; import { AsyncValidatorFn, ValidatorFn, Validators } from '@angular/forms'; import { Result } from '@domain/defs'; -import { CustomerDTO, KeyValueDTOOfStringAndString, PayerDTO } from '@swagger/crm'; +import { CustomerDTO, KeyValueDTOOfStringAndString, PayerDTO } from '@generated/swagger/crm-api'; import { AddressFormBlockData } from '../../components/form-blocks'; import { NameFormBlockData } from '../../components/form-blocks/name/name-form-block-data'; import { AbstractCreateCustomer } from '../abstract-create-customer'; diff --git a/apps/isa-app/src/page/customer/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts index ed9d64a3f..0909b9646 100644 --- a/apps/isa-app/src/page/customer/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts @@ -4,7 +4,7 @@ import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angula import { SelectModule } from '@shared/components/select'; import { FormControlComponent } from '@shared/components/form-control'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO, Gender, PayerDTO } from '@swagger/crm'; +import { AddressDTO, Gender, PayerDTO } from '@generated/swagger/crm-api'; import { map } from 'rxjs/operators'; import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; import { AddressSelectionModalService } from '@modal/address-selection'; diff --git a/apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts index 49e384dfb..ac2986b3e 100644 --- a/apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts @@ -4,7 +4,7 @@ import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angula import { SelectModule } from '@shared/components/select'; import { FormControlComponent } from '@shared/components/form-control'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO, Gender, ShippingAddressDTO } from '@swagger/crm'; +import { AddressDTO, Gender, ShippingAddressDTO } from '@generated/swagger/crm-api'; import { map, takeUntil } from 'rxjs/operators'; import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; import { AddressSelectionModalService } from '@modal/address-selection'; diff --git a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-billing-addresses/details-main-view-billing-addresses.component.ts b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-billing-addresses/details-main-view-billing-addresses.component.ts index 3776335c1..6cdba9592 100644 --- a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-billing-addresses/details-main-view-billing-addresses.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-billing-addresses/details-main-view-billing-addresses.component.ts @@ -3,7 +3,7 @@ import { CustomerSearchStore } from '../../store'; import { CrmCustomerService } from '@domain/crm'; import { debounceTime, map, switchMap, takeUntil } from 'rxjs/operators'; import { Observable, Subject, combineLatest } from 'rxjs'; -import { AssignedPayerDTO, CustomerDTO, ListResponseArgsOfAssignedPayerDTO } from '@swagger/crm'; +import { AssignedPayerDTO, CustomerDTO, ListResponseArgsOfAssignedPayerDTO } from '@generated/swagger/crm-api'; import { AsyncPipe, NgFor, NgIf } from '@angular/common'; import { CustomerPipesModule } from '@shared/pipes/customer'; import { ComponentStore } from '@ngrx/component-store'; @@ -13,7 +13,7 @@ import { UiModalService } from '@ui/modal'; import { CustomerSearchNavigation } from '@shared/services/navigation'; import { RouterLink } from '@angular/router'; import { CustomerDetailsViewMainComponent } from '../details-main-view.component'; -import { PayerDTO } from '@swagger/checkout'; +import { PayerDTO } from '@generated/swagger/checkout-api'; interface DetailsMainViewBillingAddressesComponentState { assignedPayers: AssignedPayerDTO[]; diff --git a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-delivery-addresses/details-main-view-delivery-addresses.component.ts b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-delivery-addresses/details-main-view-delivery-addresses.component.ts index 0ffa16f0b..910de4fe9 100644 --- a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-delivery-addresses/details-main-view-delivery-addresses.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view-delivery-addresses/details-main-view-delivery-addresses.component.ts @@ -3,7 +3,7 @@ import { CustomerSearchStore } from '../../store'; import { CrmCustomerService } from '@domain/crm'; import { map, switchMap, takeUntil } from 'rxjs/operators'; import { Observable, Subject, combineLatest } from 'rxjs'; -import { CustomerDTO, ListResponseArgsOfAssignedPayerDTO, ShippingAddressDTO } from '@swagger/crm'; +import { CustomerDTO, ListResponseArgsOfAssignedPayerDTO, ShippingAddressDTO } from '@generated/swagger/crm-api'; import { AsyncPipe, NgFor, NgIf } from '@angular/common'; import { CustomerPipesModule } from '@shared/pipes/customer'; import { ComponentStore } from '@ngrx/component-store'; diff --git a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view.component.ts index 0dae487ef..bcf0bbd44 100644 --- a/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view.component.ts @@ -3,7 +3,7 @@ import { Subject, combineLatest } from 'rxjs'; import { first, map, switchMap, takeUntil } from 'rxjs/operators'; import { CustomerSearchNavigation } from '@shared/services/navigation'; import { CustomerSearchStore } from '../store'; -import { ShippingAddressDTO, NotificationChannel, ShoppingCartDTO, PayerDTO, BuyerDTO } from '@swagger/checkout'; +import { ShippingAddressDTO, NotificationChannel, ShoppingCartDTO, PayerDTO, BuyerDTO } from '@generated/swagger/checkout-api'; import { DomainCheckoutService } from '@domain/checkout'; import { CantAddCustomerToCartData, CantAddCustomerToCartModalComponent, CantSelectGuestModalComponent } from '../../modals'; import { UiModalService } from '@ui/modal'; diff --git a/apps/isa-app/src/page/customer/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts index bf4fce06c..c071c9a34 100644 --- a/apps/isa-app/src/page/customer/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts @@ -4,7 +4,7 @@ import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angula import { SelectModule } from '@shared/components/select'; import { FormControlComponent } from '@shared/components/form-control'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO, Gender, PayerDTO } from '@swagger/crm'; +import { AddressDTO, Gender, PayerDTO } from '@generated/swagger/crm-api'; import { map, switchMap, takeUntil } from 'rxjs/operators'; import { AsyncPipe, NgForOf } from '@angular/common'; import { AddressSelectionModalService } from '@modal/address-selection'; diff --git a/apps/isa-app/src/page/customer/customer-search/edit-main-view/customer-data-edit.component.ts b/apps/isa-app/src/page/customer/customer-search/edit-main-view/customer-data-edit.component.ts index 5e9ffafe0..f6cfa54b0 100644 --- a/apps/isa-app/src/page/customer/customer-search/edit-main-view/customer-data-edit.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/edit-main-view/customer-data-edit.component.ts @@ -4,7 +4,7 @@ import { ChangeDetectorRef, Component, inject, OnInit } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { CrmCustomerService } from '@domain/crm'; -import { CountryDTO, CustomerDTO, KeyValueDTOOfStringAndString } from '@swagger/crm'; +import { CountryDTO, CustomerDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/crm-api'; import { UiValidators } from '@ui/validators'; import { Observable, combineLatest } from 'rxjs'; import { first, map, switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts index 6f0f199ca..b87694148 100644 --- a/apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts @@ -4,7 +4,7 @@ import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angula import { SelectModule } from '@shared/components/select'; import { FormControlComponent } from '@shared/components/form-control'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO, Gender, ShippingAddressDTO } from '@swagger/crm'; +import { AddressDTO, Gender, ShippingAddressDTO } from '@generated/swagger/crm-api'; import { map, switchMap, takeUntil } from 'rxjs/operators'; import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; import { AddressSelectionModalService } from '@modal/address-selection'; diff --git a/apps/isa-app/src/page/customer/customer-search/history-main-view/history-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/history-main-view/history-main-view.component.ts index 56b942594..dc2e5d3fc 100644 --- a/apps/isa-app/src/page/customer/customer-search/history-main-view/history-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/history-main-view/history-main-view.component.ts @@ -3,7 +3,7 @@ import { CrmCustomerService } from '@domain/crm'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { HistoryDTO } from '@swagger/crm'; +import { HistoryDTO } from '@generated/swagger/crm-api'; import { Observable, combineLatest } from 'rxjs'; import { map, switchMap, tap } from 'rxjs/operators'; import { CustomerSearchStore } from '../store'; diff --git a/apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.ts index 41435b0b9..d59536fd6 100644 --- a/apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.ts @@ -8,7 +8,7 @@ import { KundenkarteComponent } from '../../components/kundenkarte'; import { AsyncPipe, NgFor, NgIf } from '@angular/common'; import { IconComponent } from '@shared/components/icon'; import { CustomerSearchNavigation } from '@shared/services/navigation'; -import { BonusCardInfoDTO } from '@swagger/crm'; +import { BonusCardInfoDTO } from '@generated/swagger/crm-api'; import { CustomerMenuComponent } from '../../components/customer-menu'; @Component({ diff --git a/apps/isa-app/src/page/customer/customer-search/main-side-view/main-side-view.component.ts b/apps/isa-app/src/page/customer/customer-search/main-side-view/main-side-view.component.ts index 964885ec4..f597f33e3 100644 --- a/apps/isa-app/src/page/customer/customer-search/main-side-view/main-side-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/main-side-view/main-side-view.component.ts @@ -6,7 +6,7 @@ import { CustomerSearchStore } from '../store'; import { map } from 'rxjs/operators'; import { CustomerCreateNavigation } from '@shared/services/navigation'; import { combineLatest } from 'rxjs'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; @Component({ selector: 'page-customer-main-side-view', diff --git a/apps/isa-app/src/page/customer/customer-search/main-view/main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/main-view/main-view.component.ts index fc72978d8..307582b21 100644 --- a/apps/isa-app/src/page/customer/customer-search/main-view/main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/main-view/main-view.component.ts @@ -9,7 +9,7 @@ import { combineLatest } from 'rxjs'; import { CustomerSearchNavigation, CustomerCreateNavigation } from '@shared/services/navigation'; import { CustomerFilterMainViewModule } from '../filter-main-view/filter-main-view.module'; import { isEmpty } from 'lodash'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; @Component({ selector: 'page-customer-main-view', diff --git a/apps/isa-app/src/page/customer/customer-search/order-details-history-main-view/order-details-history-main-view.component.ts b/apps/isa-app/src/page/customer/customer-search/order-details-history-main-view/order-details-history-main-view.component.ts index 74356d56f..f1ffd044f 100644 --- a/apps/isa-app/src/page/customer/customer-search/order-details-history-main-view/order-details-history-main-view.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/order-details-history-main-view/order-details-history-main-view.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, inject } from '@ import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { HistoryDTO } from '@swagger/crm'; +import { HistoryDTO } from '@generated/swagger/crm-api'; import { Observable, Subject, combineLatest } from 'rxjs'; import { map, switchMap, takeUntil, tap } from 'rxjs/operators'; import { CustomerSearchStore } from '../store'; diff --git a/apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.ts b/apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.ts index 860d1d1ab..f0892490f 100644 --- a/apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.ts @@ -5,7 +5,7 @@ import { ProductImagePipe } from '@cdn/product-image'; import { IconComponent } from '@shared/components/icon'; import { BranchNamePipe, ResolveBranchPipe } from '@shared/pipes/branch'; import { OrderItemProcessingStatusPipe, OrderProcessingStatusPipe } from '@shared/pipes/order'; -import { OrderItemDTO } from '@swagger/oms'; +import { OrderItemDTO } from '@generated/swagger/oms-api'; import { BehaviorSubject, Subject, combineLatest } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { CustomerSearchStore } from '../../store'; diff --git a/apps/isa-app/src/page/customer/customer-search/orders-main-view/order-list-item/order-list-item.component.ts b/apps/isa-app/src/page/customer/customer-search/orders-main-view/order-list-item/order-list-item.component.ts index 30f54c78a..c65ce6493 100644 --- a/apps/isa-app/src/page/customer/customer-search/orders-main-view/order-list-item/order-list-item.component.ts +++ b/apps/isa-app/src/page/customer/customer-search/orders-main-view/order-list-item/order-list-item.component.ts @@ -3,7 +3,7 @@ import { Component, ChangeDetectionStrategy, Input, inject } from '@angular/core import { OrderDestinationPipe, OrderProcessingStatusPipe } from '@shared/pipes/order'; import { AddressPipe } from '@shared/pipes/customer'; -import { OrderListItemDTO } from '@swagger/oms'; +import { OrderListItemDTO } from '@generated/swagger/oms-api'; import { CustomerSearchStore } from '../../store'; import { CustomerSearchNavigation } from '@shared/services/navigation'; import { BehaviorSubject, combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/page/customer/customer-search/store/customer-search.state.ts b/apps/isa-app/src/page/customer/customer-search/store/customer-search.state.ts index fd8d6284d..88da10ec7 100644 --- a/apps/isa-app/src/page/customer/customer-search/store/customer-search.state.ts +++ b/apps/isa-app/src/page/customer/customer-search/store/customer-search.state.ts @@ -1,6 +1,6 @@ import { Filter } from '@shared/components/filter'; -import { CustomerDTO, CustomerInfoDTO } from '@swagger/crm'; -import { OrderDTO, OrderListItemDTO } from '@swagger/oms'; +import { CustomerDTO, CustomerInfoDTO } from '@generated/swagger/crm-api'; +import { OrderDTO, OrderListItemDTO } from '@generated/swagger/oms-api'; export interface CustomerSearchState { processId?: number; diff --git a/apps/isa-app/src/page/customer/customer-search/store/customer-search.store.ts b/apps/isa-app/src/page/customer/customer-search/store/customer-search.store.ts index ba5b4340f..4d2ae3c83 100644 --- a/apps/isa-app/src/page/customer/customer-search/store/customer-search.store.ts +++ b/apps/isa-app/src/page/customer/customer-search/store/customer-search.store.ts @@ -8,10 +8,10 @@ import { Observable, Subject } from 'rxjs'; import { distinctUntilChanged, filter, switchMap, takeUntil, tap, withLatestFrom, delayWhen, first, map } from 'rxjs/operators'; import { CrmCustomerService } from '@domain/crm'; import { Result } from '@domain/defs'; -import { CustomerDTO, ListResponseArgsOfCustomerInfoDTO, QuerySettingsDTO } from '@swagger/crm'; +import { CustomerDTO, ListResponseArgsOfCustomerInfoDTO, QuerySettingsDTO } from '@generated/swagger/crm-api'; import { Filter } from '@shared/components/filter'; import { DomainOmsService } from '@domain/oms'; -import { OrderDTO, OrderListItemDTO } from '@swagger/oms'; +import { OrderDTO, OrderListItemDTO } from '@generated/swagger/oms-api'; import { hash } from '@utils/common'; import { UiModalService } from '@ui/modal'; import { injectCancelSearchSubject } from '@shared/services/cancel-subject'; diff --git a/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.component.ts b/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.component.ts index f241120e9..b6bb09d92 100644 --- a/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.component.ts +++ b/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { AddressDTO } from '@swagger/crm'; +import { AddressDTO } from '@generated/swagger/crm-api'; import { UiModalRef } from '@ui/modal'; /** diff --git a/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.service.ts b/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.service.ts index 38f509226..924aa60a1 100644 --- a/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.service.ts +++ b/apps/isa-app/src/page/customer/modals/address-selection-modal/address-selection-modal.service.ts @@ -1,6 +1,6 @@ import { inject, Injectable } from '@angular/core'; import { CrmCustomerService } from '@domain/crm'; -import { AddressDTO } from '@swagger/crm'; +import { AddressDTO } from '@generated/swagger/crm-api'; import { UiModalService } from '@ui/modal'; import { map } from 'rxjs/operators'; import { DeprecatedAddressSelectionModalComponent } from './address-selection-modal.component'; diff --git a/apps/isa-app/src/page/customer/modals/cant-add-customer-to-cart-modal/cant-add-customer-to-cart.data.ts b/apps/isa-app/src/page/customer/modals/cant-add-customer-to-cart-modal/cant-add-customer-to-cart.data.ts index a9dfa52d2..1349bcdc7 100644 --- a/apps/isa-app/src/page/customer/modals/cant-add-customer-to-cart-modal/cant-add-customer-to-cart.data.ts +++ b/apps/isa-app/src/page/customer/modals/cant-add-customer-to-cart-modal/cant-add-customer-to-cart.data.ts @@ -1,4 +1,4 @@ -import { AttributeDTO, CustomerDTO, InputDTO } from '@swagger/crm'; +import { AttributeDTO, CustomerDTO, InputDTO } from '@generated/swagger/crm-api'; export interface CantAddCustomerToCartData { message: string; diff --git a/apps/isa-app/src/page/customer/modals/cant-select-guest/cant-select-guest-modal.component.ts b/apps/isa-app/src/page/customer/modals/cant-select-guest/cant-select-guest-modal.component.ts index ebfcb1e56..83a5c3bf4 100644 --- a/apps/isa-app/src/page/customer/modals/cant-select-guest/cant-select-guest-modal.component.ts +++ b/apps/isa-app/src/page/customer/modals/cant-select-guest/cant-select-guest-modal.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, inject } from '@angular/core'; import { ApplicationService } from '@core/application'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { UiModalRef } from '@ui/modal'; import { encodeFormData, mapCustomerDtoToCustomerCreateFormData } from '../../create-customer'; import { CustomerCreateNavigation } from '@shared/services/navigation'; diff --git a/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.component.ts b/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.component.ts index 2709a612d..1bee9e6ba 100644 --- a/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.component.ts +++ b/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { Router } from '@angular/router'; -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; import { UiModalRef } from '@ui/modal'; import { WebshopCustomnerAlreadyExistsModalData } from './webshop-customer-already-exists-modal.data'; diff --git a/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.data.ts b/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.data.ts index 1a7a6e115..7b770582c 100644 --- a/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.data.ts +++ b/apps/isa-app/src/page/customer/modals/webshop-customer-already-exists/webshop-customer-already-exists-modal.data.ts @@ -1,4 +1,4 @@ -import { CustomerDTO } from '@swagger/crm'; +import { CustomerDTO } from '@generated/swagger/crm-api'; export type WebshopCustomnerAlreadyExistsModalData = { customer: CustomerDTO; diff --git a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.component.ts b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.component.ts index e9e0f7f65..762a41156 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.component.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.component.ts @@ -5,7 +5,7 @@ import { CommandService } from '@core/command'; import { Config } from '@core/config'; import { OrderItemsContext } from '@domain/oms'; import { GoodsInOutOrderGroupItemComponent } from '@shared/components/goods-in-out'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiScrollContainerComponent } from '@ui/scroll-container'; import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.store.ts b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.store.ts index afc22d0a1..52183377c 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.store.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-list.store.ts @@ -4,7 +4,7 @@ import { DomainGoodsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO } from '@swagger/oms'; +import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { isResponseArgs } from '@utils/object'; import { Subject } from 'rxjs'; import { switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selectable.pipe.ts b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selectable.pipe.ts index 0d145feff..6ba180822 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selectable.pipe.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selectable.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsInCleanupSelectable', diff --git a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selected.pipe.ts b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selected.pipe.ts index 0e79326c9..eb862b9c6 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selected.pipe.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-cleanup-list/goods-in-cleanup-selected.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsInCleanupSelected', diff --git a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.spec.ts b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.spec.ts index c21db472c..e110d01bb 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.spec.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.spec.ts @@ -2,7 +2,7 @@ // import { ProductImageModule, ProductImageService } from '@cdn/product-image'; // import { DomainOmsService } from '@domain/oms'; // import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator'; -// import { OrderItemProcessingStatusValue } from '@swagger/oms'; +// import { OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; // import { UiIconModule } from '@ui/icon'; // import { UiModalService } from '@ui/modal'; // import { PipesModule } from 'apps/shared/goods-in-out/src/lib/pipes/pipes.module'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts index 6943102ce..7c4a6b3ad 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts @@ -3,7 +3,7 @@ import { CommandService } from '@core/command'; import { EnvironmentService } from '@core/environment'; import { DomainOmsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; -import { OrderItemListItemDTO, StockStatusCodeDTO } from '@swagger/oms'; +import { OrderItemListItemDTO, StockStatusCodeDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { isEqual } from 'lodash'; import { Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.component.ts b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.component.ts index 8cf0cae3e..5091bbbfe 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.component.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.component.ts @@ -13,7 +13,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { DomainOmsService } from '@domain/oms'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiFilter } from '@ui/filter'; import { UiScrollContainerComponent } from '@ui/scroll-container'; import { isEqual } from 'lodash'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.store.ts b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.store.ts index 252826998..32de0368d 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.store.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-list/goods-in-list.store.ts @@ -5,7 +5,7 @@ import { DomainGoodsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QueryTokenDTO } from '@swagger/oms'; +import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QueryTokenDTO } from '@generated/swagger/oms-api'; import { UiFilter } from '@ui/filter'; import { isResponseArgs } from '@utils/object'; import { Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.component.ts b/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.component.ts index 638ef62f0..650113149 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.component.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild, inject } from '@angular/core'; import { Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiScrollContainerComponent } from '@ui/scroll-container'; import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.store.ts b/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.store.ts index 58672a9bd..1d2f4d852 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.store.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-remission-preview/goods-in-remission-preview.store.ts @@ -4,7 +4,7 @@ import { DomainGoodsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO } from '@swagger/oms'; +import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { isResponseArgs } from '@utils/object'; import { Subject } from 'rxjs'; import { switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selectable.pipe.ts b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selectable.pipe.ts index ec750fa60..b174373fd 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selectable.pipe.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selectable.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsInReservationSelectable', diff --git a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selected.pipe.ts b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selected.pipe.ts index 3e30f1c06..4d6140ffd 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selected.pipe.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation-selected.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'goodsInReservationSelected', diff --git a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.component.ts b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.component.ts index 97c11682c..e57d8deb3 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.component.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.component.ts @@ -5,7 +5,7 @@ import { CommandService } from '@core/command'; import { Config } from '@core/config'; import { OrderItemsContext } from '@domain/oms'; import { GoodsInOutOrderGroupItemComponent } from '@shared/components/goods-in-out'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiScrollContainerComponent } from '@ui/scroll-container'; import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.store.ts b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.store.ts index 25c8255b2..d807b8aa4 100644 --- a/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.store.ts +++ b/apps/isa-app/src/page/goods-in/goods-in-reservation/goods-in-reservation.store.ts @@ -5,7 +5,7 @@ import { DomainGoodsService } from '@domain/oms'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QueryTokenDTO } from '@swagger/oms'; +import { ListResponseArgsOfOrderItemListItemDTO, OrderItemListItemDTO, QueryTokenDTO } from '@generated/swagger/oms-api'; import { isResponseArgs } from '@utils/object'; import { Subject } from 'rxjs'; import { switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.spec.ts b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.spec.ts index bebcb1185..9894750da 100644 --- a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.spec.ts +++ b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.spec.ts @@ -2,7 +2,7 @@ // import { ProductImagePipe } from '@cdn/product-image'; // import { createComponentFactory, Spectator } from '@ngneat/spectator'; // import { MathPipesModule } from '@shared/pipes/math'; -// import { ArrivalStatus } from '@swagger/wws'; +// import { ArrivalStatus } from '@generated/swagger/wws-api'; // import { UiCommonModule } from '@ui/common'; // import { UiTooltipModule } from '@ui/tooltip'; // import { MockPipe, MockService } from 'ng-mocks'; diff --git a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.ts b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.ts index da8f1b6eb..03f250cb3 100644 --- a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.ts +++ b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list-item.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, HostBinding } from '@angular/core'; -import { PackageItemDTO } from '@swagger/wws'; +import { PackageItemDTO } from '@generated/swagger/wws-api'; import { ReplaySubject } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { PackageDetailsListStore } from './package-details-list.store'; diff --git a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.spec.ts b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.spec.ts index 48ca2df1f..79a4d4094 100644 --- a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.spec.ts +++ b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.spec.ts @@ -2,7 +2,7 @@ // import { fakeAsync } from '@angular/core/testing'; // import { DomainAvailabilityService } from '@domain/availability'; // import { createComponentFactory, Spectator } from '@ngneat/spectator'; -// import { PackageItemDTO } from '@swagger/wws'; +// import { PackageItemDTO } from '@generated/swagger/wws-api'; // import { MockComponent } from 'ng-mocks'; // import { of } from 'rxjs'; // import { PackageDetailsListItemComponent } from './package-details-list-item.component'; diff --git a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.ts b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.ts index c26d94534..ec5e25d8e 100644 --- a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.ts +++ b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.component.ts @@ -1,7 +1,7 @@ import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { Component, ChangeDetectionStrategy, Input, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { provideComponentStore } from '@ngrx/component-store'; -import { PackageItemDTO } from '@swagger/wws'; +import { PackageItemDTO } from '@generated/swagger/wws-api'; import { isEqual } from 'lodash'; import { asapScheduler } from 'rxjs'; import { distinctUntilChanged } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.store.ts b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.store.ts index ab1db8682..3d0c52f63 100644 --- a/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.store.ts +++ b/apps/isa-app/src/page/package-inspection/components/package-details-list/package-details-list.store.ts @@ -3,7 +3,7 @@ import { DomainAvailabilityService } from '@domain/availability'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ArrivalStatus, PackageItemDTO, StockInfoDTO } from '@swagger/wws'; +import { ArrivalStatus, PackageItemDTO, StockInfoDTO } from '@generated/swagger/wws-api'; import { Observable } from 'rxjs'; import { filter, switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/package-inspection/package-details/package-details.component.ts b/apps/isa-app/src/page/package-inspection/package-details/package-details.component.ts index 3fc9d001a..56fdd8f5c 100644 --- a/apps/isa-app/src/page/package-inspection/package-details/package-details.component.ts +++ b/apps/isa-app/src/page/package-inspection/package-details/package-details.component.ts @@ -4,7 +4,7 @@ import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { DomainPackageInspectionService } from '@domain/package-inspection'; import { ToasterService } from '@shared/shell'; -import { ArrivalStatus, NestedKeyValueDTOOfStringAndString, PackageDetailResponseDTO } from '@swagger/wws'; +import { ArrivalStatus, NestedKeyValueDTOOfStringAndString, PackageDetailResponseDTO } from '@generated/swagger/wws-api'; import { UiModalService } from '@ui/modal'; import { Observable, Subject } from 'rxjs'; import { first, map, shareReplay, startWith, switchMap, retry, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/package-inspection/package-result/package-result-cache-data.ts b/apps/isa-app/src/page/package-inspection/package-result/package-result-cache-data.ts index 69e0ee046..80f5a85fb 100644 --- a/apps/isa-app/src/page/package-inspection/package-result/package-result-cache-data.ts +++ b/apps/isa-app/src/page/package-inspection/package-result/package-result-cache-data.ts @@ -1,4 +1,4 @@ -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; export interface PackageResultCacheData { packages: PackageDTO2[]; diff --git a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.spec.ts b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.spec.ts index 8da1a96ea..c90f14c25 100644 --- a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.spec.ts +++ b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.spec.ts @@ -1,6 +1,6 @@ // import { DomainPackageInspectionService } from '@domain/package-inspection'; // import { createComponentFactory, Spectator } from '@ngneat/spectator'; -// import { PackageDTO2 } from '@swagger/wws'; +// import { PackageDTO2 } from '@generated/swagger/wws-api'; // import { UISvgIconComponent } from '@ui/icon'; // import { MockComponent } from 'ng-mocks'; // import { PackageResultComponent } from './package-result.component'; diff --git a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.state.ts b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.state.ts index 98be8be64..77250d1fe 100644 --- a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.state.ts +++ b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.state.ts @@ -1,4 +1,4 @@ -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; import { UiFilter } from '@ui/filter'; export interface PackageResultComponentState { diff --git a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.store.ts b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.store.ts index 03dc27822..e14c33ff3 100644 --- a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.store.ts +++ b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.store.ts @@ -3,7 +3,7 @@ import { DomainPackageInspectionService, PackageStatusChangedEvent } from '@doma import { ComponentStore, OnStoreInit } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ListResponseArgsOfPackageDTO2, PackageDTO2, QuerySettingsDTO } from '@swagger/wws'; +import { ListResponseArgsOfPackageDTO2, PackageDTO2, QuerySettingsDTO } from '@generated/swagger/wws-api'; import { UiFilter } from '@ui/filter'; import { UiModalService } from '@ui/modal'; import { Observable, Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.ts b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.ts index 4f74d64bc..e7e9d3b35 100644 --- a/apps/isa-app/src/page/package-inspection/package-result/package-result.component.ts +++ b/apps/isa-app/src/page/package-inspection/package-result/package-result.component.ts @@ -4,7 +4,7 @@ import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb'; import { CacheService } from '@core/cache'; import { Config } from '@core/config'; import { provideComponentStore } from '@ngrx/component-store'; -import { ArrivalStatus, ListResponseArgsOfPackageDTO2 } from '@swagger/wws'; +import { ArrivalStatus, ListResponseArgsOfPackageDTO2 } from '@generated/swagger/wws-api'; import { UiFilter } from '@ui/filter'; import moment from 'moment'; import { combineLatest, Subject, Subscription } from 'rxjs'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-base.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-base.component.ts index f04d8ca32..5a9bf19f7 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-base.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-base.component.ts @@ -5,7 +5,11 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb'; import { take } from 'rxjs/operators'; import { NavigationRoute } from '@shared/services/navigation'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ListResponseArgsOfDBHOrderItemListItemDTO } from '@swagger/oms'; +import { + DBHOrderItemListItemDTO, + KeyValueDTOOfStringAndString, + ListResponseArgsOfDBHOrderItemListItemDTO, +} from '@generated/swagger/oms-api'; import { isEmpty } from 'lodash'; import { Observable } from 'rxjs'; import { RunCheckTrigger } from './trigger'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-details-base.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-details-base.component.ts index 61436c636..229726eef 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-details-base.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-details-base.component.ts @@ -3,7 +3,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; import { PickupShelfDetailsStore, PickupShelfStore } from './store'; import { ActionHandlerService } from './services/action-handler.service'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; import { OrderItemsContext } from '@domain/oms'; import { map } from 'rxjs/operators'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts index 7d8d9db1b..089327c3e 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts @@ -12,7 +12,7 @@ import { PickupShelfInNavigationService } from '@shared/services/navigation'; import { BehaviorSubject, asapScheduler, combineLatest } from 'rxjs'; import { distinctUntilChanged, filter, map, shareReplay, tap, throttleTime } from 'rxjs/operators'; import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { ActivatedRoute } from '@angular/router'; import { RunCheckTrigger } from '../../trigger'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts index 9840b97c1..f30b78537 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts @@ -4,7 +4,7 @@ import { SharedGoodsInOutOrderEditModule } from '@shared/components/goods-in-out import { first } from 'rxjs/operators'; import { AsyncPipe, NgIf } from '@angular/common'; import { PickupShelfInNavigationService } from '@shared/services/navigation'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; @Component({ selector: 'page-pickup-shelf-in-edit', diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts index 58f43baa0..e6f36590d 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts @@ -19,7 +19,7 @@ import { Group, GroupByPipe } from '@ui/common'; import { UiSpinnerModule } from '@ui/spinner'; import { PickupShelfInNavigationService } from '@shared/services/navigation'; import { map } from 'rxjs/operators'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { Observable, combineLatest, of } from 'rxjs'; import { PickupShelfDetailsStore, PickupShelfStore } from '../../store'; import { isEqual } from 'lodash'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in.component.ts index 400b12b0c..4bfb77f46 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-in/pickup-shelf-in.component.ts @@ -10,7 +10,7 @@ import { ActionHandlerServices } from '@domain/oms'; import { Config } from '@core/config'; import { ActionHandlerService } from '../services/action-handler.service'; import { GetNameForBreadcrumbData, GetPathForBreadcrumbData, PickupShelfBaseComponent } from '../pickup-shelf-base.component'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { Observable, of } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { ApplicationService } from '@core/application'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts index d6bd04371..f6882a8ba 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts @@ -3,7 +3,7 @@ import { PickupShelfDetailsBaseComponent } from '../../pickup-shelf-details-base import { AsyncPipe, NgFor, NgIf } from '@angular/common'; import { PickUpShelfDetailsHeaderComponent } from '../../shared/pickup-shelf-details-header/pickup-shelf-details-header.component'; import { PickUpShelfDetailsItemComponent } from '../../shared/pickup-shelf-details-item/pickup-shelf-details-item.component'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; import { PickUpShelfOutNavigationService } from '@shared/services/navigation'; import { BehaviorSubject, Observable, asapScheduler, combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts index 7545e298f..c237fbdba 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts @@ -4,7 +4,7 @@ import { SharedGoodsInOutOrderEditModule } from '@shared/components/goods-in-out import { first } from 'rxjs/operators'; import { PickUpShelfOutNavigationService } from '@shared/services/navigation'; import { AsyncPipe, NgIf } from '@angular/common'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; @Component({ selector: 'page-pickup-shelf-out-edit', diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts index 58f48d2ec..9e22ac188 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts @@ -21,7 +21,7 @@ import { Filter, FilterModule } from '@shared/components/filter'; import { BehaviorSubject, Observable, combineLatest } from 'rxjs'; import { isEqual } from 'lodash'; import { PickUpShelfListItemComponent } from '../../shared/pickup-shelf-list-item/pickup-shelf-list-item.component'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderItemProcessingStatusValue } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; import { Group, GroupByPipe } from '@shared/pipes/group-by'; import { UiSpinnerModule } from '@ui/spinner'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; diff --git a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out.component.ts b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out.component.ts index 8cbdf516d..aaefdcf88 100644 --- a/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/pickup-shelf-out/pickup-shelf-out.component.ts @@ -7,7 +7,7 @@ import { PickupShelfIOService, PickupShelfOutService } from '@domain/pickup-shel import { GetNameForBreadcrumbData, GetPathForBreadcrumbData, PickupShelfBaseComponent } from '../pickup-shelf-base.component'; import { NavigationRoute, PickUpShelfOutNavigationService } from '@shared/services/navigation'; import { AsyncPipe } from '@angular/common'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { Observable, of } from 'rxjs'; import { take } from 'rxjs/operators'; import { provideActionHandlers } from '@core/command'; diff --git a/apps/isa-app/src/page/pickup-shelf/services/action-handler.service.ts b/apps/isa-app/src/page/pickup-shelf/services/action-handler.service.ts index 763077417..4f4362a97 100644 --- a/apps/isa-app/src/page/pickup-shelf/services/action-handler.service.ts +++ b/apps/isa-app/src/page/pickup-shelf/services/action-handler.service.ts @@ -1,7 +1,7 @@ import { Injectable, inject } from '@angular/core'; import { CommandService } from '@core/command'; import { DomainReceiptService, OrderItemsContext } from '@domain/oms'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderDTO, ReceiptDTO, ReceiptType } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderDTO, ReceiptDTO, ReceiptType } from '@generated/swagger/oms-api'; import { catchError, map } from 'rxjs/operators'; @Injectable() diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-covers/pickup-shelf-details-covers.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-covers/pickup-shelf-details-covers.component.ts index 71cb35a7e..4b2273252 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-covers/pickup-shelf-details-covers.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-covers/pickup-shelf-details-covers.component.ts @@ -6,7 +6,7 @@ import { ProductImageModule } from '@cdn/product-image'; import { UiSliderModule } from '@ui/slider'; import { UiSpinnerModule } from '@ui/spinner'; import { PickupShelfProcessingStatusPipe } from '../pipes/processing-status.pipe'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { PickupShelfCoverCompartmentCodePipe } from '../pipes/cover-compartment-code.pipe'; import { PickupShelfShowCoverCompartmentCodePipe } from '../pipes/show-cover-compartment-code.pipe'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts index 65aa67b9a..c27096017 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts @@ -7,7 +7,7 @@ import { ComponentStore } from '@ngrx/component-store'; import { IconComponent } from '@shared/components/icon'; import { SharedMenuModule } from '@shared/components/menu'; import { CustomerSearchNavigation } from '@shared/services/navigation'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts index eebe5327f..bc9a35be4 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts @@ -1,6 +1,6 @@ import { AsyncPipe, DatePipe, NgFor, NgIf, NgSwitch, NgSwitchCase, NgTemplateOutlet } from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, inject } from '@angular/core'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, NotificationChannel, OrderDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, NotificationChannel, OrderDTO } from '@generated/swagger/oms-api'; import { PickupShelfDetailsStore } from '../../store'; import { map, shareReplay, tap, withLatestFrom } from 'rxjs/operators'; import { BehaviorSubject, Observable, combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts index 151853ab5..b41ffc7af 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts @@ -13,7 +13,7 @@ import { } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image'; -import { DBHOrderItemListItemDTO, OrderDTO, ReceiptDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, OrderDTO, ReceiptDTO } from '@generated/swagger/oms-api'; import { UiCommonModule } from '@ui/common'; import { UiTooltipModule } from '@ui/tooltip'; import { PickupShelfPaymentTypePipe } from '../pipes/payment-type.pipe'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.ts index b1b1bda6e..13ccc0711 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core'; import { PickupShelfDetailsStore } from '../../store'; import { map } from 'rxjs/operators'; -import { DBHOrderItemListItemDTO, OrderDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, OrderDTO } from '@generated/swagger/oms-api'; import { AsyncPipe, NgFor, NgIf, NgSwitch, NgSwitchCase } from '@angular/common'; import { IconModule } from '@shared/components/icon'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-history/pickup-shelf-history.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-history/pickup-shelf-history.component.ts index d2152283c..4d16a674c 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-history/pickup-shelf-history.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-history/pickup-shelf-history.component.ts @@ -6,7 +6,7 @@ import { PickupShelfIOService } from '@domain/pickup-shelf'; import { SharedHistoryListModule } from '@shared/components/history'; import { IconModule } from '@shared/components/icon'; import { PickUpShelfOutNavigationService, PickupShelfInNavigationService } from '@shared/services/navigation'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { Observable, combineLatest } from 'rxjs'; import { map, shareReplay, switchMap, take } from 'rxjs/operators'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts index b34b712f6..cb6a86d99 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts @@ -4,7 +4,7 @@ import { RouterLink, RouterLinkActive } from '@angular/router'; import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image'; import { EnvironmentService } from '@core/environment'; import { IconModule } from '@shared/components/icon'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; import { UiCommonModule } from '@ui/common'; import { PickupShelfProcessingStatusPipe } from '../pipes/processing-status.pipe'; import { FormsModule } from '@angular/forms'; diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pipes/cover-compartment-code.pipe.ts b/apps/isa-app/src/page/pickup-shelf/shared/pipes/cover-compartment-code.pipe.ts index 19bbb3df2..6a3236b47 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pipes/cover-compartment-code.pipe.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pipes/cover-compartment-code.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'coverCompartmentCode', diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pipes/notifications-channel.pipe.ts b/apps/isa-app/src/page/pickup-shelf/shared/pipes/notifications-channel.pipe.ts index 42e9b2c30..de385e049 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pipes/notifications-channel.pipe.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pipes/notifications-channel.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { NotificationChannel } from '@swagger/oms'; +import { NotificationChannel } from '@generated/swagger/oms-api'; @Pipe({ name: 'notificationsChannel', diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pipes/processing-status.pipe.ts b/apps/isa-app/src/page/pickup-shelf/shared/pipes/processing-status.pipe.ts index b5658df57..693e81456 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pipes/processing-status.pipe.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pipes/processing-status.pipe.ts @@ -1,5 +1,5 @@ import { Injectable, Pipe, PipeTransform } from '@angular/core'; -import { OrderItemProcessingStatusValue } from '@swagger/oms'; +import { OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; export const ProcessingStatusNameMap = new Map([ [1, { value: 'neu (angelegt)', disabled: true }], diff --git a/apps/isa-app/src/page/pickup-shelf/shared/pipes/show-cover-compartment-code.pipe.ts b/apps/isa-app/src/page/pickup-shelf/shared/pipes/show-cover-compartment-code.pipe.ts index 82770c5b3..22fcdfbae 100644 --- a/apps/isa-app/src/page/pickup-shelf/shared/pipes/show-cover-compartment-code.pipe.ts +++ b/apps/isa-app/src/page/pickup-shelf/shared/pipes/show-cover-compartment-code.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { DBHOrderItemListItemDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'showCoverCompartmentCode', diff --git a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts index 2a24a2ba4..ce5e11a86 100644 --- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts +++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts @@ -1,6 +1,6 @@ import moment from 'moment'; import { PickupShelfDetailsState } from './pickup-shelf-details.state'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; export const selectOrder = (s: PickupShelfDetailsState) => s.order; diff --git a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.state.ts b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.state.ts index 26bf20af3..5c72503ef 100644 --- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.state.ts +++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.state.ts @@ -1,11 +1,11 @@ -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { DBHOrderItemListItemDTO, OrderDTO, OrderItemProcessingStatusValue, OrderItemSubsetTaskListItemDTO, ReceiptDTO, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; export interface PickupShelfDetailsState { fetchingOrder?: boolean; diff --git a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.store.ts b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.store.ts index 1468415c6..a3999f1f0 100644 --- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.store.ts +++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.store.ts @@ -17,14 +17,14 @@ import { ResponseArgsOfIEnumerableOfValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO, ResponseArgsOfOrderDTO, ResponseArgsOfOrderItemSubsetDTO, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { PickupShelfIOService, PickupShelfService } from '@domain/pickup-shelf'; import { Injectable, inject } from '@angular/core'; import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap, withLatestFrom } from 'rxjs/operators'; import { UiModalService } from '@ui/modal'; import { CrmCustomerService } from '@domain/crm'; import * as Selectors from './pickup-shelf-details.selectors'; -import { CustomerInfoDTO, ListResponseArgsOfCustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO, ListResponseArgsOfCustomerInfoDTO } from '@generated/swagger/crm-api'; import { CacheService } from '@core/cache'; import { RunCheckTrigger } from '../trigger'; import { DomainReceiptService } from '@domain/oms'; diff --git a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.state.ts b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.state.ts index 9ebb09fdd..9942c7efb 100644 --- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.state.ts +++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.state.ts @@ -1,4 +1,4 @@ -import { DBHOrderItemListItemDTO, QuerySettingsDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, QuerySettingsDTO } from '@generated/swagger/oms-api'; export interface PickupShelfState { processId?: number; diff --git a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.store.ts b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.store.ts index 97869a5d7..02242d1b7 100644 --- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.store.ts +++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf.store.ts @@ -20,7 +20,7 @@ import { ListResponseArgsOfDBHOrderItemListItemDTO, QuerySettingsDTO, ResponseArgsOfQuerySettingsDTO, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { DestroyRef, Injectable, inject } from '@angular/core'; import { ToasterService } from '@shared/shell'; import { UiModalService } from '@ui/modal'; diff --git a/apps/isa-app/src/page/remission/create-remission/create-remission.component.ts b/apps/isa-app/src/page/remission/create-remission/create-remission.component.ts index 0d9bca921..402bbf466 100644 --- a/apps/isa-app/src/page/remission/create-remission/create-remission.component.ts +++ b/apps/isa-app/src/page/remission/create-remission/create-remission.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { DomainRemissionService } from '@domain/remission'; -import { ReceiptDTO, ReturnDTO } from '@swagger/remi'; +import { ReceiptDTO, ReturnDTO } from '@generated/swagger/inventory-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiSearchboxNextComponent } from '@ui/searchbox'; import { Subject } from 'rxjs'; diff --git a/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.component.ts b/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.component.ts index bb5c3d1c6..2510d3be0 100644 --- a/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.component.ts +++ b/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.component.ts @@ -3,7 +3,7 @@ import { UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { CacheService } from '@core/cache'; import { Config } from '@core/config'; import { DomainRemissionService } from '@domain/remission'; -import { ReturnItemDTO } from '@swagger/remi'; +import { ReturnItemDTO } from '@generated/swagger/inventory-api'; import { UiErrorModalComponent, UiMessageModalComponent, UiModalRef, UiModalService } from '@ui/modal'; import { BehaviorSubject, Subject } from 'rxjs'; import { first, map, takeUntil } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.data.ts b/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.data.ts index 5e532390d..217adcec4 100644 --- a/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.data.ts +++ b/apps/isa-app/src/page/remission/modals/add-product-modal/add-product-modal.data.ts @@ -1,4 +1,4 @@ -import { ReturnItemDTO } from '@swagger/remi'; +import { ReturnItemDTO } from '@generated/swagger/inventory-api'; export interface AddProductModalData { item: ReturnItemDTO; diff --git a/apps/isa-app/src/page/remission/remission-list/remission-list-item/remission-list-item.component.ts b/apps/isa-app/src/page/remission/remission-list/remission-list-item/remission-list-item.component.ts index 2efbff067..c0c7e9d2b 100644 --- a/apps/isa-app/src/page/remission/remission-list/remission-list-item/remission-list-item.component.ts +++ b/apps/isa-app/src/page/remission/remission-list/remission-list-item/remission-list-item.component.ts @@ -12,7 +12,7 @@ import { ValueTupleOfReceiptItemDTOAndReturnSuggestionDTO, ReturnItemDTO, ReturnSuggestionDTO, -} from '@swagger/remi'; +} from '@generated/swagger/inventory-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { Subject } from 'rxjs'; import { first, takeUntil } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/remission/remission-list/remission-list.component-store.ts b/apps/isa-app/src/page/remission/remission-list/remission-list.component-store.ts index 58fd87110..4627e0310 100644 --- a/apps/isa-app/src/page/remission/remission-list/remission-list.component-store.ts +++ b/apps/isa-app/src/page/remission/remission-list/remission-list.component-store.ts @@ -6,7 +6,7 @@ import { DomainRemissionService, RemissionListItem } from '@domain/remission'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ReturnItemDTO, ReturnSuggestionDTO, SupplierDTO } from '@swagger/remi'; +import { ReturnItemDTO, ReturnSuggestionDTO, SupplierDTO } from '@generated/swagger/inventory-api'; import { UiFilter } from '@ui/filter'; import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, switchMap, takeUntil, tap, withLatestFrom } from 'rxjs/operators'; @@ -284,7 +284,7 @@ export class RemissionListComponentStore extends ComponentStore .getItems({ queryToken: { ...filter?.getQueryToken(), - skip: options?.newSearch ? 0 : searchOptions?.skip ?? items?.length, + skip: options?.newSearch ? 0 : (searchOptions?.skip ?? items?.length), take: searchOptions?.take ?? 40, }, source, diff --git a/apps/isa-app/src/page/remission/remission-list/remission-list.component.ts b/apps/isa-app/src/page/remission/remission-list/remission-list.component.ts index 53e7cc127..4b2fc79cb 100644 --- a/apps/isa-app/src/page/remission/remission-list/remission-list.component.ts +++ b/apps/isa-app/src/page/remission/remission-list/remission-list.component.ts @@ -15,7 +15,7 @@ import { ApplicationService } from '@core/application'; import { BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { RemissionListItem } from '@domain/remission'; -import { SupplierDTO } from '@swagger/remi'; +import { SupplierDTO } from '@generated/swagger/inventory-api'; import { Subject, combineLatest, BehaviorSubject } from 'rxjs'; import { debounceTime, first, map, shareReplay, takeUntil, withLatestFrom } from 'rxjs/operators'; import { RemissionListItemComponent } from './remission-list-item'; diff --git a/apps/isa-app/src/page/remission/remission-list/remission.component-store.ts b/apps/isa-app/src/page/remission/remission-list/remission.component-store.ts index 20e003538..df2068e80 100644 --- a/apps/isa-app/src/page/remission/remission-list/remission.component-store.ts +++ b/apps/isa-app/src/page/remission/remission-list/remission.component-store.ts @@ -3,7 +3,7 @@ import { DomainRemissionService } from '@domain/remission'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ReturnDTO } from '@swagger/remi'; +import { ReturnDTO } from '@generated/swagger/inventory-api'; import { Observable, Subject } from 'rxjs'; import { switchMap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/remission/required-capacities/required-capacities.component.ts b/apps/isa-app/src/page/remission/required-capacities/required-capacities.component.ts index 620f51281..05ad281d6 100644 --- a/apps/isa-app/src/page/remission/required-capacities/required-capacities.component.ts +++ b/apps/isa-app/src/page/remission/required-capacities/required-capacities.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { ValueTupleOfStringAndIntegerAndIntegerAndNullableIntegerAndString } from '@swagger/remi'; +import { ValueTupleOfStringAndIntegerAndIntegerAndNullableIntegerAndString } from '@generated/swagger/inventory-api'; @Component({ selector: 'page-required-capacities', diff --git a/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details-item/shipping-document-details-item.component.ts b/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details-item/shipping-document-details-item.component.ts index 8dcc91133..0143862a5 100644 --- a/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details-item/shipping-document-details-item.component.ts +++ b/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details-item/shipping-document-details-item.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DomainRemissionService } from '@domain/remission'; -import { ReceiptItemDTO } from '@swagger/remi'; +import { ReceiptItemDTO } from '@generated/swagger/inventory-api'; @Component({ selector: 'page-shared-shipping-document-details-item', diff --git a/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details.component.ts b/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details.component.ts index cf0a237fd..42911e2ad 100644 --- a/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details.component.ts +++ b/apps/isa-app/src/page/remission/shared/shipping-document-details/shipping-document-details.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { DomainRemissionService } from '@domain/remission'; -import { ReceiptItemDTO, ReturnDTO } from '@swagger/remi'; +import { ReceiptItemDTO, ReturnDTO } from '@generated/swagger/inventory-api'; import { UiErrorModalComponent, UiMessageModalComponent, UiModalService } from '@ui/modal'; @Component({ diff --git a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-details/shipping-document-details.component.ts b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-details/shipping-document-details.component.ts index 913ffb155..b848d51ae 100644 --- a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-details/shipping-document-details.component.ts +++ b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-details/shipping-document-details.component.ts @@ -7,7 +7,7 @@ import { DomainRemissionService } from '@domain/remission'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { ReturnDTO } from '@swagger/remi'; +import { ReturnDTO } from '@generated/swagger/inventory-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { NEVER, Observable } from 'rxjs'; import { catchError, filter, first, map, shareReplay, switchMap, take, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list-item/shipping-document-list-item.component.ts b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list-item/shipping-document-list-item.component.ts index ab97ae044..66bffb5cc 100644 --- a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list-item/shipping-document-list-item.component.ts +++ b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list-item/shipping-document-list-item.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { ReturnDTO } from '@swagger/remi'; +import { ReturnDTO } from '@generated/swagger/inventory-api'; @Component({ selector: 'page-shipping-document-list-item', diff --git a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list.component.ts b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list.component.ts index f7c4c1ea5..75417177e 100644 --- a/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list.component.ts +++ b/apps/isa-app/src/page/remission/shipping-document-list/shipping-document-list.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { DomainRemissionService } from '@domain/remission'; -import { ReturnDTO } from '@swagger/remi'; +import { ReturnDTO } from '@generated/swagger/inventory-api'; import { DateAdapter } from '@ui/common'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/components/task-info/task-info.component.ts b/apps/isa-app/src/page/task-calendar/components/task-info/task-info.component.ts index 382b379f3..47bb57a5d 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-info/task-info.component.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-info/task-info.component.ts @@ -13,8 +13,8 @@ import { } from '@angular/core'; import { Router } from '@angular/router'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { FileDTO } from '@swagger/checkout'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { FileDTO } from '@generated/swagger/checkout-api'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { DateAdapter } from '@ui/common'; import { UiModalRef, UiModalService } from '@ui/modal'; import { isNullOrUndefined } from '@utils/common'; diff --git a/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-status.pipe.ts b/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-status.pipe.ts index 0786c8f0e..52781aca4 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-status.pipe.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-status.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; import { DomainTaskCalendarService, ProcessingStatusList } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; @Pipe({ name: 'filterStatus', diff --git a/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-type.pipe.ts b/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-type.pipe.ts index cd2505fea..851c24fff 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-type.pipe.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-list/pipes/filter-type.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; import { DomainTaskCalendarService, InfoType } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { isArray } from '@utils/common'; @Pipe({ diff --git a/apps/isa-app/src/page/task-calendar/components/task-list/task-list-group.component.ts b/apps/isa-app/src/page/task-calendar/components/task-list/task-list-group.component.ts index 594b4cbe8..d62966ea2 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-list/task-list-group.component.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-list/task-list-group.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { DomainPrinterService } from '@domain/printer'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { UiModalService } from '@ui/modal'; import { TaskCalendarStore } from '../../task-calendar.store'; diff --git a/apps/isa-app/src/page/task-calendar/components/task-list/task-list-item.component.ts b/apps/isa-app/src/page/task-calendar/components/task-list/task-list-item.component.ts index 626cb5c81..a82e21e03 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-list/task-list-item.component.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-list/task-list-item.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, HostBinding } from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { combineLatest, ReplaySubject } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/components/task-list/task-list.component.ts b/apps/isa-app/src/page/task-calendar/components/task-list/task-list.component.ts index e010432db..15b8cf945 100644 --- a/apps/isa-app/src/page/task-calendar/components/task-list/task-list.component.ts +++ b/apps/isa-app/src/page/task-calendar/components/task-list/task-list.component.ts @@ -1,7 +1,7 @@ import { DatePipe } from '@angular/common'; import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output } from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { DateAdapter } from '@ui/common'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { map, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-details/article-list-details.component.ts b/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-details/article-list-details.component.ts index d34299265..d8757b090 100644 --- a/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-details/article-list-details.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-details/article-list-details.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { ArticleDTO } from '@swagger/eis'; +import { ArticleDTO } from '@generated/swagger/eis-api'; @Component({ selector: 'page-article-list-details', diff --git a/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-modal.component.ts index 85cdc59c5..4b8328765 100644 --- a/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/article-list/article-list-modal.component.ts @@ -5,7 +5,7 @@ import { ApplicationService } from '@core/application'; import { DomainPrinterService } from '@domain/printer'; import { DomainTaskCalendarService } from '@domain/task-calendar'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; -import { ArticleDTO, DisplayInfoDTO } from '@swagger/eis'; +import { ArticleDTO, DisplayInfoDTO } from '@generated/swagger/eis-api'; import { UiModalRef, UiModalService } from '@ui/modal'; import { first, map } from 'rxjs/operators'; import { ProductCatalogNavigationService } from '@shared/services/navigation'; diff --git a/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.component.ts index 44db0a92d..4edfa27bf 100644 --- a/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { FileDTO } from '@swagger/eis'; +import { FileDTO } from '@generated/swagger/eis-api'; import { UiModalRef } from '@ui/modal'; import { ImageViewerModalData } from './image-viewer-modal.data'; diff --git a/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.data.ts b/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.data.ts index 9307d180b..19d072cc7 100644 --- a/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.data.ts +++ b/apps/isa-app/src/page/task-calendar/modals/image-viewer/image-viewer-modal.data.ts @@ -1,4 +1,4 @@ -import { FileDTO } from '@swagger/checkout'; +import { FileDTO } from '@generated/swagger/checkout-api'; export interface ImageViewerModalData { file: FileDTO; diff --git a/apps/isa-app/src/page/task-calendar/modals/info/info-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/info/info-modal.component.ts index 728f7ed13..293c1a9f0 100644 --- a/apps/isa-app/src/page/task-calendar/modals/info/info-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/info/info-modal.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, HostBinding } from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { UiModalRef } from '@ui/modal'; import { combineLatest, ReplaySubject } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.component.ts index 12301a479..af1a30ed2 100644 --- a/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/ import { DomainPrinterService } from '@domain/printer'; import { DomainTaskCalendarService } from '@domain/task-calendar'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; -import { FileDTO } from '@swagger/eis'; +import { FileDTO } from '@generated/swagger/eis-api'; import { UiModalRef, UiModalService } from '@ui/modal'; import { PDFDocumentProxy } from 'ng2-pdf-viewer'; import { PdfViewerModalData } from './pdf-viewer-modal.data'; diff --git a/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.data.ts b/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.data.ts index f4648fffd..4ec4f8bce 100644 --- a/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.data.ts +++ b/apps/isa-app/src/page/task-calendar/modals/pdf-viewer/pdf-viewer-modal.data.ts @@ -1,4 +1,4 @@ -import { FileDTO } from '@swagger/checkout'; +import { FileDTO } from '@generated/swagger/checkout-api'; export interface PdfViewerModalData { file: FileDTO; diff --git a/apps/isa-app/src/page/task-calendar/modals/preinfo/preinfo-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/preinfo/preinfo-modal.component.ts index d331bcf6a..b89708235 100644 --- a/apps/isa-app/src/page/task-calendar/modals/preinfo/preinfo-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/preinfo/preinfo-modal.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, HostBinding } from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { UiModalRef } from '@ui/modal'; import { combineLatest, ReplaySubject } from 'rxjs'; import { map, shareReplay, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/modals/task/task-modal.component.ts b/apps/isa-app/src/page/task-calendar/modals/task/task-modal.component.ts index 06fb1908e..ae0a0041e 100644 --- a/apps/isa-app/src/page/task-calendar/modals/task/task-modal.component.ts +++ b/apps/isa-app/src/page/task-calendar/modals/task/task-modal.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, ViewChild } from '@angular/core'; import { EnvironmentService } from '@core/environment'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { DateAdapter } from '@ui/common'; import { UiMessageModalComponent, UiModalRef, UiModalService } from '@ui/modal'; import { isNullOrUndefined } from '@utils/common'; diff --git a/apps/isa-app/src/page/task-calendar/pages/task-search/task-search.component.ts b/apps/isa-app/src/page/task-calendar/pages/task-search/task-search.component.ts index 36453cb80..c11196541 100644 --- a/apps/isa-app/src/page/task-calendar/pages/task-search/task-search.component.ts +++ b/apps/isa-app/src/page/task-calendar/pages/task-search/task-search.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, Params } from '@angular/router'; import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; import { DomainTaskCalendarService } from '@domain/task-calendar'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { DateAdapter, groupBy } from '@ui/common'; import { combineLatest, Observable, Subject } from 'rxjs'; import { first, map, takeUntil, debounceTime } from 'rxjs/operators'; diff --git a/apps/isa-app/src/page/task-calendar/pages/tasks/tasks.component.ts b/apps/isa-app/src/page/task-calendar/pages/tasks/tasks.component.ts index a2b6916ac..73bab9d32 100644 --- a/apps/isa-app/src/page/task-calendar/pages/tasks/tasks.component.ts +++ b/apps/isa-app/src/page/task-calendar/pages/tasks/tasks.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { Config } from '@core/config'; -import { DisplayInfoDTO } from '@swagger/eis'; +import { DisplayInfoDTO } from '@generated/swagger/eis-api'; import { DateAdapter } from '@ui/common'; import { TaskCalendarStore } from '../../task-calendar.store'; diff --git a/apps/isa-app/src/page/task-calendar/task-calendar.store.ts b/apps/isa-app/src/page/task-calendar/task-calendar.store.ts index 8f3ce9c8d..364f36abb 100644 --- a/apps/isa-app/src/page/task-calendar/task-calendar.store.ts +++ b/apps/isa-app/src/page/task-calendar/task-calendar.store.ts @@ -3,7 +3,7 @@ import { DomainTaskCalendarService } from '@domain/task-calendar'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { DisplayInfoDTO, InputDTO, QuerySettingsDTO } from '@swagger/eis'; +import { DisplayInfoDTO, InputDTO, QuerySettingsDTO } from '@generated/swagger/eis-api'; import { CalendarIndicator } from '@ui/calendar'; import { DateAdapter } from '@ui/common'; import { Filter, FilterOption, SelectFilter, UiFilter, UiFilterMappingService } from '@ui/filter'; diff --git a/apps/isa-app/src/shared/components/branch-selector/branch-selector.component.ts b/apps/isa-app/src/shared/components/branch-selector/branch-selector.component.ts index 9f4e8cf29..5a97dde23 100644 --- a/apps/isa-app/src/shared/components/branch-selector/branch-selector.component.ts +++ b/apps/isa-app/src/shared/components/branch-selector/branch-selector.component.ts @@ -15,7 +15,7 @@ import { ViewChild, } from '@angular/core'; import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { BranchDTO, BranchType } from '@swagger/checkout'; +import { BranchDTO, BranchType } from '@generated/swagger/checkout-api'; import { UiAutocompleteComponent, UiAutocompleteModule } from '@ui/autocomplete'; import { UiCommonModule } from '@ui/common'; import { isNaN } from 'lodash'; diff --git a/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.spec.ts b/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.spec.ts index de05b3287..4409d9dae 100644 --- a/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.spec.ts +++ b/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.spec.ts @@ -2,7 +2,7 @@ // import { DomainAvailabilityService } from '@domain/availability'; // import { OpenStreetMap } from '@external/openstreetmap'; // import { createServiceFactory, createSpyObject, SpectatorService, SpyObject } from '@ngneat/spectator'; -// import { BranchType } from '@swagger/checkout'; +// import { BranchType } from '@generated/swagger/checkout-api'; // import { UiErrorModalComponent, UiModalService } from '@ui/modal'; // import { of, throwError } from 'rxjs'; // import { BranchSelectorStore } from './branch-selector.store'; diff --git a/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.ts b/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.ts index d166ba394..0e7ba015e 100644 --- a/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.ts +++ b/apps/isa-app/src/shared/components/branch-selector/branch-selector.store.ts @@ -5,7 +5,7 @@ import { OpenStreetMap, OpenStreetMapParams, PlaceDto } from '@external/openstre import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { BranchDTO, BranchType } from '@swagger/checkout'; +import { BranchDTO, BranchType } from '@generated/swagger/checkout-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { geoDistance, GeoLocation } from '@utils/common'; import { debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/components/filter/tree/filter.ts b/apps/isa-app/src/shared/components/filter/tree/filter.ts index 670581563..cde04272d 100644 --- a/apps/isa-app/src/shared/components/filter/tree/filter.ts +++ b/apps/isa-app/src/shared/components/filter/tree/filter.ts @@ -1,4 +1,4 @@ -import { QueryTokenDTO } from '@swagger/oms'; +import { QueryTokenDTO } from '@generated/swagger/oms-api'; import { Subject } from 'rxjs'; import { IInputGroup, InputGroup } from './input-group'; import { InputType } from './input-type.enum'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-covers/goods-in-out-order-details-covers.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-covers/goods-in-out-order-details-covers.component.ts index 10a94ddc8..f0db3b4e5 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-covers/goods-in-out-order-details-covers.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-covers/goods-in-out-order-details-covers.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output, OnInit, OnDestroy } from '@angular/core'; import { ComponentStore } from '@ngrx/component-store'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { DateAdapter, Group, groupBy } from '@ui/common'; import { isEqual } from 'lodash'; import { Subscription } from 'rxjs'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts index 7d757037b..53ba87f6d 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts @@ -11,8 +11,8 @@ import { } from '@angular/core'; import { CrmCustomerService } from '@domain/crm'; import { DomainOmsService } from '@domain/oms'; -import { NotificationChannel } from '@swagger/checkout'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@swagger/oms'; +import { NotificationChannel } from '@generated/swagger/checkout-api'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { DateAdapter } from '@ui/common'; import { cloneDeep } from 'lodash'; import { BehaviorSubject, combineLatest } from 'rxjs'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts index 066c78745..084cec93a 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts @@ -17,7 +17,7 @@ import { HistoryModalComponent, HistoryData } from '@modal/history'; import { ComponentStore } from '@ngrx/component-store'; import { tapResponse } from '@ngrx/operators'; -import { OrderDTO, OrderItemListItemDTO, ReceiptDTO, ReceiptType } from '@swagger/oms'; +import { OrderDTO, OrderItemListItemDTO, ReceiptDTO, ReceiptType } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiMessageModalComponent, UiModalService } from '@ui/modal'; import { isEqual } from 'lodash'; import { BehaviorSubject, combineLatest, NEVER, Subject, Observable } from 'rxjs'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.component.ts index 710d1a1f6..90b8ec929 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.component.ts @@ -3,7 +3,7 @@ import { Component, ChangeDetectionStrategy, ContentChildren, QueryList } from ' import { BreadcrumbService } from '@core/breadcrumb'; import { CommandService } from '@core/command'; import { OrderItemsContext } from '@domain/oms'; -import { KeyValueDTOOfStringAndString, OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString, OrderItemListItemDTO, ReceiptDTO } from '@generated/swagger/oms-api'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { unionBy } from 'lodash'; import { BehaviorSubject, combineLatest, merge, of, Subscription } from 'rxjs'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.store.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.store.ts index 34d6c9d47..cbe458cfa 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.store.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-details/goods-in-out-order-details.store.ts @@ -1,6 +1,6 @@ import { OnDestroy } from '@angular/core'; import { ComponentStore } from '@ngrx/component-store'; -import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ReceiptDTO } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ReceiptDTO } from '@generated/swagger/oms-api'; import { isEqual } from 'lodash'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.ts index 18e19f89f..8cbd623f0 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.ts @@ -24,7 +24,7 @@ import { OrderItemSubsetDTO, StockStatusCodeDTO, VATDTO, -} from '@swagger/oms'; +} from '@generated/swagger/oms-api'; import { DateAdapter } from '@ui/common'; import { UiErrorModalComponent, UiModalService } from '@ui/modal'; import { UiSelectOptionComponent } from '@ui/select'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group-item.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group-item.component.ts index 322dfc8d6..28cbd3001 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group-item.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group-item.component.ts @@ -1,8 +1,8 @@ import { EventEmitter } from '@angular/core'; import { Component, ChangeDetectionStrategy, Input, Output } from '@angular/core'; import { ComponentStore } from '@ngrx/component-store'; -import { StockInfoDTO } from '@swagger/remi'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { StockInfoDTO } from '@generated/swagger/inventory-api'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { isEqual } from 'lodash'; import { map } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group.component.ts b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group.component.ts index 4c725ef43..667d241fc 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group.component.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-group/goods-in-out-order-group.component.ts @@ -7,7 +7,7 @@ import { OnDestroy, ChangeDetectorRef, } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { combineLatest, Observable, Subject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { GoodsInOutOrderGroupItemComponent } from './goods-in-out-order-group-item.component'; diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/cover-compartment-code.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/cover-compartment-code.pipe.ts index 9ba735d42..6397a7517 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/cover-compartment-code.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/cover-compartment-code.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'coverCompartmentCode', diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/notifications-channel.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/notifications-channel.pipe.ts index ca04658ae..25d763e15 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/notifications-channel.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/notifications-channel.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { NotificationChannel } from '@swagger/oms'; +import { NotificationChannel } from '@generated/swagger/oms-api'; @Pipe({ name: 'notificationsChannel', diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/processing-status.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/processing-status.pipe.ts index 78c4cc3cc..bdb154fa5 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/processing-status.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/processing-status.pipe.ts @@ -1,5 +1,5 @@ import { Injectable, Pipe, PipeTransform } from '@angular/core'; -import { OrderItemProcessingStatusValue } from '@swagger/oms'; +import { OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; import { ProcessingStatusNameMap } from '../constants/processing-status-name.map'; @Pipe({ diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.spec.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.spec.ts index 834db44bc..292ccc466 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.spec.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.spec.ts @@ -1,5 +1,5 @@ import { createPipeFactory, SpectatorPipe } from '@ngneat/spectator'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { ShowCompartmentCodePipe } from './show-compartment-code.pipe'; describe('ShowCompartmentCodePipe', () => { diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.ts index 7a0f1e720..63b07b4fc 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-compartment-code.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; import { isNullOrUndefined } from '@utils/common'; @Pipe({ diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-cover-compartment-code.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-cover-compartment-code.pipe.ts index 1d42754da..c70165ed6 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-cover-compartment-code.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-cover-compartment-code.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderItemListItemDTO } from '@swagger/oms'; +import { OrderItemListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'showCoverCompartmentCode', diff --git a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-tags.pipe.ts b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-tags.pipe.ts index ebbb3626f..d16a73989 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/pipes/show-tags.pipe.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/pipes/show-tags.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { KeyValueDTOOfStringAndString } from '@swagger/oms'; +import { KeyValueDTOOfStringAndString } from '@generated/swagger/oms-api'; @Pipe({ name: 'showTags', diff --git a/apps/isa-app/src/shared/components/goods-in-out/validators/ssc.validator.ts b/apps/isa-app/src/shared/components/goods-in-out/validators/ssc.validator.ts index 9e246e3dd..ad785420f 100644 --- a/apps/isa-app/src/shared/components/goods-in-out/validators/ssc.validator.ts +++ b/apps/isa-app/src/shared/components/goods-in-out/validators/ssc.validator.ts @@ -1,5 +1,5 @@ import { UntypedFormControl, ValidationErrors, ValidatorFn } from '@angular/forms'; -import { StockStatusCodeDTO } from '@swagger/oms'; +import { StockStatusCodeDTO } from '@generated/swagger/oms-api'; export function validateSsc(statusCodes: StockStatusCodeDTO[] = []): ValidatorFn | null { if (statusCodes) { diff --git a/apps/isa-app/src/shared/components/history/history-list.component.spec.ts b/apps/isa-app/src/shared/components/history/history-list.component.spec.ts index 44c03c61f..134381764 100644 --- a/apps/isa-app/src/shared/components/history/history-list.component.spec.ts +++ b/apps/isa-app/src/shared/components/history/history-list.component.spec.ts @@ -1,6 +1,6 @@ import { createComponentFactory, Spectator } from '@ngneat/spectator'; import { SharedHistoryListComponent, SharedHistoryLogEntryComponent, SharedHistoryLogEntryModule } from '@shared/components/history'; -import { HistoryDTO } from '@swagger/crm'; +import { HistoryDTO } from '@generated/swagger/crm-api'; describe('SharedHistoryListComponent', () => { let spectator: Spectator; diff --git a/apps/isa-app/src/shared/components/history/history-list.component.ts b/apps/isa-app/src/shared/components/history/history-list.component.ts index cf49c50b0..8af21871a 100644 --- a/apps/isa-app/src/shared/components/history/history-list.component.ts +++ b/apps/isa-app/src/shared/components/history/history-list.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { HistoryDTO as CrmHistoryDTO } from '@swagger/crm'; -import { HistoryDTO as OmsHistoryDTO } from '@swagger/oms'; +import { HistoryDTO as CrmHistoryDTO } from '@generated/swagger/crm-api'; +import { HistoryDTO as OmsHistoryDTO } from '@generated/swagger/oms-api'; @Component({ selector: 'shared-history-list', diff --git a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.spec.ts b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.spec.ts index 4c34ef063..9b715f810 100644 --- a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.spec.ts +++ b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.spec.ts @@ -1,7 +1,7 @@ import { createComponentFactory, Spectator } from '@ngneat/spectator'; import { SharedHistoryLogEntryValuesComponent } from '@shared/components/history'; -import { DiffDTO as CrmDiffDTO } from '@swagger/crm'; -import { DiffDTO as OmsDiffDTO } from '@swagger/oms'; +import { DiffDTO as CrmDiffDTO } from '@generated/swagger/crm-api'; +import { DiffDTO as OmsDiffDTO } from '@generated/swagger/oms-api'; describe('SharedHistoryLogEntryValuesComponent', () => { let spectator: Spectator; diff --git a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.ts b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.ts index 46b0c03a8..c2b0de3ba 100644 --- a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.ts +++ b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry-values/history-log-entry-values.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { DiffDTO as CrmDiffDTO } from '@swagger/crm'; -import { DiffDTO as OmsDiffDTO } from '@swagger/oms'; +import { DiffDTO as CrmDiffDTO } from '@generated/swagger/crm-api'; +import { DiffDTO as OmsDiffDTO } from '@generated/swagger/oms-api'; @Component({ selector: 'shared-history-log-entry-values', diff --git a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.spec.ts b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.spec.ts index b61ae255f..b4adc7e02 100644 --- a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.spec.ts +++ b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.spec.ts @@ -1,7 +1,7 @@ import { createComponentFactory, Spectator } from '@ngneat/spectator'; import { SharedHistoryLogEntryComponent, SharedHistoryLogEntryValuesComponent } from '@shared/components/history'; -import { DiffDTO, HistoryDTO as CrmHistoryDTO, HistoryDTO } from '@swagger/crm'; -import { HistoryDTO as OmsHistoryDTO } from '@swagger/oms'; +import { DiffDTO, HistoryDTO as CrmHistoryDTO, HistoryDTO } from '@generated/swagger/crm-api'; +import { HistoryDTO as OmsHistoryDTO } from '@generated/swagger/oms-api'; import { DatePipe } from '@angular/common'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/de'; diff --git a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.ts b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.ts index e8089157f..d4b185002 100644 --- a/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.ts +++ b/apps/isa-app/src/shared/components/history/history-log-entry/history-log-entry.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; -import { HistoryDTO as CrmHistoryDTO } from '@swagger/crm'; -import { HistoryDTO as OmsHistoryDTO } from '@swagger/oms'; +import { HistoryDTO as CrmHistoryDTO } from '@generated/swagger/crm-api'; +import { HistoryDTO as OmsHistoryDTO } from '@generated/swagger/oms-api'; @Component({ selector: 'shared-history-log-entry', diff --git a/apps/isa-app/src/shared/components/notification-channel-control/notification-channel-control.component.ts b/apps/isa-app/src/shared/components/notification-channel-control/notification-channel-control.component.ts index 9cc90e733..40ae3cd64 100644 --- a/apps/isa-app/src/shared/components/notification-channel-control/notification-channel-control.component.ts +++ b/apps/isa-app/src/shared/components/notification-channel-control/notification-channel-control.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ControlContainer, FormControl, UntypedFormGroup } from '@angular/forms'; import { ComponentStore } from '@ngrx/component-store'; -import { CommunicationDetailsDTO } from '@swagger/checkout'; -import { NotificationChannel } from '@swagger/oms'; +import { CommunicationDetailsDTO } from '@generated/swagger/checkout-api'; +import { NotificationChannel } from '@generated/swagger/oms-api'; import { NEVER, Observable } from 'rxjs'; import { map, shareReplay, startWith, tap } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/components/package-list/package-list-item.component.ts b/apps/isa-app/src/shared/components/package-list/package-list-item.component.ts index 538a8a07d..e977211b6 100644 --- a/apps/isa-app/src/shared/components/package-list/package-list-item.component.ts +++ b/apps/isa-app/src/shared/components/package-list/package-list-item.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, HostBinding } from '@angular/core'; -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; @Component({ selector: 'page-package-list-item', diff --git a/apps/isa-app/src/shared/components/package-list/package-list.component.ts b/apps/isa-app/src/shared/components/package-list/package-list.component.ts index f46624157..12ebe609a 100644 --- a/apps/isa-app/src/shared/components/package-list/package-list.component.ts +++ b/apps/isa-app/src/shared/components/package-list/package-list.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output, ViewChild, AfterViewInit, OnDestroy } from '@angular/core'; -import { PackageDTO2 } from '@swagger/wws'; +import { PackageDTO2 } from '@generated/swagger/wws-api'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { asapScheduler, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/pipes/branch/branch-name.pipe.ts b/apps/isa-app/src/shared/pipes/branch/branch-name.pipe.ts index 382331a16..11e739ce2 100644 --- a/apps/isa-app/src/shared/pipes/branch/branch-name.pipe.ts +++ b/apps/isa-app/src/shared/pipes/branch/branch-name.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; export type BranchNameFormat = 'key' | 'name' | 'key-name' | 'name-address'; diff --git a/apps/isa-app/src/shared/pipes/branch/resolve-branch.pipe.ts b/apps/isa-app/src/shared/pipes/branch/resolve-branch.pipe.ts index ea3695eaa..caf919844 100644 --- a/apps/isa-app/src/shared/pipes/branch/resolve-branch.pipe.ts +++ b/apps/isa-app/src/shared/pipes/branch/resolve-branch.pipe.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Pipe, PipeTransform, OnDestroy } from '@angular/core'; -import { BranchService, BranchDTO } from '@swagger/oms'; +import { BranchService, BranchDTO } from '@generated/swagger/oms-api'; import { memorize } from '@utils/common'; import { Subject } from 'rxjs'; import { shareReplay, takeUntil } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/pipes/customer/address.pipe.ts b/apps/isa-app/src/shared/pipes/customer/address.pipe.ts index 46069f2e3..79167cc17 100644 --- a/apps/isa-app/src/shared/pipes/customer/address.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/address.pipe.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Pipe, PipeTransform } from '@angular/core'; -import { AddressDTO, CommunicationDetailsDTO, OrganisationDTO } from '@swagger/crm'; +import { AddressDTO, CommunicationDetailsDTO, OrganisationDTO } from '@generated/swagger/crm-api'; export interface AddressData { gender?: number; diff --git a/apps/isa-app/src/shared/pipes/customer/client-channel.pipe.ts b/apps/isa-app/src/shared/pipes/customer/client-channel.pipe.ts index 08272e4d4..b0dd31bec 100644 --- a/apps/isa-app/src/shared/pipes/customer/client-channel.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/client-channel.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderType } from '@swagger/oms'; +import { OrderType } from '@generated/swagger/oms-api'; @Pipe({ name: 'clientChannel', diff --git a/apps/isa-app/src/shared/pipes/customer/country.pipe.ts b/apps/isa-app/src/shared/pipes/customer/country.pipe.ts index 54f6e2d63..e21fa73ac 100644 --- a/apps/isa-app/src/shared/pipes/customer/country.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/country.pipe.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Injectable, OnDestroy, Pipe, PipeTransform } from '@angular/core'; -import { CountryDTO } from '@swagger/crm'; +import { CountryDTO } from '@generated/swagger/crm-api'; import { CrmCustomerService } from '@domain/crm'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; diff --git a/apps/isa-app/src/shared/pipes/customer/name.pipe.ts b/apps/isa-app/src/shared/pipes/customer/name.pipe.ts index 7d7d76d50..255f53255 100644 --- a/apps/isa-app/src/shared/pipes/customer/name.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/name.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { CustomerDTO, CustomerInfoDTO } from '@swagger/crm'; +import { CustomerDTO, CustomerInfoDTO } from '@generated/swagger/crm-api'; @Pipe({ name: 'customerName', diff --git a/apps/isa-app/src/shared/pipes/customer/order-target.pipe.ts b/apps/isa-app/src/shared/pipes/customer/order-target.pipe.ts index 31898a247..490474f37 100644 --- a/apps/isa-app/src/shared/pipes/customer/order-target.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/order-target.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderListItemDTO } from '@swagger/oms'; +import { OrderListItemDTO } from '@generated/swagger/oms-api'; @Pipe({ name: 'orderTarget' }) export class OrderTargetPipe implements PipeTransform { diff --git a/apps/isa-app/src/shared/pipes/customer/order-type.pipe.ts b/apps/isa-app/src/shared/pipes/customer/order-type.pipe.ts index 495759a1a..6eb9fd5e9 100644 --- a/apps/isa-app/src/shared/pipes/customer/order-type.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/order-type.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderType } from '@swagger/oms'; +import { OrderType } from '@generated/swagger/oms-api'; @Pipe({ name: 'orderType', diff --git a/apps/isa-app/src/shared/pipes/customer/processing-status.pipe.ts b/apps/isa-app/src/shared/pipes/customer/processing-status.pipe.ts index f7407541e..38f6b458b 100644 --- a/apps/isa-app/src/shared/pipes/customer/processing-status.pipe.ts +++ b/apps/isa-app/src/shared/pipes/customer/processing-status.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderProcessingStatus } from '@swagger/oms'; +import { OrderProcessingStatus } from '@generated/swagger/oms-api'; @Pipe({ name: 'processingStatus', diff --git a/apps/isa-app/src/shared/pipes/order/order-destination.pipe.ts b/apps/isa-app/src/shared/pipes/order/order-destination.pipe.ts index cadebb8f2..7be3f6c42 100644 --- a/apps/isa-app/src/shared/pipes/order/order-destination.pipe.ts +++ b/apps/isa-app/src/shared/pipes/order/order-destination.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderType } from '@swagger/oms'; +import { OrderType } from '@generated/swagger/oms-api'; @Pipe({ name: 'orderDestination', standalone: true, pure: true }) export class OrderDestinationPipe implements PipeTransform { diff --git a/apps/isa-app/src/shared/pipes/order/order-processing-status.pipe.ts b/apps/isa-app/src/shared/pipes/order/order-processing-status.pipe.ts index e26b391e4..e9075fc34 100644 --- a/apps/isa-app/src/shared/pipes/order/order-processing-status.pipe.ts +++ b/apps/isa-app/src/shared/pipes/order/order-processing-status.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OrderProcessingStatus } from '@swagger/oms'; +import { OrderProcessingStatus } from '@generated/swagger/oms-api'; @Pipe({ name: 'orderProcessingStatus', diff --git a/apps/isa-app/src/shared/pipes/package-inspection/arrival-status-color-class.pipe.ts b/apps/isa-app/src/shared/pipes/package-inspection/arrival-status-color-class.pipe.ts index 8eb40e506..d50f6729b 100644 --- a/apps/isa-app/src/shared/pipes/package-inspection/arrival-status-color-class.pipe.ts +++ b/apps/isa-app/src/shared/pipes/package-inspection/arrival-status-color-class.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ArrivalStatus } from '@swagger/wws'; +import { ArrivalStatus } from '@generated/swagger/wws-api'; @Pipe({ name: 'arrivalStatusColorClass', diff --git a/apps/isa-app/src/shared/pipes/package-inspection/arrival-status.pipe.ts b/apps/isa-app/src/shared/pipes/package-inspection/arrival-status.pipe.ts index ee480f6cc..a784c20b0 100644 --- a/apps/isa-app/src/shared/pipes/package-inspection/arrival-status.pipe.ts +++ b/apps/isa-app/src/shared/pipes/package-inspection/arrival-status.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ArrivalStatus } from '@swagger/wws'; +import { ArrivalStatus } from '@generated/swagger/wws-api'; @Pipe({ name: 'arrivalStatus', diff --git a/apps/isa-app/src/shared/services/gender/types/gender.type.ts b/apps/isa-app/src/shared/services/gender/types/gender.type.ts index aeddf85ce..ed3c2f954 100644 --- a/apps/isa-app/src/shared/services/gender/types/gender.type.ts +++ b/apps/isa-app/src/shared/services/gender/types/gender.type.ts @@ -1,8 +1,8 @@ -import { Gender as CrmGender } from '@swagger/crm'; -import { Gender as OmsGender } from '@swagger/oms'; -import { Gender as WwsGender } from '@swagger/wws'; -import { Gender as CheckoutGender } from '@swagger/checkout'; -import { Gender as RemiGender } from '@swagger/remi'; -import { Gender as PrintGender } from '@swagger/print'; +import { Gender as CrmGender } from '@generated/swagger/crm-api'; +import { Gender as OmsGender } from '@generated/swagger/oms-api'; +import { Gender as WwsGender } from '@generated/swagger/wws-api'; +import { Gender as CheckoutGender } from '@generated/swagger/checkout-api'; +import { Gender as RemiGender } from '@generated/swagger/inventory-api'; +import { Gender as PrintGender } from '@generated/swagger/print-api'; export type GenderValue = CrmGender | OmsGender | WwsGender | CheckoutGender | RemiGender | PrintGender; diff --git a/apps/isa-app/src/shared/services/navigation/customer-create.navigation.ts b/apps/isa-app/src/shared/services/navigation/customer-create.navigation.ts index 08d573b95..226070b92 100644 --- a/apps/isa-app/src/shared/services/navigation/customer-create.navigation.ts +++ b/apps/isa-app/src/shared/services/navigation/customer-create.navigation.ts @@ -1,7 +1,7 @@ import { NumberInput, coerceNumberProperty } from '@angular/cdk/coercion'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { CustomerInfoDTO } from '@swagger/crm'; +import { CustomerInfoDTO } from '@generated/swagger/crm-api'; import { NavigationRoute } from './defs/navigation-route'; import { encodeFormData, mapCustomerInfoDtoToCustomerCreateFormData } from 'apps/isa-app/src/page/customer'; diff --git a/apps/isa-app/src/shared/services/navigation/customer-search.navigation.ts b/apps/isa-app/src/shared/services/navigation/customer-search.navigation.ts index d0c1d8f82..4c5231ce7 100644 --- a/apps/isa-app/src/shared/services/navigation/customer-search.navigation.ts +++ b/apps/isa-app/src/shared/services/navigation/customer-search.navigation.ts @@ -2,7 +2,7 @@ import { NumberInput, coerceNumberProperty } from '@angular/cdk/coercion'; import { Injectable } from '@angular/core'; import { Router, UrlTree } from '@angular/router'; import { Filter } from '@shared/components/filter'; -import { CustomerDTO, CustomerInfoDTO } from '@swagger/crm'; +import { CustomerDTO, CustomerInfoDTO } from '@generated/swagger/crm-api'; import { NavigationRoute } from './defs/navigation-route'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/shared/services/navigation/pickup-shelf-in-navigation.service.ts b/apps/isa-app/src/shared/services/navigation/pickup-shelf-in-navigation.service.ts index 1c44dc485..7321d5529 100644 --- a/apps/isa-app/src/shared/services/navigation/pickup-shelf-in-navigation.service.ts +++ b/apps/isa-app/src/shared/services/navigation/pickup-shelf-in-navigation.service.ts @@ -2,7 +2,7 @@ import { Injectable, inject } from '@angular/core'; import { NavigationRoute } from './defs/navigation-route'; import { Router } from '@angular/router'; import { Config } from '@core/config'; -import { DBHOrderItemListItemDTO, OrderItemProcessingStatusValue } from '@swagger/oms'; +import { DBHOrderItemListItemDTO, OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; import { isBoolean } from 'lodash'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/shared/services/navigation/pickup-shelf-out-navigation.service.ts b/apps/isa-app/src/shared/services/navigation/pickup-shelf-out-navigation.service.ts index fdd278075..5b33e1b73 100644 --- a/apps/isa-app/src/shared/services/navigation/pickup-shelf-out-navigation.service.ts +++ b/apps/isa-app/src/shared/services/navigation/pickup-shelf-out-navigation.service.ts @@ -1,7 +1,7 @@ import { Injectable, inject } from '@angular/core'; import { NavigationRoute } from './defs/navigation-route'; import { Router } from '@angular/router'; -import { OrderItemProcessingStatusValue } from '@swagger/oms'; +import { OrderItemProcessingStatusValue } from '@generated/swagger/oms-api'; import { isBoolean } from 'lodash'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.spec.ts b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.spec.ts index 014785782..90d45d8fa 100644 --- a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.spec.ts +++ b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.spec.ts @@ -2,7 +2,7 @@ // import { ShellSideMenuComponent } from './side-menu.component'; // import { ShellService } from '../shell.service'; // import { AuthService } from '@core/auth'; -// import { StockService } from '@swagger/wws'; +// import { StockService } from '@generated/swagger/wws-api'; // import { ApplicationProcess, ApplicationService } from '@core/application'; // import { WrongDestinationModalService } from '@shared/modals/wrong-destination-modal'; // import { of } from 'rxjs'; diff --git a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.ts b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.ts index dccef17ac..633af6405 100644 --- a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.ts +++ b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, Inject, ChangeDetectorRef } from '@angular/core'; import { AuthModule, AuthService } from '@core/auth'; -import { StockService } from '@swagger/wws'; +import { StockService } from '@generated/swagger/wws-api'; import { first, map, retry, switchMap, take } from 'rxjs/operators'; import { ShellService } from '../shell.service'; import { ApplicationProcess, ApplicationService } from '@core/application'; diff --git a/apps/isa-app/src/shared/shell/top-bar/top-bar.component.ts b/apps/isa-app/src/shared/shell/top-bar/top-bar.component.ts index a3e79bc85..a779e9f94 100644 --- a/apps/isa-app/src/shared/shell/top-bar/top-bar.component.ts +++ b/apps/isa-app/src/shared/shell/top-bar/top-bar.component.ts @@ -6,7 +6,7 @@ import { MessageBoardItemDTO, NotificationsHub } from '@hub/notifications'; import { UiModalService } from '@ui/modal'; import { ModalNotificationsComponent } from '@modal/notifications'; import { ApplicationService } from '@core/application'; -import { StockService } from '@swagger/wws'; +import { StockService } from '@generated/swagger/wws-api'; import { AuthService } from '@core/auth'; import { EnvironmentService } from '@core/environment'; diff --git a/apps/isa-app/src/ui/branch-dropdown/branch-dropdown-item.component.ts b/apps/isa-app/src/ui/branch-dropdown/branch-dropdown-item.component.ts index b9c9bd927..914ba8e25 100644 --- a/apps/isa-app/src/ui/branch-dropdown/branch-dropdown-item.component.ts +++ b/apps/isa-app/src/ui/branch-dropdown/branch-dropdown-item.component.ts @@ -1,6 +1,6 @@ import { Highlightable } from '@angular/cdk/a11y'; import { Component, ElementRef, EventEmitter, HostBinding, Input, Output } from '@angular/core'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; @Component({ selector: 'ui-branch-dropdown-item', diff --git a/apps/isa-app/src/ui/branch-dropdown/branch-dropdown.component.ts b/apps/isa-app/src/ui/branch-dropdown/branch-dropdown.component.ts index 3d6b97eec..59dbbda56 100644 --- a/apps/isa-app/src/ui/branch-dropdown/branch-dropdown.component.ts +++ b/apps/isa-app/src/ui/branch-dropdown/branch-dropdown.component.ts @@ -1,6 +1,6 @@ import { ActiveDescendantKeyManager } from '@angular/cdk/a11y'; import { Component, EventEmitter, HostListener, Input, OnChanges, Output, QueryList, SimpleChanges, ViewChildren } from '@angular/core'; -import { BranchDTO } from '@swagger/checkout'; +import { BranchDTO } from '@generated/swagger/checkout-api'; import { geoDistance } from '@utils/common'; import { UiBranchDropdownItemComponent } from './branch-dropdown-item.component'; diff --git a/apps/isa-app/src/ui/filter/mapping.service.ts b/apps/isa-app/src/ui/filter/mapping.service.ts index ffc4795e1..e6c369fb1 100644 --- a/apps/isa-app/src/ui/filter/mapping.service.ts +++ b/apps/isa-app/src/ui/filter/mapping.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { InputDTO, InputType, OptionDTO } from '@swagger/crm'; +import { InputDTO, InputType, OptionDTO } from '@generated/swagger/crm-api'; import { FilterType, SelectFilter, SelectFilterOption } from './models'; @Injectable({ providedIn: 'root' }) diff --git a/apps/isa-app/src/ui/filter/next/tree/ui-filter.ts b/apps/isa-app/src/ui/filter/next/tree/ui-filter.ts index cbed65e89..80e5fd90d 100644 --- a/apps/isa-app/src/ui/filter/next/tree/ui-filter.ts +++ b/apps/isa-app/src/ui/filter/next/tree/ui-filter.ts @@ -1,4 +1,4 @@ -import { QueryTokenDTO } from '@swagger/oms'; +import { QueryTokenDTO } from '@generated/swagger/oms-api'; import { Subject } from 'rxjs'; import { IUiInputGroup, UiInputGroup } from './ui-input-group'; import { UiInputType } from './ui-input-type.enum'; diff --git a/apps/isa-app/src/ui/modal/dialog/dialog.model.ts b/apps/isa-app/src/ui/modal/dialog/dialog.model.ts index 7f82c6f61..77005d38a 100644 --- a/apps/isa-app/src/ui/modal/dialog/dialog.model.ts +++ b/apps/isa-app/src/ui/modal/dialog/dialog.model.ts @@ -1,4 +1,4 @@ -import { DialogSettings, KeyValueDTOOfStringAndString } from '@swagger/crm'; +import { DialogSettings, KeyValueDTOOfStringAndString } from '@generated/swagger/crm-api'; export interface DialogModel { actions?: Array; diff --git a/generated/swagger/oms-api/src/models/size-of-string.ts b/generated/swagger/oms-api/src/models/size-of-string.ts index 8d62a513e..b6e6989cc 100644 --- a/generated/swagger/oms-api/src/models/size-of-string.ts +++ b/generated/swagger/oms-api/src/models/size-of-string.ts @@ -1,21 +1,21 @@ /* tslint:disable */ /** - * Gr��e / Volumen + * Gre / Volumen */ export interface SizeOfString { /** - * H�he + * Hhe */ height: number; /** - * L�nge / Tiefe + * Lnge / Tiefe */ length: number; /** - * Ma�einheit + * Maeinheit */ unit?: string; diff --git a/package.json b/package.json index 0ae8b2281..a4e5f65f0 100644 --- a/package.json +++ b/package.json @@ -10,19 +10,8 @@ "build-prod": "nx build isa-app --configuration=production", "lint": "nx lint", "e2e": "nx e2e", - "gen:swagger": "npm-run-all -l -n gen:swagger:* fix:files:swagger", - "gen:swagger:availability": "ng-swagger-gen --config ng-swagger-gen/availability.json", - "gen:swagger:cat": "ng-swagger-gen --config ng-swagger-gen/cat.json", - "gen:swagger:checkout": "ng-swagger-gen --config ng-swagger-gen/checkout.json", - "gen:swagger:crm": "ng-swagger-gen --config ng-swagger-gen/crm.json", - "gen:swagger:isa": "ng-swagger-gen --config ng-swagger-gen/isa.json", - "gen:swagger:oms": "ng-swagger-gen --config ng-swagger-gen/oms.json", - "gen:swagger:print": "ng-swagger-gen --config ng-swagger-gen/print.json", - "gen:swagger:eis": "npm run dl:eis:swagger && ng-swagger-gen --config ng-swagger-gen/eis.json", - "gen:swagger:remi": "ng-swagger-gen --config ng-swagger-gen/remi.json", - "gen:swagger:wws": "ng-swagger-gen --config ng-swagger-gen/wws.json", - "dl:eis:swagger": "node ./tools/download-file.js https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1/swagger.json ng-swagger-gen/eis.swagger.json", - "fix:files:swagger": "node ./tools/fix-files.js apps/isa-app/src/swagger", + "generate:swagger": "nx run-many -t generate -p tag:generated,swagger", + "fix:files:swagger": "node ./tools/fix-files.js generated/swagger", "prettier": "prettier --write .", "pretty-quick": "pretty-quick --staged", "prepare": "husky",