sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nx-workspace-migration' into develop

Browse Source
This commit is contained in:
Lorenz Hilpert
2025-02-24 15:26:32 +01:00
parent 388346e21b 5aa98bd90b
commit eb6149a6e3
2132 changed files with 13651 additions and 9448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@@ -1,5 +1,7 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
.matomo
# compiled output
/dist
/tmp
@@ -50,4 +52,9 @@ testem.log
Thumbs.db
libs/swagger/src/lib/*
*storybook.log
*storybook.log
.nx/cache
.nx/workspace-data
.angular

5
.prettierignore
View File

@@ -3,8 +3,9 @@
/dist
/coverage
/helmvalues
/apps/swagger
/ng-swagger-gen
/generated
*.json
*.yml
.angular

37
.prettierrc.json
View File

@@ -1,5 +1,34 @@
{
"singleQuote": true,
"printWidth": 140
}
"singleQuote": true,
"printWidth": 120,
"tabWidth": 2,
"useTabs": false,
"semi": true,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "always",
"htmlWhitespaceSensitivity": "ignore",
"endOfLine": "lf",
"overrides": [
{
"files": "*.html",
"options": {
"parser": "angular",
"printWidth": 140
}
},
{
"files": ["*.ts", "*.tsx"],
"options": {
"parser": "typescript"
}
},
{
"files": ["*.scss", "*.css"],
"options": {
"parser": "scss",
"singleQuote": false
}
}
]
}

14
.vscode/extensions.json vendored
View File

@@ -1,7 +1,9 @@
{
"recommendations": [
"johnpapa.angular2",
"esbenp.prettier-vscode",
"angular.ng-template",
]
}
"recommendations": [
"johnpapa.angular2",
"esbenp.prettier-vscode",
"angular.ng-template",
"nrwl.angular-console",
"dbaeumer.vscode-eslint"
]
}

164
angular.json
View File

@@ -1,164 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "apps",
"projects": {
"isa-app": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
},
"@schematics/angular:application": {
"strict": true
}
},
"root": "apps/isa-app",
"sourceRoot": "apps/isa-app/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
"lodash",
"moment",
"jsrsasign",
"pdfjs-dist/build/pdf",
"pdfjs-dist/web/pdf_viewer",
"pdfjs-dist/es5/build/pdf",
"pdfjs-dist/es5/web/pdf_viewer"
],
"outputPath": "dist/isa-app",
"index": "apps/isa-app/src/index.html",
"main": "apps/isa-app/src/main.ts",
"polyfills": "apps/isa-app/src/polyfills.ts",
"tsConfig": "apps/isa-app/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"apps/isa-app/src/favicon.ico",
"apps/isa-app/src/assets",
"apps/isa-app/src/config",
"apps/isa-app/src/silent-refresh.html",
"apps/isa-app/src/manifest.webmanifest",
{
"glob": "**/*",
"input": "node_modules/scandit-web-datacapture-barcode/build/engine",
"output": "scandit"
}
],
"styles": [
"apps/isa-app/src/styles.scss"
],
"scripts": [],
"serviceWorker": true,
"ngswConfigPath": "apps/isa-app/ngsw-config.json"
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "25kb"
}
],
"fileReplacements": [
{
"replace": "apps/isa-app/src/environments/environment.ts",
"with": "apps/isa-app/src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "isa-app:build:production"
},
"development": {
"buildTarget": "isa-app:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "isa-app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "apps/isa-app/tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing"
],
"inlineStyleLanguage": "scss",
"assets": [
"apps/isa-app/src/favicon.ico",
"apps/isa-app/src/assets",
"apps/isa-app/src/manifest.webmanifest"
],
"styles": [
"apps/isa-app/src/styles.scss"
],
"scripts": []
}
},
"storybook": {
"builder": "@storybook/angular:start-storybook",
"options": {
"configDir": "apps/isa-app/.storybook",
"browserTarget": "isa-app:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"apps/isa-app"
],
"port": 6006
}
},
"build-storybook": {
"builder": "@storybook/angular:build-storybook",
"options": {
"configDir": "apps/isa-app/.storybook",
"browserTarget": "isa-app:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"apps/isa-app"
],
"outputDir": "storybook-static"
}
}
}
}
},
"cli": {
"analytics": false
}
}

