From b21ebac53fdd62eb8eb731e9e9298dd4c8ac25d8 Mon Sep 17 00:00:00 2001 From: Nino Date: Mon, 16 Jun 2025 17:24:35 +0200 Subject: [PATCH] feat(remission-list): Init Routing to Remission List --- apps/isa-app/src/app/app-routing.module.ts | 5 +++++ .../shell/side-menu/side-menu.component.html | 16 ++++++++++++++++ .../shell/side-menu/side-menu.component.ts | 4 ++-- libs/remission/feature/ng-package.json | 7 ------- .../feature/{ => remission-list}/README.md | 0 .../{ => remission-list}/eslint.config.js | 2 +- .../feature/{ => remission-list}/jest.config.ts | 5 +++-- .../feature/remission-list/ng-package.json | 7 +++++++ .../feature/{ => remission-list}/package.json | 0 .../feature/{ => remission-list}/project.json | 12 ++++++------ .../feature/remission-list/src/index.ts | 1 + .../src/lib/resmission-list.component.ts | 14 ++++++++++++++ .../feature/remission-list/src/lib/routes.ts | 9 +++++++++ .../{ => remission-list}/src/test-setup.ts | 0 .../feature/{ => remission-list}/tsconfig.json | 2 +- .../{ => remission-list}/tsconfig.lib.json | 2 +- .../{ => remission-list}/tsconfig.lib.prod.json | 0 .../{ => remission-list}/tsconfig.spec.json | 2 +- libs/remission/feature/src/index.ts | 0 tsconfig.base.json | 2 +- 20 files changed, 68 insertions(+), 22 deletions(-) delete mode 100644 libs/remission/feature/ng-package.json rename libs/remission/feature/{ => remission-list}/README.md (100%) rename libs/remission/feature/{ => remission-list}/eslint.config.js (93%) rename libs/remission/feature/{ => remission-list}/jest.config.ts (82%) create mode 100644 libs/remission/feature/remission-list/ng-package.json rename libs/remission/feature/{ => remission-list}/package.json (100%) rename libs/remission/feature/{ => remission-list}/project.json (58%) create mode 100644 libs/remission/feature/remission-list/src/index.ts create mode 100644 libs/remission/feature/remission-list/src/lib/resmission-list.component.ts create mode 100644 libs/remission/feature/remission-list/src/lib/routes.ts rename libs/remission/feature/{ => remission-list}/src/test-setup.ts (100%) rename libs/remission/feature/{ => remission-list}/tsconfig.json (92%) rename libs/remission/feature/{ => remission-list}/tsconfig.lib.json (87%) rename libs/remission/feature/{ => remission-list}/tsconfig.lib.prod.json (100%) rename libs/remission/feature/{ => remission-list}/tsconfig.spec.json (87%) delete mode 100644 libs/remission/feature/src/index.ts diff --git a/apps/isa-app/src/app/app-routing.module.ts b/apps/isa-app/src/app/app-routing.module.ts index 7dcff1abc..72b667ee3 100644 --- a/apps/isa-app/src/app/app-routing.module.ts +++ b/apps/isa-app/src/app/app-routing.module.ts @@ -190,6 +190,11 @@ const routes: Routes = [ loadChildren: () => import('@isa/oms/feature/return-search').then((m) => m.routes), }, + { + path: 'remission', + loadChildren: () => + import('@isa/remission/feature/remission-list').then((m) => m.routes), + }, ], }, ]; diff --git a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.html b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.html index 10beb20d9..15b83bc4e 100644 --- a/apps/isa-app/src/shared/shell/side-menu/side-menu.component.html +++ b/apps/isa-app/src/shared/shell/side-menu/side-menu.component.html @@ -283,5 +283,21 @@ Wareneingang } + + + + + + Remission + 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 9f154fc5d..7db348991 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 @@ -31,7 +31,7 @@ import { import { TabService } from '@isa/core/tabs'; import { NgIconComponent, provideIcons } from '@ng-icons/core'; -import { isaNavigationReturn } from '@isa/icons'; +import { isaNavigationRemission2, isaNavigationReturn } from '@isa/icons'; @Component({ selector: 'shell-side-menu', @@ -46,7 +46,7 @@ import { isaNavigationReturn } from '@isa/icons'; AuthModule, RegexRouterLinkActiveDirective, ], - providers: [provideIcons({ isaNavigationReturn })], + providers: [provideIcons({ isaNavigationReturn, isaNavigationRemission2 })], }) export class ShellSideMenuComponent { processService = inject(TabService); diff --git a/libs/remission/feature/ng-package.json b/libs/remission/feature/ng-package.json deleted file mode 100644 index 86ca4a337..000000000 --- a/libs/remission/feature/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/remission/feature", - "lib": { - "entryFile": "src/index.ts" - } -} diff --git a/libs/remission/feature/README.md b/libs/remission/feature/remission-list/README.md similarity index 100% rename from libs/remission/feature/README.md rename to libs/remission/feature/remission-list/README.md diff --git a/libs/remission/feature/eslint.config.js b/libs/remission/feature/remission-list/eslint.config.js similarity index 93% rename from libs/remission/feature/eslint.config.js rename to libs/remission/feature/remission-list/eslint.config.js index fdd425577..c3a3df555 100644 --- a/libs/remission/feature/eslint.config.js +++ b/libs/remission/feature/remission-list/eslint.config.js @@ -1,5 +1,5 @@ const nx = require('@nx/eslint-plugin'); -const baseConfig = require('../../../eslint.config.js'); +const baseConfig = require('../../../../eslint.config.mjs'); module.exports = [ ...baseConfig, diff --git a/libs/remission/feature/jest.config.ts b/libs/remission/feature/remission-list/jest.config.ts similarity index 82% rename from libs/remission/feature/jest.config.ts rename to libs/remission/feature/remission-list/jest.config.ts index ed93a6ba2..aff98f974 100644 --- a/libs/remission/feature/jest.config.ts +++ b/libs/remission/feature/remission-list/jest.config.ts @@ -1,8 +1,9 @@ export default { displayName: 'remission-feature-remission-list', - preset: '../../../jest.preset.js', + preset: '../../../../jest.preset.js', setupFilesAfterEnv: ['/src/test-setup.ts'], - coverageDirectory: '../../../coverage/libs/remission/feature', + coverageDirectory: + '../../../../coverage/libs/remission/feature/remission-list', transform: { '^.+\\.(ts|mjs|js|html)$': [ 'jest-preset-angular', diff --git a/libs/remission/feature/remission-list/ng-package.json b/libs/remission/feature/remission-list/ng-package.json new file mode 100644 index 000000000..4bc7c0279 --- /dev/null +++ b/libs/remission/feature/remission-list/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../../dist/libs/remission/feature/remission-list", + "lib": { + "entryFile": "src/index.ts" + } +} diff --git a/libs/remission/feature/package.json b/libs/remission/feature/remission-list/package.json similarity index 100% rename from libs/remission/feature/package.json rename to libs/remission/feature/remission-list/package.json diff --git a/libs/remission/feature/project.json b/libs/remission/feature/remission-list/project.json similarity index 58% rename from libs/remission/feature/project.json rename to libs/remission/feature/remission-list/project.json index 9894b4608..51648b7d7 100644 --- a/libs/remission/feature/project.json +++ b/libs/remission/feature/remission-list/project.json @@ -1,7 +1,7 @@ { "name": "remission-feature-remission-list", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/remission/feature/src", + "$schema": "../../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/remission/feature/remission-list/src", "prefix": "remi", "projectType": "library", "tags": [], @@ -10,14 +10,14 @@ "executor": "@nx/angular:ng-packagr-lite", "outputs": ["{workspaceRoot}/dist/{projectRoot}"], "options": { - "project": "libs/remission/feature/ng-package.json" + "project": "libs/remission/feature/remission-list/ng-package.json" }, "configurations": { "production": { - "tsConfig": "libs/remission/feature/tsconfig.lib.prod.json" + "tsConfig": "libs/remission/feature/remission-list/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "libs/remission/feature/tsconfig.lib.json" + "tsConfig": "libs/remission/feature/remission-list/tsconfig.lib.json" } }, "defaultConfiguration": "production" @@ -26,7 +26,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/remission/feature/jest.config.ts" + "jestConfig": "libs/remission/feature/remission-list/jest.config.ts" } }, "lint": { diff --git a/libs/remission/feature/remission-list/src/index.ts b/libs/remission/feature/remission-list/src/index.ts new file mode 100644 index 000000000..ece2c025d --- /dev/null +++ b/libs/remission/feature/remission-list/src/index.ts @@ -0,0 +1 @@ +export * from './lib/routes'; diff --git a/libs/remission/feature/remission-list/src/lib/resmission-list.component.ts b/libs/remission/feature/remission-list/src/lib/resmission-list.component.ts new file mode 100644 index 000000000..4e929eacb --- /dev/null +++ b/libs/remission/feature/remission-list/src/lib/resmission-list.component.ts @@ -0,0 +1,14 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { RouterOutlet } from '@angular/router'; + +@Component({ + selector: 'remission-feature-remission-list', + template: ``, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [RouterOutlet], + host: { + '[class]': + '"flex flex-col gap-5 isa-desktop:gap-6 items-center overflow-x-hidden"', + }, +}) +export class RemissionListComponent {} diff --git a/libs/remission/feature/remission-list/src/lib/routes.ts b/libs/remission/feature/remission-list/src/lib/routes.ts new file mode 100644 index 000000000..0fd605933 --- /dev/null +++ b/libs/remission/feature/remission-list/src/lib/routes.ts @@ -0,0 +1,9 @@ +import { Routes } from '@angular/router'; +import { RemissionListComponent } from './resmission-list.component'; + +export const routes: Routes = [ + { + path: '', + component: RemissionListComponent, + }, +]; diff --git a/libs/remission/feature/src/test-setup.ts b/libs/remission/feature/remission-list/src/test-setup.ts similarity index 100% rename from libs/remission/feature/src/test-setup.ts rename to libs/remission/feature/remission-list/src/test-setup.ts diff --git a/libs/remission/feature/tsconfig.json b/libs/remission/feature/remission-list/tsconfig.json similarity index 92% rename from libs/remission/feature/tsconfig.json rename to libs/remission/feature/remission-list/tsconfig.json index fde35eab0..52a0866e0 100644 --- a/libs/remission/feature/tsconfig.json +++ b/libs/remission/feature/remission-list/tsconfig.json @@ -18,7 +18,7 @@ "path": "./tsconfig.spec.json" } ], - "extends": "../../../tsconfig.base.json", + "extends": "../../../../tsconfig.base.json", "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, diff --git a/libs/remission/feature/tsconfig.lib.json b/libs/remission/feature/remission-list/tsconfig.lib.json similarity index 87% rename from libs/remission/feature/tsconfig.lib.json rename to libs/remission/feature/remission-list/tsconfig.lib.json index 9b49be758..912738705 100644 --- a/libs/remission/feature/tsconfig.lib.json +++ b/libs/remission/feature/remission-list/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/libs/remission/feature/tsconfig.lib.prod.json b/libs/remission/feature/remission-list/tsconfig.lib.prod.json similarity index 100% rename from libs/remission/feature/tsconfig.lib.prod.json rename to libs/remission/feature/remission-list/tsconfig.lib.prod.json diff --git a/libs/remission/feature/tsconfig.spec.json b/libs/remission/feature/remission-list/tsconfig.spec.json similarity index 87% rename from libs/remission/feature/tsconfig.spec.json rename to libs/remission/feature/remission-list/tsconfig.spec.json index f858ef78c..6e5925e5c 100644 --- a/libs/remission/feature/tsconfig.spec.json +++ b/libs/remission/feature/remission-list/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "target": "es2016", "types": ["jest", "node"] diff --git a/libs/remission/feature/src/index.ts b/libs/remission/feature/src/index.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/tsconfig.base.json b/tsconfig.base.json index fd549f496..b39ff6491 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -71,7 +71,7 @@ "@isa/oms/utils/translation": ["libs/oms/utils/translation/src/index.ts"], "@isa/remission/data-access": ["libs/remission/data-access/src/index.ts"], "@isa/remission/feature/remission-list": [ - "libs/remission/feature/src/index.ts" + "libs/remission/feature/remission-list/src/index.ts" ], "@isa/remission/helpers": ["libs/remission/helpers/src/index.ts"], "@isa/remission/shared": ["libs/remission/shared/src/index.ts"],