17
apps/isa-app/.storybook/main.ts
View File

@@ -1,17 +0,0 @@
import type { StorybookConfig } from '@storybook/angular';
const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/angular',
options: {},
},
};
export default config;

17
apps/isa-app/.storybook/preview.ts
View File

@@ -1,17 +0,0 @@
import type { Preview } from '@storybook/angular';
import { setCompodocJson } from '@storybook/addon-docs/angular';
import docJson from '../documentation.json';
setCompodocJson(docJson);
const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};
export default preview;

10
apps/isa-app/.storybook/tsconfig.doc.json
View File

@@ -1,10 +0,0 @@
// This tsconfig is used by Compodoc to generate the documentation for the project.
// If Compodoc is not used, this file can be deleted.
{
"extends": "./tsconfig.json",
// Exclude all files that are not needed for documentation generation.
"exclude": ["../src/test.ts", "../src/**/*.spec.ts", "../src/**/*.stories.ts"],
// Please make sure to include all files from which Compodoc should generate documentation.
"include": ["../src/**/*"],
"files": ["./typings.d.ts"]
}

11
apps/isa-app/.storybook/tsconfig.json
View File

@@ -1,11 +0,0 @@
{
"extends": "../tsconfig.app.json",
"compilerOptions": {
"types": ["node"],
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true
},
"exclude": ["../src/test.ts", "../src/**/*.spec.ts"],
"include": ["../src/**/*.stories.*", "./preview.ts", "../src/polyfills.ts"],
"files": ["./typings.d.ts"]
}

4
apps/isa-app/.storybook/typings.d.ts vendored
View File

@@ -1,4 +0,0 @@
declare module '*.md' {
const content: string;
export default content;
}

158
apps/isa-app/project.json Normal file
View File

@@ -0,0 +1,158 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "isa-app",
"projectType": "application",
"generators": {
"@schematics/angular:component": {
"style": "scss"
},
"@schematics/angular:application": {
"strict": true
}
},
"sourceRoot": "apps/isa-app/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
"lodash",
"moment",
"jsrsasign",
"pdfjs-dist/build/pdf",
"pdfjs-dist/web/pdf_viewer",
"pdfjs-dist/es5/build/pdf",
"pdfjs-dist/es5/web/pdf_viewer"
],
"outputPath": "dist/isa-app",
"index": "apps/isa-app/src/index.html",
"main": "apps/isa-app/src/main.ts",
"polyfills": "apps/isa-app/src/polyfills.ts",
"tsConfig": "apps/isa-app/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"apps/isa-app/src/favicon.ico",
"apps/isa-app/src/assets",
"apps/isa-app/src/config",
"apps/isa-app/src/silent-refresh.html",
"apps/isa-app/src/manifest.webmanifest",
{
"glob": "**/*",
"input": "node_modules/scandit-web-datacapture-barcode/build/engine",
"output": "scandit"
}
],
"styles": [
"apps/isa-app/src/styles.scss"
],
"scripts": [],
"serviceWorker": true,
"ngswConfigPath": "apps/isa-app/ngsw-config.json"
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "25kb"
}
],
"fileReplacements": [
{
"replace": "apps/isa-app/src/environments/environment.ts",
"with": "apps/isa-app/src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
},
"defaultConfiguration": "production",
"outputs": [
"{options.outputPath}"
]
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "isa-app:build:production"
},
"development": {
"buildTarget": "isa-app:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "isa-app:build"
}
},
"test": {
"executor": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "apps/isa-app/tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing"
],
"inlineStyleLanguage": "scss",
"assets": [
"apps/isa-app/src/favicon.ico",
"apps/isa-app/src/assets",
"apps/isa-app/src/manifest.webmanifest"
],
"styles": [
"apps/isa-app/src/styles.scss"
],
"scripts": []
}
},
"storybook": {
"executor": "@storybook/angular:start-storybook",
"options": {
"configDir": "apps/isa-app/.storybook",
"browserTarget": "isa-app:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"apps/isa-app"
],
"port": 6006
}
},
"build-storybook": {
"executor": "@storybook/angular:build-storybook",
"options": {
"configDir": "apps/isa-app/.storybook",
"browserTarget": "isa-app:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"apps/isa-app"
],
"outputDir": "storybook-static"
}
}
}
}

1
apps/isa-app/src/adapter/scan/scandit/scandit-overlay.component.ts
View File

@@ -7,6 +7,7 @@ import { Camera, DataCaptureContext, DataCaptureView, FrameSourceState } from 's
templateUrl: 'scandit-overlay.component.html',
styleUrls: ['scandit-overlay.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class ScanditOverlayComponent implements AfterViewInit, OnDestroy {
private dataCaptureContext: DataCaptureContext;

6
apps/isa-app/src/app/app-routing.module.ts
View File

@@ -22,6 +22,7 @@ import { BranchSectionResolver, CustomerSectionResolver, ProcessIdResolver } fro
import { TokenLoginComponent, TokenLoginModule } from './token-login';
import { ProcessIdGuard } from './guards/process-id.guard';
import { ActivateProcessIdGuard, ActivateProcessIdWithConfigKeyGuard } from './guards/activate-process-id.guard';
import { MatomoRouteData } from 'ngx-matomo-client';
const routes: Routes = [
{
@@ -42,6 +43,11 @@ const routes: Routes = [
{
path: 'dashboard',
loadChildren: () => import('@page/dashboard').then((m) => m.DashboardModule),
data: {
matomo: {
title: 'Dashboard',
} as MatomoRouteData,
},
},
{
path: 'product',

5
apps/isa-app/src/app/app-store.module.ts
View File

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { EffectsModule } from '@ngrx/effects';
import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { storeFreeze } from 'ngrx-store-freeze';
import packageInfo from 'packageJson';
import { environment } from '../environments/environment';
import { RootStateService } from './store/root-state.service';
@@ -22,7 +21,9 @@ export function storeInLocalStorage(reducer: ActionReducer<any>): ActionReducer<
};
}
export const metaReducers: MetaReducer<RootState>[] = !environment.production ? [storeFreeze, storeInLocalStorage] : [storeInLocalStorage];
export const metaReducers: MetaReducer<RootState>[] = !environment.production
? [storeInLocalStorage]
: [storeInLocalStorage];
@NgModule({
imports: [

20
apps/isa-app/src/app/app-swagger.module.ts
View File

@@ -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 } {

2
apps/isa-app/src/app/app.component.spec.ts
View File

@@ -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';

3
apps/isa-app/src/app/app.component.ts
View File

@@ -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';
@@ -33,6 +33,7 @@ import { animate, style, transition, trigger } from '@angular/animations';
]),
]),
],
standalone: false,
})
export class AppComponent implements OnInit {
readonly injector = inject(Injector);

15
apps/isa-app/src/app/app.module.ts
View File

@@ -1,5 +1,5 @@
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { APP_INITIALIZER, ErrorHandler, Injector, LOCALE_ID, NgModule } from '@angular/core';
import { ErrorHandler, Injector, LOCALE_ID, NgModule, inject, provideAppInitializer } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { PlatformModule } from '@angular/cdk/platform';
@@ -41,6 +41,8 @@ import { NgIconsModule } from '@ng-icons/core';
import { matClose, matWifi, matWifiOff } from '@ng-icons/material-icons/baseline';
import { NetworkStatusService } from './services/network-status.service';
import { firstValueFrom } from 'rxjs';
import { provideMatomo } from 'ngx-matomo-client';
import { withRouter, withRouteData } from 'ngx-matomo-client';
registerLocaleData(localeDe, localeDeExtra);
registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -159,12 +161,10 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
NgIconsModule.withIcons({ matWifiOff, matClose, matWifi }),
],
providers: [
{
provide: APP_INITIALIZER,
useFactory: _appInitializerFactory,
multi: true,
deps: [Config, Injector],
},
provideAppInitializer(() => {
const initializerFn = _appInitializerFactory(inject(Config), inject(Injector));
return initializerFn();
}),
{
provide: NOTIFICATIONS_HUB_OPTIONS,
useFactory: _notificationsHubOptionsFactory,
@@ -186,6 +186,7 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
},
{ provide: LOCALE_ID, useValue: 'de-DE' },
provideHttpClient(withInterceptorsFromDi()),
provideMatomo({ trackerUrl: 'https://matomo.paragon-data.net', siteId: '1' }, withRouter(), withRouteData()),
],
})
export class AppModule {}

7
apps/isa-app/src/app/commands/create-customer.command.ts
View File

@@ -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<Result<CustomerInfoDTO[]>> {
constructor(private _router: Router, private _application: ApplicationService) {
constructor(
private _router: Router,
private _application: ApplicationService,
) {
super('CREATE_CUSTOMER');
}

2
apps/isa-app/src/app/commands/create-kubi-customer.command.ts
View File

@@ -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<Result<CustomerInfoDTO[]>> {

7
apps/isa-app/src/app/commands/print-kubi-agb.command.ts
View File

@@ -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<Result<CustomerInfoDTO[]>> {
constructor(private _uiModal: UiModalService, private _printerService: DomainPrinterService) {
constructor(
private _uiModal: UiModalService,
private _printerService: DomainPrinterService,
) {
super('PRINT_KUBI_AGB');
}

2
apps/isa-app/src/app/guards/is-authenticated.guard.ts
View File

@@ -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';

1
apps/isa-app/src/app/main.component.ts
View File

@@ -4,6 +4,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core';
selector: 'app-main',
templateUrl: 'main.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class MainComponent {
constructor() {}

3
apps/isa-app/src/app/preview/preview.component.ts
View File

@@ -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({
@@ -10,7 +10,6 @@ import { BehaviorSubject } from 'rxjs';
templateUrl: 'preview.component.html',
styleUrls: ['preview.component.css'],
imports: [CommonModule, BranchSelectorComponent, PlatformModule],
standalone: true,
})
export class PreviewComponent implements OnInit {
selectedBranch$ = new BehaviorSubject<BranchDTO>({});

2
apps/isa-app/src/app/providers/isa.log-provider.ts
View File

@@ -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' })

2
apps/isa-app/src/app/store/root-state.service.ts
View File

@@ -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';

7
apps/isa-app/src/app/token-login/token-login.component.ts
View File

@@ -7,9 +7,14 @@ import { AuthService } from '@core/auth';
templateUrl: 'token-login.component.html',
styleUrls: ['token-login.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class TokenLoginComponent implements OnInit {
constructor(private _route: ActivatedRoute, private _authService: AuthService, private _router: Router) {}
constructor(
private _route: ActivatedRoute,
private _authService: AuthService,
private _router: Router,
) {}
ngOnInit() {
if (this._route.snapshot.params.token && !this._authService.isAuthenticated()) {

2
apps/isa-app/src/core/application/application.service.ts
View File

@@ -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';

1
apps/isa-app/src/core/auth/if-role.directive.ts
View File

@@ -3,6 +3,7 @@ import { AuthService } from './auth.service';
@Directive({
selector: '[ifRole],[ifRoleElse],[ifNotRole],[ifNotRoleElse]',
standalone: false,
})
export class IfRoleDirective implements OnChanges {
@Input()

2
apps/isa-app/src/core/auth/login.strategy.ts
View File

@@ -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' })

14
apps/isa-app/src/domain/availability/availability.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/availability/defs/availability-by-branch-dto.ts
View File

@@ -1,4 +1,4 @@
import { AvailabilityDTO } from '@swagger/checkout';
import { AvailabilityDTO } from '@generated/swagger/checkout-api';
export interface AvailabilityByBranchDTO extends AvailabilityDTO {
availableQuantity?: number;

2
apps/isa-app/src/domain/availability/defs/item-data.ts
View File

@@ -1,4 +1,4 @@
import { PriceDTO } from '@swagger/availability';
import { PriceDTO } from '@generated/swagger/availability-api';
export interface ItemData {
ean: string;

2
apps/isa-app/src/domain/availability/in-stock.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/cart/cart.service.ts
View File

@@ -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';

4
apps/isa-app/src/domain/cart/defs/cart-item.model.ts
View File

@@ -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;

2
apps/isa-app/src/domain/catalog/catalog.service.ts
View File

@@ -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';

1
apps/isa-app/src/domain/catalog/thumbnail-url.pipe.ts
View File

@@ -6,6 +6,7 @@ import { DomainCatalogThumbnailService } from './thumbnail.service';
@Pipe({
name: 'thumbnailUrl',
pure: false,
standalone: false,
})
export class ThumbnailUrlPipe implements PipeTransform, OnDestroy {
private input$ = new BehaviorSubject<{ width?: number; height?: number; ean?: string }>(undefined);

6
apps/isa-app/src/domain/checkout/checkout.service.ts
View File

@@ -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';

6
apps/isa-app/src/domain/checkout/store/defs/checkout.entity.ts
View File

@@ -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;

6
apps/isa-app/src/domain/checkout/store/domain-checkout.actions.ts
View File

@@ -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]';

2
apps/isa-app/src/domain/checkout/store/domain-checkout.selectors.ts
View File

@@ -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';

2
apps/isa-app/src/domain/checkout/store/domain-checkout.state.ts
View File

@@ -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<CheckoutEntity> {
orders: DisplayOrderDTO[];

2
apps/isa-app/src/domain/crm/crm-customer.service.spec.ts
View File

@@ -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';

2
apps/isa-app/src/domain/crm/crm-customer.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/crm/helpers/address.helper.ts
View File

@@ -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;

2
apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.spec.ts
View File

@@ -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', () => {

2
apps/isa-app/src/domain/crm/helpers/assigned-payer.helper.ts
View File

@@ -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)) {

2
apps/isa-app/src/domain/crm/helpers/shipping-address.helper.spec.ts
View File

@@ -1,4 +1,4 @@
import { ShippingAddressDTO } from '@swagger/crm';
import { ShippingAddressDTO } from '@generated/swagger/crm-api';
import { ShippingAddressHelper } from './shipping-address.helper';
describe('ShippingAddressHelper', () => {

2
apps/isa-app/src/domain/crm/helpers/shipping-address.helper.ts
View File

@@ -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)) {

2
apps/isa-app/src/domain/defs/result.ts
View File

@@ -1,4 +1,4 @@
import { DialogOfString } from '@swagger/crm';
import { DialogOfString } from '@generated/swagger/crm-api';
export interface Result<T> {
/** Ergebnis */

2
apps/isa-app/src/domain/isa/dashboard.service.ts
View File

@@ -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 {

2
apps/isa-app/src/domain/isa/defs/info-feed.ts
View File

@@ -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 {

2
apps/isa-app/src/domain/isa/defs/kpi-feed.ts
View File

@@ -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 {

4
apps/isa-app/src/domain/isa/defs/products-feed.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/accepted.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/arrived.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/assembled.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/available-for-download.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/back-to-stock.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/canceled-by-buyer.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/canceled-by-retailer.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/canceled-by-supplier.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/change-order-item-status-base.action-handler.ts
View File

@@ -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<OrderItemsContext> {

2
apps/isa-app/src/domain/oms/action-handlers/collect-on-deliverynote.action-handler.ts
View File

@@ -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()

2
apps/isa-app/src/domain/oms/action-handlers/collect-with-smallamountinvoice.action-handler.ts
View File

@@ -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()

2
apps/isa-app/src/domain/oms/action-handlers/create-returnitem.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/delivered.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/determine-supplier.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/dispatched.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/downloaded.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/fetched.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/in-process.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/not-available.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/not-fetched.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/order-at-supplier.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/order-items.context.ts
View File

@@ -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[];

2
apps/isa-app/src/domain/oms/action-handlers/ordering.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/overdue.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/packed.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/parked.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/placed.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/preperation-for-shipping.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/print-pricediffqrcodelabel.action-handler.ts
View File

@@ -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()

2
apps/isa-app/src/domain/oms/action-handlers/print-shipping-note.action-handler.ts
View File

@@ -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()

4
apps/isa-app/src/domain/oms/action-handlers/print-smallamountinvoice.action-handler.ts
View File

@@ -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<OrderItemsContext> {

2
apps/isa-app/src/domain/oms/action-handlers/re-order.action-handler.ts
View File

@@ -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()

2
apps/isa-app/src/domain/oms/action-handlers/re-ordered.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/redirected-internally.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/requested.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/reserved.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/returned-by-buyer.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/shipping-note.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/shop-with-kulturpass.action-handler.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/action-handlers/supplier-temporarily-out-of-stock.action-handler copy.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/customer-order.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/goods.service.spec.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/goods.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/oms.service.ts
View File

@@ -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';

2
apps/isa-app/src/domain/oms/receipt.service.ts
View File

@@ -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';

Some files were not shown because too many files have changed in this diff Show More